Changeset 354 for GearsORM/trunk

Timestamp:

10/08/07 15:21:05 (15 months ago)

Author:

uriel

Message:

basic syncUp and syncDown functions,need more work and testing

Location:

GearsORM/trunk

Files:

• GearsORM.Sync.js (modified) (3 diffs)
• tests/test_sync.html (modified) (2 diffs)

GearsORM/trunk/GearsORM.Sync.js

@@ -1 +1 @@
 GearsORM.Sync = 
 {
+        ACTIONS:
+        {
+                INSERT:0,
+                UPDATE:1,
+                DELETE:2
+        },
         Log:new GearsORM.Model({
                 name:"GearsORM_Log",
@@ -6 +12 @@
                 {
                         modelName:new GearsORM.Fields.String({maxLength:"128",notNull:true}),
-                        saved:new GearsORM.Fields.Integer(),
-                        id:new GearsORM.Fields.Integer()
+                        action:new GearsORM.Fields.Integer({notNull:true}),
+                        id:new GearsORM.Fields.Integer({notNull:true})
                 }
         }),
@@ -14 +20 @@
                 GearsORM.Sync.Log.createTable();
                 for(var modelName in GearsORM._models)
-                        if(modelName != "GearsORM_Log" && modelName != "sqlite_master")//skip Log and sqlite_master tables
-                                GearsORM._models[modelName].addListener("onAfterSave",function(instance)
-                                {
-                                        GearsORM.Sync._onChange(instance,1);
-                                })
-                                .addListener("onBeforeRemove",function(instance)//this is not the best need to be sure that it was removed
-                                {
-                                        GearsORM.Sync._onChange(instance,0);            
-                                });
+                        {
+                                var model = GearsORM._models[modelName]; 
+                                if(model.options.log && !model.options._logSetupDone)//log only tables with log option set to true
+                                        model.addListener("onAfterSave",function(instance)
+                                        {
+                                                GearsORM.Sync._onChange(instance,
+                                                        GearsORM.getDB().lastInsertRowId == instance.rowid ? 
+                                                                GearsORM.Sync.ACTIONS.INSERT : GearsORM.Sync.ACTIONS.UPDATE );
+                                        })
+                                        .addListener("onBeforeRemove",function(instance)//this is not the best need to be sure that it was removed
+                                        {
+                                                GearsORM.Sync._onChange(instance,GearsORM.Sync.ACTIONS.DELETE);         
+                                        }).options._logSetupDone = true;
+                        }
         },
-        _onChange:function(instance,saved)
+        _onChange:function(instance,action)
         {
                 var modelName = instance.modelClass.options.name,id = instance.rowid;
                 new GearsORM.Sync.Log({
                         modelName:modelName,
-                        saved:saved,
+                        action:action,
                         id:id
                 }).save();
-                if(!saved)//remove log about save when object is deleted
-                        GearsORM.Sync.Log.remove("modelName = ? AND id = ? AND saved = ?",[modelName,id,1]);
+                if(action == GearsORM.Sync.ACTIONS.DELETE)//remove log when object is deleted
+                        GearsORM.Sync.Log.remove("modelName = ? AND id = ? AND action <> ?",[modelName,id,GearsORM.Sync.ACTIONS.DELETE]);
+        },
+        syncUp:function()
+        {
+                var objectIDS = {},objects={},deletedObjects={};
+                GearsORM.Sync.Log.select().each(function(log)
+                {
+                        if(log.action == GearsORM.Sync.ACTIONS.DELETE)
+                        {
+                                if(!deletedObjects[log.modelName]) deletedObjects[log.modelName] = [log.id];
+                                else deletedObjects[log.modelName].push(log.id);
+                        }
+                        else
+                        {
+                                if(!objectIDS[log.modelName]) objectIDS[log.modelName] = [log.id];
+                                else objectIDS[log.modelName].push(log.id);
+                        }
+                });
+                GearsORM.Transaction(function()
+                {
+                        for(var modelName in objectIDS)
+                                //TODO:add a new method to return objects as raw objects
+                                objects[modelName] = GearsORM._models[modelName].select("rowid IN (" + objectIDS[modelName].join(",")+ ")").toArray();
+                });
+                objects.deletedObjects = deletedObjects;
+                return objects;
+        },
+        syncDown:function(syncObject)
+        {
+                GearsORM.Transaction(function()
+                {
+                        var deletedObjects = syncObject.deletedObjects;
+                        delete syncObject.deletedObjects;
+                        //save new objects
+                        for(var modelName in syncObject)
+                        {
+                                var model = GearsORM._models[modelName],l=syncObject[modelName],ln=l.length;
+                                for(var i=0;ln>i;i++)
+                                {
+                                        new model(l[i]).save();
+                                }
+                        }
+                        //delete old objects
+                        for(var modelName in deletedObjects)
+                                GearsORM._models[modelName].remove("rowid IN ("+deletedObjects[modelName].join(",")+")");
+                        //clean up log
+                        GearsORM.Sync.Log.remove();
+                });
         }
 };

GearsORM/trunk/tests/test_sync.html

@@ -19 +19 @@
                                         firstName:new GearsORM.Fields.String({maxLength:25}),
                                         lastName:new GearsORM.Fields.String({maxLength:25})
-                                }
+                                },
+                                log:true
                         });
                         
@@ -35 +36 @@
                                         var person = new Person({firstName:"John",lastName:"Doe"}).save();
                                         var id = person.rowid;
-                                        UnitTest.assertEqual(1,GearsORM.Sync.Log.count("modelName = ? AND id = ? AND saved = ?",["Person",id,1]));
+                                        UnitTest.assertEqual(1,GearsORM.Sync.Log.count("modelName = ? AND id = ? AND action = ?",["Person",id,GearsORM.Sync.ACTIONS.INSERT]));
                                         person.remove();
-                                        UnitTest.assertEqual(1,GearsORM.Sync.Log.count("modelName = ? AND id = ? AND saved = ?",["Person",id,0]));
+                                        UnitTest.assertEqual(1,GearsORM.Sync.Log.count("modelName = ? AND id = ? AND action = ?",["Person",id,GearsORM.Sync.ACTIONS.DELETE]));
                                         //check that log about saving was deleted
-                                        UnitTest.assertEqual(0,GearsORM.Sync.Log.count("modelName = ? AND id = ? AND saved = ?",["Person",id,1]));
+                                        UnitTest.assertEqual(0,GearsORM.Sync.Log.count("modelName = ? AND id = ? AND action = ?",["Person",id,GearsORM.Sync.ACTIONS.INSERT]));
                                 },
                                 down:function()