masterrecord 0.0.23 → 0.0.24

package/QueryLanguage/_simpleQuery.js

@@ -1,184 +1,184 @@
-// ALL THIS SHOULD DO IS BUILD A SQL QUERY
-var EntityTrackerModel  = require('masterrecord/Entity/EntityTrackerModel');
-var Tokenize  = require('masterrecord/QueryLanguage/_Tokenization');
-var QueryModel = require('masterrecord/QueryLanguage/_QueryModel');
-
-
-class simpleQuery{
-    constructor(model, context) {
-        this.__model = model;
-        this.__context = context;
-        this.__contextList = context.__allContexts;
-        this.__queryModel = new QueryModel(model, context);
-    }
-    
-    raw(query){
-
-    }
-
-    add(entityValue){
-        // This will call context API to REMOVE entity to update list
-        var ent = EntityTrackerModel.build(entityValue, this.__model);
-        ent.__state = "insert";
-        this.__context.__Track(ent);
-    }
-    
-    remove(entityValue){
-        // This will call context API to REMOVE entity to Delete list
-        var ent = EntityTrackerModel.build(entityValue, this.__model);
-        ent.__state = "delete";
-        this.__context.__Track(ent);
-    }
-
-    track(entityValue){
-        var ent = EntityTrackerModel.build(entityValue, this.__model);
-        ent.__state = "track";
-        return this.__context.__Track(ent);
-    }
-    
-
-    toList(){
-        // Rule you cannot do fucntions on queryNames s.count() will through error
-        /// select delimiter
-        // select [ID] AS [ID], 
-        // CASE WHEN ([Extent1].[Name] LIKE N'%jist%') THEN cast(1 as bit) WHEN ( NOT ([Extent1].[Name] LIKE N'%Jist%')) THEN cast(0 as bit) END AS [C1],
-        // cannot do where on fields that dont have relationships;;
-            var qq = `s => ({
-                id: s.Id,
-                jj: s.Name != "richy" && s.james === "josj",
-                name: !s.Name.contains("jist"),
-                NumberOfFruits : s.Fruits.where(r => r.name == "richard").single().Courses.distinct()
-           }`;
-
-           var were = `s => s.Fruits.where(r => r.name == "richard").single().flys.distinct().toList()`;
-
-           var QueryModelTest = {
-                name : "posts",
-                limit:{},
-                dateRange: "",
-                conditions:[],
-                selects: [{
-                    returnName : "id",
-                    field : {
-                        property: "s",
-                        name : "id"
-                    },
-                    property : "s",
-                },{
-                    returnName : "jj",
-                    field : {
-                        property : "s",
-                        name : "Name"
-                    },
-                    property : "s",
-                    operators : [{
-                        property : "s",
-                        field: "Name",
-                        operator: "notEqual",
-                        value : "richy",
-                        logicalOperator : "and"
-                    },{
-                        property : "s",
-                        field: "james",
-                        operator: "equal",
-                        value : "josj",
-                        logicalOperator : ""
-                    }]
-                },{
-                    returnName : "name",
-                    field : {
-                        property : "s",
-                        name : "name"
-                    },
-                    property : "s",
-                    operator: [{
-                        property : "s",
-                        field: "name",
-                        operator: "not",
-                        value : "",
-                        logicalOperator : "",
-                    },
-                    {
-                        property : "s",
-                        field: "Name",
-                        operator: "in",
-                        value : "jist",
-                        logicalOperator : "",
-                    }]
-                },
-                {
-                    returnName : "NumberOfFruits",
-                    fields : {},
-                    property : "s",
-                    operator: [],
-                }
-            ],
-            relationships :  [{ // union all relationships together
-                name: "Fruits", // could be changed nested type
-                dateRange: "",
-                limits: {
-                    amount :1,
-                    object : "single"  //  nested limit will produce inner select top
-                },
-                selects:[],
-                relationships: [{
-                    name: "flys", // could be changed nested type
-                    dateRange: "",
-                    limits: {},
-                    selects:[],
-                    relationships: [],
-                    conditions: []
-                }],
-                conditions: [{
-                    type: "where",
-                    context: "r",
-                    field : {
-                        property : "r",
-                        name : "id"
-                    },
-                    operators: [{
-                        property : "r",
-                        field: "name",
-                        operator: "equal",
-                        value : "richard",
-                        logicalOperator : ""
-                    }],
-                }]
-            }]
-
-        };
-
-
-        var tt = new Tokenize();
-        var tokenList = tt.Tokenize(qq);
-        var james = this.__queryModel.select(tokenList);
-        var jj = "";
-    }
-
-    where(query){
-        if(query !== undefined || query !== null){
-            var tt = new Tokenize();
-            var tokenList = tt.Tokenize(query);
-            this.__queryModel.condition(tokenList, "where");
-        }
-        return this;
-    }
-
-    select(query){
-        var tt = new Tokenize();
-        var tokenList = tt.Tokenize(query);
-        this.__queryModel.select(tokenList);
-        return this;
-    }
-    
-    // can only be used at the end of a query not an inner query
-    single(){
-        return this;
-    }
-
-    distinct(){
-        return this;
-    }
-}
-
+// ALL THIS SHOULD DO IS BUILD A SQL QUERY
+var EntityTrackerModel  = require('masterrecord/Entity/EntityTrackerModel');
+var Tokenize  = require('masterrecord/QueryLanguage/_Tokenization');
+var QueryModel = require('masterrecord/QueryLanguage/_QueryModel');
+
+
+class simpleQuery{
+    constructor(model, context) {
+        this.__model = model;
+        this.__context = context;
+        this.__contextList = context.__allContexts;
+        this.__queryModel = new QueryModel(model, context);
+    }
+    
+    raw(query){
+
+    }
+
+    add(entityValue){
+        // This will call context API to REMOVE entity to update list
+        var ent = EntityTrackerModel.build(entityValue, this.__model);
+        ent.__state = "insert";
+        this.__context.__Track(ent);
+    }
+    
+    remove(entityValue){
+        // This will call context API to REMOVE entity to Delete list
+        var ent = EntityTrackerModel.build(entityValue, this.__model);
+        ent.__state = "delete";
+        this.__context.__Track(ent);
+    }
+
+    track(entityValue){
+        var ent = EntityTrackerModel.build(entityValue, this.__model);
+        ent.__state = "track";
+        return this.__context.__Track(ent);
+    }
+    
+
+    toList(){
+        // Rule you cannot do fucntions on queryNames s.count() will through error
+        /// select delimiter
+        // select [ID] AS [ID], 
+        // CASE WHEN ([Extent1].[Name] LIKE N'%jist%') THEN cast(1 as bit) WHEN ( NOT ([Extent1].[Name] LIKE N'%Jist%')) THEN cast(0 as bit) END AS [C1],
+        // cannot do where on fields that dont have relationships;;
+            var qq = `s => ({
+                id: s.Id,
+                jj: s.Name != "richy" && s.james === "josj",
+                name: !s.Name.contains("jist"),
+                NumberOfFruits : s.Fruits.where(r => r.name == "richard").single().Courses.distinct()
+           }`;
+
+           var were = `s => s.Fruits.where(r => r.name == "richard").single().flys.distinct().toList()`;
+
+           var QueryModelTest = {
+                name : "posts",
+                limit:{},
+                dateRange: "",
+                conditions:[],
+                selects: [{
+                    returnName : "id",
+                    field : {
+                        property: "s",
+                        name : "id"
+                    },
+                    property : "s",
+                },{
+                    returnName : "jj",
+                    field : {
+                        property : "s",
+                        name : "Name"
+                    },
+                    property : "s",
+                    operators : [{
+                        property : "s",
+                        field: "Name",
+                        operator: "notEqual",
+                        value : "richy",
+                        logicalOperator : "and"
+                    },{
+                        property : "s",
+                        field: "james",
+                        operator: "equal",
+                        value : "josj",
+                        logicalOperator : ""
+                    }]
+                },{
+                    returnName : "name",
+                    field : {
+                        property : "s",
+                        name : "name"
+                    },
+                    property : "s",
+                    operator: [{
+                        property : "s",
+                        field: "name",
+                        operator: "not",
+                        value : "",
+                        logicalOperator : "",
+                    },
+                    {
+                        property : "s",
+                        field: "Name",
+                        operator: "in",
+                        value : "jist",
+                        logicalOperator : "",
+                    }]
+                },
+                {
+                    returnName : "NumberOfFruits",
+                    fields : {},
+                    property : "s",
+                    operator: [],
+                }
+            ],
+            relationships :  [{ // union all relationships together
+                name: "Fruits", // could be changed nested type
+                dateRange: "",
+                limits: {
+                    amount :1,
+                    object : "single"  //  nested limit will produce inner select top
+                },
+                selects:[],
+                relationships: [{
+                    name: "flys", // could be changed nested type
+                    dateRange: "",
+                    limits: {},
+                    selects:[],
+                    relationships: [],
+                    conditions: []
+                }],
+                conditions: [{
+                    type: "where",
+                    context: "r",
+                    field : {
+                        property : "r",
+                        name : "id"
+                    },
+                    operators: [{
+                        property : "r",
+                        field: "name",
+                        operator: "equal",
+                        value : "richard",
+                        logicalOperator : ""
+                    }],
+                }]
+            }]
+
+        };
+
+
+        var tt = new Tokenize();
+        var tokenList = tt.Tokenize(qq);
+        var james = this.__queryModel.select(tokenList);
+        var jj = "";
+    }
+
+    where(query){
+        if(query !== undefined || query !== null){
+            var tt = new Tokenize();
+            var tokenList = tt.Tokenize(query);
+            this.__queryModel.condition(tokenList, "where");
+        }
+        return this;
+    }
+
+    select(query){
+        var tt = new Tokenize();
+        var tokenList = tt.Tokenize(query);
+        this.__queryModel.select(tokenList);
+        return this;
+    }
+    
+    // can only be used at the end of a query not an inner query
+    single(){
+        return this;
+    }
+
+    distinct(){
+        return this;
+    }
+}
+
 module.exports = simpleQuery;

package/QueryLanguage/queryBuilder.js

@@ -1,52 +1,52 @@
-// ALL THIS SHOULD DO IS BUILD A SQL QUERY
-// version 1.0.1
-
-var entityTrackerModel  = require('masterrecord/Entity/EntityTrackerModel');
-
-class queryBuilder{
-    constructor(model, context) {
-        this.__model = model;
-        this.__context = context;
-        this.__contextList = context.__allContexts;
-    }
-    
-    raw(query){
-        // get the query
-        var entityValue = this.__context._SQLEngine.get(query);
-        if(entityValue){
-            var ent = new entityTrackerModel();
-            ent.build(entityValue, this.__model);
-            ent.__state = "track";
-            this.__context.__Track(ent);
-            return ent;
-        }else{
-            return null;
-        }
-
-    }
-
-    add(entityValue){
-        // This will call context API to REMOVE entity to update list
-        var ent = new entityTrackerModel();
-        ent.build(entityValue, this.__model);
-        ent.__state = "insert";
-        this.__context.__Track(ent);
-    }
-    
-    remove(entityValue){
-        // This will call context API to REMOVE entity to Delete list
-        var ent = new entityTrackerModel();
-        ent.build(entityValue, this.__model);
-        ent.__state = "delete";
-        this.__context.__Track(ent);
-    }
-
-    track(entityValue){
-        var ent = new entityTrackerModel();
-        ent.build(entityValue, this.__model);
-        ent.__state = "track";
-        return this.__context.__Track(ent);
-    }
-}
-
+
+// version 1.0.15
+
+var entityTrackerModel  = require('masterrecord/Entity/EntityTrackerModel');
+
+class queryBuilder{
+    constructor(model, context) {
+        this.__model = model;
+        this.__context = context;
+        this.__contextList = context.__allContexts;
+    }
+    
+    raw(query){
+        // get the query
+        var entityValue = this.__context._SQLEngine.get(query);
+        if(entityValue){
+            var ent = new entityTrackerModel();
+            ent.build(entityValue, this.__model);
+            ent.__state = "track";
+            this.__context.__Track(ent);
+            return ent;
+        }else{
+            return null;
+        }
+
+    }
+
+    add(entityValue){
+        // This will call context API to REMOVE entity to update list
+        var ent = new entityTrackerModel();
+        ent.build(entityValue, this.__model);
+        ent.__state = "insert";
+        this.__context.__Track(ent);
+    }
+    
+    remove(entityValue){
+        // This will call context API to REMOVE entity to Delete list
+        var ent = new entityTrackerModel();
+        ent.build(entityValue, this.__model);
+        ent.__state = "delete";
+        this.__context.__Track(ent);
+    }
+
+    track(entityValue){
+        var ent = new entityTrackerModel();
+        ent.build(entityValue, this.__model);
+        ent.__state = "track";
+        return this.__context.__Track(ent);
+    }
+}
+
 module.exports = queryBuilder;

package/{SQLEngine.js → SQLiteEngine.js}

@@ -1,52 +1,56 @@
-
-class SQLEngine {
-    update(query){
-        var query = ` UPDATE ${query.tableName}
-        SET ${query.arg} 
-        WHERE ${query.primaryKey} = ${query.value}` // primary key for that table = 
-        return this.execute(query);
-   }
-
-    delete(query){
-       var query = `DELETE FROM ${query.tableName} WHERE ${query.primaryKey} = ${query.value}`;
-       return this.execute(query);
-    }
-
-    insert(query){
-        var query = `INSERT INTO ${query.tableName} (${query.columns})
-        VALUES (${query.values})`;
-        return this.execute(query);
-    }
-
-    execute(query){
-
-        switch(this.db.__name) {
-            case "better-sqlite3":
-                console.log("SQL:", query);
-                return this.db.exec(query);
-                // code block
-            break;
-        }
-    }
-
-    get(query){
-    switch(this.db.__name) {
-        case "better-sqlite3":
-            try {
-                console.log("SQL:", query);
-                return this.db.prepare(query).get();
-            } catch (err) {
-                console.error(err);
-                return null;
-            }
-            // code block
-        break;
-        }
-    }
-
-    setDB(db){
-       this.db = db;
-   }
-}
-
-module.exports = SQLEngine;
+
+class SQLiteEngine {
+    update(query){
+        var query = ` UPDATE ${query.tableName}
+        SET ${query.arg} 
+        WHERE ${query.primaryKey} = ${query.value}` // primary key for that table = 
+        return this.execute(query);
+   }
+
+    delete(query){
+       var query = `DELETE FROM ${query.tableName} WHERE ${query.primaryKey} = ${query.value}`;
+       return this.execute(query);
+    }
+
+    insert(query){
+        var query = `INSERT INTO ${query.tableName} (${query.columns})
+        VALUES (${query.values})`;
+        return this.execute(query);
+    }
+
+    execute(query){
+
+        switch(this.db.__name) {
+            case "better-sqlite3":
+                console.log("SQL:", query);
+                return this.db.exec(query);
+                // code block
+            break;
+        }
+    }
+
+    get(query){
+    switch(this.db.__name) {
+        case "better-sqlite3":
+            try {
+                console.log("SQL:", query);
+                return this.db.prepare(query).get();
+            } catch (err) {
+                console.error(err);
+                return null;
+            }
+            // code block
+        break;
+        }
+    }
+
+    setDB(env, sqlName){
+        const sqlite3 = require(sqlName);
+        let DBAddress = `${env.connection}${env.env}.sqlite3`;
+        this.db = new sqlite3(DBAddress, env);
+        db.__name = sqlName;
+        return db;
+   }
+}
+
+module.exports = SQLiteEngine;