masterrecord 0.0.43 → 0.0.45

package/Entity/entityModel.js

@@ -17,7 +17,7 @@
 
 */
 
-// version 0.0.3
+// version 0.0.5
 class EntityModel {
     
     constructor(name){
@@ -34,7 +34,9 @@ class EntityModel {
             auto : false,
             cascadeOnDelete : true,
             lazyLoading : true,
-            isNavigational : false
+            isNavigational : false,
+            skipGetFunction :false,
+            valueConversion : true
             
         }
     }
@@ -123,6 +125,11 @@ class EntityModel {
         return this;
     }
 
+    valueConversion(bool){
+        this.obj.valueConversion = bool;
+        return this;
+    }
+
     // allows you to add a virtual object that will skipped from being used as sql objects
     virtual(){
         this.obj.virtual = true;

package/Entity/entityModelBuilder.js

@@ -1,3 +1,5 @@
+// version 0.0.3
+
 var modelDB  = require('./entityModel');
 
 // creates new instance if entity model and calls inner functions to build out a valid entity

package/Entity/entityTrackerModel.js

@@ -1,5 +1,5 @@
 
-// version : 0.0.1
+// version : 0.0.5
 var tools =  require('../Tools');
 class EntityTrackerModel {
 
@@ -39,12 +39,20 @@ class EntityTrackerModel {
 
                 // Getter
                 modelClass.__defineGetter__(modelField, function(){
-                    if(typeof currentEntity[modelField].get === "function"){
-                        return currentEntity[modelField].get(this["__proto__"]["_" + modelField]);
+                    // TODO: fix only when updating
+                    if(currentEntity[modelField]){
+                        if(!currentEntity[modelField].skipGetFunction){
+                            if(typeof currentEntity[modelField].get === "function"){
+                                return currentEntity[modelField].get(this["__proto__"]["_" + modelField]);
+                            }else{
+                                return this["__proto__"]["_" + modelField];
+                            }
+                        }
                     }else{
                         return this["__proto__"]["_" + modelField];
                     }
                 
+                
                 });
             }   
         }
@@ -87,6 +95,12 @@ class EntityTrackerModel {
  
                 // Setter
                 modelClass.__defineSetter__(entityField, function(value){
+                   
+                    if(typeof value === "string" || typeof value === "number" || typeof value === "boolean"  || typeof value === "bigint" ){
+                        modelClass.__state = "modified";
+                        modelClass.__dirtyFields.push(entityField);
+                         modelClass.__context.__track(modelClass);
+                    }
                     this["__proto__"]["_" + entityField] = value;
                 });
 
@@ -97,7 +111,7 @@ class EntityTrackerModel {
                     if(!ent){
                         var parentEntity = tools.findEntity(this.__name, this.__context);
                         if(parentEntity){
-                            ent = tools.findEntity(parentEntity.__entity[entityField].foreignKey, this.__context);
+                            ent = tools.findEntity(parentEntity.__entity[entityField].foreignTable, this.__context);
                             if(!ent){
                                 return  `Error - Entity ${parentEntity.__entity[entityField].foreignTable} not found. Please check your context for proper name.`
                             }
@@ -162,8 +176,9 @@ class EntityTrackerModel {
                                     */
                                     break;
                                     case "hasOne" : 
-                                        if(ent.__entity[this.__entity.__name]){
-                                            tableName = ent.__entity[this.__entity.__name].foreignKey;
+                                        var entityName = tools.findForeignTable(this.__entity.__name, ent.__entity);
+                                        if(entityName){
+                                            tableName = entityName.foreignKey;
                                         }
                                         else{
                                             return `Error - Entity ${ent.__entity.__name} has no property named ${this.__entity.__name}`;
@@ -174,8 +189,9 @@ class EntityTrackerModel {
                                         this[entityField] = modelValue;
                                     break;
                                     case "hasMany" : 
-                                        if(ent.__entity[this.__entity.__name]){
-                                            tableName = ent.__entity[this.__entity.__name].foreignKey;
+                                        var entityName = tools.findForeignTable(this.__entity.__name, ent.__entity);
+                                        if(entityName){
+                                            tableName = entityName.foreignKey;
                                         }
                                         else{
                                             return  `Error - Entity ${ent.__entity.__name} has no property named ${this.__entity.__name}`;

package/QueryLanguage/queryMethods.js

@@ -1,5 +1,5 @@
 
-// version 0.0.8
+// version 0.0.10
 var entityTrackerModel = require('masterrecord/Entity/entityTrackerModel');
 var tools = require('masterrecord/Tools');
 var queryScript = require('masterrecord/QueryLanguage/queryScript');
@@ -203,7 +203,7 @@ class queryMethods{
     single(){
         if(this.__context.isSQLite){
             var entityValue = this.__context._SQLEngine.get(this.__queryObject.script, this.__entity, this.__context);
-            var sing = this.__singleEntityBuilder(entityValue, this._queryBuilder);
+            var sing = this.__singleEntityBuilder(entityValue);
             this.__reset();
             return sing;
         }
@@ -211,8 +211,11 @@ class queryMethods{
 
     toList(){
         if(this.__context.isSQLite){
+            if(this.__queryObject.script.entityMap.length === 0){
+                this.__queryObject.skipClause( this.__entity.__name);
+            }
             var entityValue = this.__context._SQLEngine.all(this.__queryObject.script, this.__entity, this.__context);
-            var toLi = this.__multipleEntityBuilder(entityValue, this._queryBuilder);
+            var toLi = this.__multipleEntityBuilder(entityValue);
             this.__reset();
             return toLi;
         }

package/QueryLanguage/queryScript.js

@@ -1,4 +1,4 @@
-// version 0.0.4
+// version 0.0.5
 
 const LOG_OPERATORS_REGEX = /(\|\|)|(&&)/;
 var tools =  require('../Tools');
@@ -18,7 +18,8 @@ class queryScript{
         take : 0,
         skip: 0,
         orderBy : false,
-        orderByDesc : false
+        orderByDesc : false,
+        parentName : ""
     };
 
 
@@ -67,6 +68,17 @@ class queryScript{
         return this.script;
     }
 
+    // this gets called when you skip a where clause
+    skipClause(entityName){
+        //this.buildScript(text, "skipClause", this.script, entityName);
+        this.script.entityMap.push({
+            name: entityName,
+            entity : "ran"
+        });
+        this.script.parentName = entityName;
+        return this.script;
+    }
+
     include(text, entityName){
         this.buildScript(text, "include", this.script, entityName);
         return this.script;

package/SQLLiteEngine.js

@@ -1,4 +1,4 @@
-// Version 0.0.8
+// Version 0.0.12
 var tools =  require('masterrecord/Tools');
 
 class SQLLiteEngine {
@@ -473,16 +473,39 @@ class SQLLiteEngine {
         var $that = this;
         var argument = null;
         var dirtyFields = model.__dirtyFields;
-        
+
         for (var column in dirtyFields) {
+
             // TODO Boolean value is a string with a letter
             switch(model.__entity[dirtyFields[column]].type){
-                case "integer" :
+                 case "integer" :
+                    //model.__entity[dirtyFields[column]].skipGetFunction = true;
                     argument = argument === null ? `[${dirtyFields[column]}] = ${model[dirtyFields[column]]},` : `${argument} [${dirtyFields[column]}] = ${model[dirtyFields[column]]},`;
+                    //model.__entity[dirtyFields[column]].skipGetFunction = false;
                 break;
                 case "string" :
                     argument = argument === null ? `[${dirtyFields[column]}] = '${$that._santizeSingleQuotes(model[dirtyFields[column]])}',` : `${argument} [${dirtyFields[column]}] = '${$that._santizeSingleQuotes(model[dirtyFields[column]])}',`;
                 break;
+                case "boolean" :
+                    var bool = "";
+                    if(model.__entity[dirtyFields[column]].valueConversion){
+                        bool = tools.convertBooleanToNumber(model[dirtyFields[column]]);
+                    }
+                    else{
+                        bool = model[dirtyFields[column]];
+                    }
+                    argument = argument === null ? `[${dirtyFields[column]}] = '${bool}',` : `${argument} [${dirtyFields[column]}] = ${bool},`;
+                break;
+                case "time" :
+                    argument = argument === null ? `[${dirtyFields[column]}] = '${model[dirtyFields[column]]}',` : `${argument} [${dirtyFields[column]}] = ${model[dirtyFields[column]]},`;
+                break;
+                case "belongsTo" :
+                    var fore = `_${dirtyFields[column]}`;
+                    argument = argument === null ? `[${model.__entity[dirtyFields[column]].foreignKey}] = '${model[fore]}',` : `${argument} [${model.__entity[dirtyFields[column]].foreignKey}] = '${model[fore]}',`;
+                break;
+                case "hasMany" :
+                    argument = argument === null ? `[${dirtyFields[column]}] = '${model[dirtyFields[column]]}',` : `${argument} [${dirtyFields[column]}] = '${model[dirtyFields[column]]}',`;
+                break;
                 default:
                     argument = argument === null ? `[${dirtyFields[column]}] = '${model[dirtyFields[column]]}',` : `${argument} [${dirtyFields[column]}] = '${model[dirtyFields[column]]}',`;
             }
@@ -555,7 +578,13 @@ class SQLLiteEngine {
 
     // will add double single quotes to allow sting to be saved.
     _santizeSingleQuotes(string){
-        return string.replace(/'/g, "''");
+        if (typeof string === 'string' || string instanceof String){
+            return string.replace(/'/g, "''");
+        }
+    else{
+        console.log("warning - Field being passed is not a string");
+        throw "warning - Field being passed is not a string";
+    }
     }
 
     // converts any object into SQL parameter select string

package/Tools.js

@@ -1,4 +1,4 @@
-// Version 0.0.1
+// Version 0.0.3
 class Tools{
 
     static findEntity(name, entityList){
@@ -46,6 +46,19 @@ class Tools{
         }
     }
 
+    static findForeignTable(name, model){
+        for (var key in model) {
+            if (model.hasOwnProperty(key)) {
+                if(model[key].foreignTable){
+                    if(model[key].foreignTable === name){
+                        return model[key];
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
     static createNewInstance(validModel, type, classModel){
         return new type(validModel, classModel);
     }
@@ -134,6 +147,11 @@ class Tools{
           }
         return mainString;;
     }
+
+    static convertBooleanToNumber(num) {
+        num = num === 'true' ? true : (num === 'false' ? false : num);
+        return num ? 1 : 0;
+   }
 }
 
 module.exports = Tools;

package/context.js

@@ -242,8 +242,28 @@ class context {
         }
     }
 
+    // __track(model){
+    //     this.__trackedEntities.push(model);
+    //     return model;
+    // }
+
     __track(model){
-        this.__trackedEntities.push(model);
+        var add = true;
+        for (var mod in this.__trackedEntities) {
+            var id = this.__trackedEntities[mod].__ID;
+            if(id === model.__ID){
+                add = false;
+            }
+        }
+        if(this.__trackedEntities.length === 0){
+            this.__trackedEntities.push(model);
+        }
+        else{
+            if(add){
+                this.__trackedEntities.push(model);
+            }
+        }
+
         return model;
     }
 

package/package.json

@@ -4,9 +4,10 @@
     "better-sqlite3": "^9.0.0",
     "commander": "^11.1.0",
     "glob" : "^10.3.10",
-    "deep-object-diff" : "^1.1.9"
+    "deep-object-diff" : "^1.1.9",
+    "pg" : "^8.13.3"
   },
-  "version": "0.0.43",
+  "version": "0.0.45",
   "description": "An Object-relational mapping for the Master framework. Master Record connects classes to relational database tables to establish a database with almost zero-configuration ",
   "homepage": "https://github.com/Tailor/MasterRecord#readme",
   "repository": {

package/QueryLanguage/queryManager.js

@@ -1,79 +0,0 @@
-// ALL THIS SHOULD DO IS BUILD A SQL QUERY
-// version 1.0.1
-
-class queryManager{
-    constructor( query) {
-
-        /*
-            queryObject
-            {
-                "where": where user.id = 1
-                "raw": "select * from tablename where user.id = 2" OR false,
-                "builder": builderObject,
-                "select" : "*",
-                "from" : from tablename
-            }
-        */
-        this._query = query;
-        this._queryBuilder = query.builder;
-        this._context = query.builder.__context;
-    }
-    
-    single(){
-        var entityValue = this._context._SQLEngine.get(this._query.getScript());
-        var sing = this._queryBuilder.__execute(entityValue, this._queryBuilder);
-        return sing;
-    }
-
-    //
-    select(query){
-       // this will come after the where
-       this._query.select = "select " + query;
-       return this;
-    }
-    
-    count(){
-        // trying to match string select and relace with select Count(*);
-        var res = this._query.select.replace("select *", "select Count(*)");
-        var entityValue = this._context._SQLEngine.get(res);
-        var val = entityValue[Object.keys(entityValue)[0]];
-        return val;
-    }
-
-    toList(){
-        var entityValue = this._context._SQLEngine.all(this._query);
-        var toLi = this._queryBuilder.__executeList(entityValue, this._queryBuilder);
-        return toLi;
-    }
-
-}
-
-module.exports = queryManager;
-
-
-/*
-
-LINQ Extension Methods
-First()
-FirstOrDefault()
-SingleOrDefault()
-Count()
-Min()
-Max()
-Last()
-LastOrDefault()
-Average()
-*/
-/*
-
-LINQ Extension Methods
-First()
-FirstOrDefault()
-SingleOrDefault()
-Count()
-Min()
-Max()
-Last()
-LastOrDefault()
-Average()
-*/