Changeset 413 for GearsORM/branches

Timestamp:

03/22/08 13:32:22 (8 months ago)

Author:

uriel

Message:

renamed namespace to JsORM

Location:

GearsORM/branches/JsORM

Files:

• JsORM.Events.js (modified) (4 diffs)
• JsORM.Fields.js (modified) (20 diffs)
• JsORM.Introspection.js (modified) (4 diffs)
• JsORM.Model.js (modified) (19 diffs)
• JsORM.ResultIterator.js (modified) (4 diffs)
• JsORM.Sql.js (modified) (9 diffs)
• JsORM.Transaction.js (modified) (3 diffs)
• JsORM.js (modified) (7 diffs)
• examples/new_demo.html (modified) (1 diff)
• tests/test_events.html (modified) (1 diff)
• tests/test_inner_relations.html (modified) (1 diff)
• tests/test_introspection.html (modified) (2 diffs)
• tests/test_m2m.html (modified) (1 diff)
• tests/test_relations.html (modified) (1 diff)
• tests/test_simple.html (modified) (1 diff)
• tests/test_transaction.html (modified) (3 diffs)
• tests/unit_test.js (modified) (1 diff)

GearsORM/branches/JsORM/JsORM.Events.js

@@ -1 +1 @@
 /*
-        Script: GearsORM.Events.js
-                Event support for GearsORM 
+        Script: JsORM.Events.js
+                Event support for JsORM 
         
         License:
@@ -8 +8 @@
 
 /*
- Class: GearsORM.Events
+ Class: JsORM.Events
         add event support to a class
         
@@ -14 +14 @@
  
  */
-GearsORM.Events = function()
+JsORM.Events = function()
 {
         this.$events = {};
 }
-GearsORM.Events.prototype = 
+JsORM.Events.prototype = 
 {
         /*
@@ -75 +75 @@
         object - the object who fire the events
  */
-GearsORM.Events.wrapFunction=function(fn,name,object)
+JsORM.Events.wrapFunction=function(fn,name,object)
 {
         return function()

GearsORM/branches/JsORM/JsORM.Fields.js

@@ -1 +1 @@
 /*
-        Script: GearsORM.Fields.js
+        Script: JsORM.Fields.js
                 Contains the fields to be used in the models.
         
@@ -7 +7 @@
 */
 
-GearsORM.Field = {};
-/*
- Class: GearsORM.Field.Primitive
+JsORM.Field = {};
+/*
+ Class: JsORM.Field.Primitive
         a meta class for basic field types like varchar,integer,real and timestamp
         
@@ -17 +17 @@
         sqlType - the sql string for the type
  */
-GearsORM.Field.Primitive = function(sqlType)
+JsORM.Field.Primitive = function(sqlType)
 {
         var field = function(options)
@@ -37 +37 @@
                 isRelation:false
         };
-        field.constructor = GearsORM.Field.Primitive;
+        field.constructor = JsORM.Field.Primitive;
         return field;
 };
@@ -43 +43 @@
   a object holding all the field types(including relations)
  */
-GearsORM.Fields =
-{
-        String:new GearsORM.Field.Primitive("VARCHAR"),
-        Integer:new GearsORM.Field.Primitive("INTEGER"),
-        Float:new GearsORM.Field.Primitive("REAL"),
-        TimeStamp:new GearsORM.Field.Primitive("TIMESTAMP")
-};
-
-/*
- Class: GearsORM.Fields.ManyToOne
+JsORM.Fields =
+{
+        String:new JsORM.Field.Primitive("VARCHAR"),
+        Integer:new JsORM.Field.Primitive("INTEGER"),
+        Float:new JsORM.Field.Primitive("REAL"),
+        TimeStamp:new JsORM.Field.Primitive("TIMESTAMP")
+};
+
+/*
+ Class: JsORM.Fields.ManyToOne
  
   represent a ManyToOne relation,this isn`t a actual table field.
@@ -66 +66 @@
   }
  */
-GearsORM.Fields.ManyToOne = function(options)
+JsORM.Fields.ManyToOne = function(options)
 {
         this.options = options; 
 };
 
-GearsORM.Fields.ManyToOne.prototype =
+JsORM.Fields.ManyToOne.prototype =
 {
         /*
@@ -79 +79 @@
         copy:function()
         {
-                return new GearsORM.Fields.ManyToOne(this.options); 
+                return new JsORM.Fields.ManyToOne(this.options); 
         },
         /*
@@ -119 +119 @@
         getRelatedClass:function()
         {
-                return GearsORM._models[this.options.related];
+                return JsORM._models[this.options.related];
         },
         _selectRemove:function(whereExpression,params,method)
@@ -134 +134 @@
 
 /*
- Class: GearsORM.Fields.OneToMany
+ Class: JsORM.Fields.OneToMany
   represent a forigen key relation
   
@@ -148 +148 @@
   }
  */
-GearsORM.Fields.OneToMany = function(options)
+JsORM.Fields.OneToMany = function(options)
 {
         this.options = options;
 };
 
-GearsORM.Fields.OneToMany.prototype =
+JsORM.Fields.OneToMany.prototype =
 {
         /*
@@ -161 +161 @@
         copy:function()
         {
-                return new GearsORM.Fields.OneToMany(this.options); 
+                return new JsORM.Fields.OneToMany(this.options); 
         },
         /*
@@ -169 +169 @@
         toSql:function()
         {
-                return GearsORM.Sql.oneToManySql(this.options.related,this.options.allowNull);
+                return JsORM.Sql.oneToManySql(this.options.related,this.options.allowNull);
         },
         /*
@@ -177 +177 @@
         getRelatedClass:function()
         {
-                return GearsORM._models[this.options.related];
+                return JsORM._models[this.options.related];
         },
         isBackwardRelation:false,
@@ -183 +183 @@
 };
 /*
- Class: GearsORM.Fields.ManyToMany
+ Class: JsORM.Fields.ManyToMany
   represent a many to many relation between two tables using a many to many relation table
   
@@ -196 +196 @@
   }
  */
-GearsORM.Fields.ManyToMany = function(options)
+JsORM.Fields.ManyToMany = function(options)
 {
         this.options = options;
 };
 
-GearsORM.Fields.ManyToMany.prototype =
+JsORM.Fields.ManyToMany.prototype =
 {
         _m2mModel:null,
@@ -210 +210 @@
         copy:function()
         {
-                return new GearsORM.Fields.ManyToMany(this.options); 
+                return new JsORM.Fields.ManyToMany(this.options); 
         },
         /*
@@ -225 +225 @@
                         
                         var fields = {};
-                        fields[relatedModelName] = new GearsORM.Fields.OneToMany({related:relatedModelName,onDeleteCascade:true});
-                        fields[thisModelName] = new GearsORM.Fields.OneToMany({related:thisModelName,onDeleteCascade:true});
+                        fields[relatedModelName] = new JsORM.Fields.OneToMany({related:relatedModelName,onDeleteCascade:true});
+                        fields[thisModelName] = new JsORM.Fields.OneToMany({related:thisModelName,onDeleteCascade:true});
                         
-                        this._m2mModel = new GearsORM.Model({
+                        this._m2mModel = new JsORM.Model({
                                 name:"m2m_"+ thisModelName + "_"+ relatedModelName,
                                 fields:fields
@@ -266 +266 @@
         {
                 //create a new table for the many-to-many relation only if related class is defined
-                if(GearsORM._models[this.options.related])
+                if(JsORM._models[this.options.related])
                 {
                         this.getRelationModel().createTable();
@@ -283 +283 @@
                 var m2mTableName = this.getRelationModel().options.name;
                 var relatedClass = this.getRelatedClass();
-                return new GearsORM.ResultIterator(GearsORM.execute(GearsORM.Sql.selectWithManyToMany(this.modelClass,relatedClass,m2mTableName,whereExpression,this.instance.rowid),params),relatedClass);
+                return new JsORM.ResultIterator(JsORM.execute(JsORM.Sql.selectWithManyToMany(this.modelClass,relatedClass,m2mTableName,whereExpression,this.instance.rowid),params),relatedClass);
         },
         /*
@@ -311 +311 @@
         getRelatedClass:function()
         {
-                return GearsORM._models[this.options.related];
+                return JsORM._models[this.options.related];
         },
         isBackwardRelation:true,

GearsORM/branches/JsORM/JsORM.Introspection.js

@@ -1 +1 @@
 /*
-        Script: GearsORM.Introspection.js
-                Contains the GearsORM.Introspection utility class,
+        Script: JsORM.Introspection.js
+                Contains the JsORM.Introspection utility class,
                 which contain also a model for sqlite_master table
         
@@ -9 +9 @@
 
 /*
-  Class: GearsORM.Introspection
+  Class: JsORM.Introspection
         a utility class to do database introspection.
  */
-GearsORM.Introspection =
+JsORM.Introspection =
 {
         /*
-         Property: GearsORM.Introspection.sqliteMasterModel
+         Property: JsORM.Introspection.sqliteMasterModel
                 a model to work with sqlite_master(provide information on the schema) table
                 sqlite_master definition from sqlite site:
@@ -26 +26 @@
                 );
          */
-        sqliteMasterModel:new GearsORM.Model({
+        sqliteMasterModel:new JsORM.Model({
                 name:"sqlite_master",
                 fields:
                 {
-                        type:new GearsORM.Fields.String(),
-                        name:new GearsORM.Fields.String(),
-                        tbl_name:new GearsORM.Fields.String(),
-                        rootpage:new GearsORM.Fields.Integer(),
-                        sql:new GearsORM.Fields.String()
+                        type:new JsORM.Fields.String(),
+                        name:new JsORM.Fields.String(),
+                        tbl_name:new JsORM.Fields.String(),
+                        rootpage:new JsORM.Fields.Integer(),
+                        sql:new JsORM.Fields.String()
                 }
         }),
@@ -56 +56 @@
                 var query = ["sqlite_master.type =? AND sqlite_master.name IN (",qmarks.join(","),")"].join("");
                 
-                return GearsORM.Introspection.sqliteMasterModel
+                return JsORM.Introspection.sqliteMasterModel
                 .count(query,vals) == argsLength;
         }

GearsORM/branches/JsORM/JsORM.Model.js

@@ -1 +1 @@
 /*
-        Script: GearsORM.Model.js
-                Contains GearsORM.Model a metaclass used to define models
+        Script: JsORM.Model.js
+                Contains JsORM.Model a metaclass used to define models
         
         License:
@@ -8 +8 @@
 
 /*
- Class: GearsORM.Model
+ Class: JsORM.Model
         a metaclass to define models that represent database tables.
         a metaclass is a class in which the instances are also classes.
@@ -21 +21 @@
     fields: 
     {
-        name_of_the_field:a_instance_of_GearsORM.Fields.*
+        name_of_the_field:a_instance_of_JsORM.Fields.*
     }
    }
  */
-GearsORM.Model = function(options)
+JsORM.Model = function(options)
 {
         if(!options || !options.fields || !options.name)
@@ -32 +32 @@
         }
         /*
-          Class: GearsORM.Model.model
+          Class: JsORM.Model.model
           
                 represent a model instance
@@ -55 +55 @@
                         else
                         {
-                                GearsORM.extend(this,valuesOrRowID);
+                                JsORM.extend(this,valuesOrRowID);
                         }
                 }
@@ -81 +81 @@
                 {
                         if(this.rowid)
-                                GearsORM.executeAndClose(GearsORM.Sql.deleteRowByIdAndTable(options.name),[this.rowid]);
+                                JsORM.executeAndClose(JsORM.Sql.deleteRowByIdAndTable(options.name),[this.rowid]);
                                 
                         this.rowid = null;
@@ -103 +103 @@
                 _updateInsert:function(update)
                 {
-                        var query = update ? GearsORM.Sql.updateByModel(model) : GearsORM.Sql.insertRowByModel(model);
+                        var query = update ? JsORM.Sql.updateByModel(model) : JsORM.Sql.insertRowByModel(model);
 
                         var values = [];
@@ -129 +129 @@
                         }
                         if(update)values.push(this.rowid);
-                        GearsORM.executeAndClose(query,values);
-                        if(!update)this.rowid = GearsORM.getDB().lastInsertRowId;
+                        JsORM.executeAndClose(query,values);
+                        if(!update)this.rowid = JsORM.getDB().lastInsertRowId;
                         return this;
                 },
@@ -198 +198 @@
                 options.fields[fieldName].modelClass = model;
         }
-        GearsORM.extend(model,this);
-        GearsORM.extend(model,new GearsORM.Events);
+        JsORM.extend(model,this);
+        JsORM.extend(model,new JsORM.Events);
         
         for(var i in model.prototype)//add events to save,remove,refresh
                 if(i.charAt(0) != "_")//wrap only public functions
-                        model.prototype[i] = GearsORM.Events.wrapFunction(model.prototype[i],i.charAt(0).toUpperCase()+i.substring(1),model);
+                        model.prototype[i] = JsORM.Events.wrapFunction(model.prototype[i],i.charAt(0).toUpperCase()+i.substring(1),model);
 
-        model.constructor = GearsORM.Model;
+        model.constructor = JsORM.Model;
         //register the model
-        GearsORM._models[options.name] = model;
+        JsORM._models[options.name] = model;
         return model;
 };
 /*
-  class methods of GearsORM.Model 
+  class methods of JsORM.Model 
   this reffer to the model class
  */
-GearsORM.Model.prototype =
+JsORM.Model.prototype =
 {
         /*
@@ -232 +232 @@
         count:function(whereExpression,params)
         {
-                var rs = GearsORM.execute(GearsORM.Sql.selectCount(this.options.name,whereExpression),params);
+                var rs = JsORM.execute(JsORM.Sql.selectCount(this.options.name,whereExpression),params);
                 var count = rs.fieldByName("c");
                 rs.close();
@@ -253 +253 @@
         select:function(whereExpression,params)
         {
-                return new GearsORM.ResultIterator(GearsORM.execute(GearsORM.Sql.selectWithForigenKeys(this,whereExpression),params),this);
+                return new JsORM.ResultIterator(JsORM.execute(JsORM.Sql.selectWithForigenKeys(this,whereExpression),params),this);
         },
         /*
@@ -267 +267 @@
         remove:function(whereExpression,params)
         {
-                GearsORM.executeAndClose(GearsORM.Sql.deleteFromTableWhere(this.options.name,whereExpression),params);
+                JsORM.executeAndClose(JsORM.Sql.deleteFromTableWhere(this.options.name,whereExpression),params);
         },
         /*
@@ -276 +276 @@
         createTable:function()
         {
-                GearsORM.Transaction(function(){
-                        GearsORM.executeAndClose(GearsORM.Sql.createTableByModelClass(this));
+                JsORM.Transaction(function(){
+                        JsORM.executeAndClose(JsORM.Sql.createTableByModelClass(this));
                         var fields = this.options.fields;
                         for(var fieldName in fields)
@@ -295 +295 @@
         dropTable:function()
         {
-                GearsORM.Transaction(function(){
-                        GearsORM.executeAndClose(GearsORM.Sql.dropTableByName(this.options.name));
+                JsORM.Transaction(function(){
+                        JsORM.executeAndClose(JsORM.Sql.dropTableByName(this.options.name));
                         this.dropTriggers();
                 },this);
@@ -317 +317 @@
                         }
                         //if one of the tables doesn`t exist don`t create the triggers
-                        if(!GearsORM.Introspection.doesTableExist.apply(this,tableNames))
+                        if(!JsORM.Introspection.doesTableExist.apply(this,tableNames))
                                 return;
                 };                      
                 var fields = this.options.fields;
                 var name = this.options.name;
-                GearsORM.Transaction(function(){
+                JsORM.Transaction(function(){
                         for(var fieldName in fields)
                         {
@@ -329 +329 @@
                                 {
                                         //on insert,check that forigen key is valid since sqlite doesn`t enforce forigenkeys
-                                        GearsORM.executeAndClose(GearsORM.Sql.createInsertForigenKeyTrigger(name,field.getRelatedClass().options.name,field.options.allowNull));
+                                        JsORM.executeAndClose(JsORM.Sql.createInsertForigenKeyTrigger(name,field.getRelatedClass().options.name,field.options.allowNull));
                                         //on update,check that forigen key is valid     since sqlite doesn`t enforce forigenkeys
-                                        GearsORM.executeAndClose(GearsORM.Sql.createUpdateForigenKeyTrigger(name,field.getRelatedClass().options.name,field.options.allowNull));
+                                        JsORM.executeAndClose(JsORM.Sql.createUpdateForigenKeyTrigger(name,field.getRelatedClass().options.name,field.options.allowNull));
                                         
                                         if(field.options.onDeleteCascade)
                                                 //on delete from parent table,delete all rows that reference the row that is going to be deleted
-                                                GearsORM.executeAndClose(GearsORM.Sql.createDeleteCascadeTrigger(name,field.getRelatedClass().options.name));
+                                                JsORM.executeAndClose(JsORM.Sql.createDeleteCascadeTrigger(name,field.getRelatedClass().options.name));
                                         else
                                                 //on delete from parent table,if there is a row that reference the row that is going to be deleted throw a exception
-                                                GearsORM.executeAndClose(GearsORM.Sql.createDeleteRestrictTrigger(name,field.getRelatedClass().options.name));
+                                                JsORM.executeAndClose(JsORM.Sql.createDeleteRestrictTrigger(name,field.getRelatedClass().options.name));
                                 }
                         }
@@ -352 +352 @@
                 var fields = this.options.fields;
                 var name = this.options.name;
-                GearsORM.Transaction(function(){
+                JsORM.Transaction(function(){
                         for(var fieldName in fields)
                         {
@@ -359 +359 @@
                                 {
                                         //INSERT
-                                        GearsORM.executeAndClose(GearsORM.Sql.dropForigenKeyInsertTrigger(name,field.getRelatedClass().options.name));
+                                        JsORM.executeAndClose(JsORM.Sql.dropForigenKeyInsertTrigger(name,field.getRelatedClass().options.name));
                                         //UPDATE
-                                        GearsORM.executeAndClose(GearsORM.Sql.dropForigenKeyUpdateTrigger(name,field.getRelatedClass().options.name));
+                                        JsORM.executeAndClose(JsORM.Sql.dropForigenKeyUpdateTrigger(name,field.getRelatedClass().options.name));
                                         //DELETE
-                                        GearsORM.executeAndClose(GearsORM.Sql.dropForigenKeyDeleteTrigger(name,field.getRelatedClass().options.name));
+                                        JsORM.executeAndClose(JsORM.Sql.dropForigenKeyDeleteTrigger(name,field.getRelatedClass().options.name));
                                 }
                                 else if(field._m2mModel)
@@ -398 +398 @@
                         }
                 }
-                if(save)GearsORM.Transaction(map);
+                if(save)JsORM.Transaction(map);
                 else map();
                 return mappedObjects;

GearsORM/branches/JsORM/JsORM.ResultIterator.js

@@ -1 +1 @@
 /*
-        Script: GearsORM.ResultIterator.js
+        Script: JsORM.ResultIterator.js
                 Contains the ResultIterator class.
         
@@ -8 +8 @@
 
 /*
- Class: GearsORM.ResultIterator
+ Class: JsORM.ResultIterator
         a iterator on a Google Gears ResultSet
         
@@ -15 +15 @@
         modelClass - the model class used to map the results 
  */
-GearsORM.ResultIterator = function(result,modelClass)
+JsORM.ResultIterator = function(result,modelClass)
 {
         this.result = result;
@@ -22 +22 @@
 };