masterrecord 0.1.1 → 0.1.3

package/SQLLiteEngine.js

@@ -1,4 +1,4 @@
-// Version 0.0.12
+// Version 0.0.13
 var tools =  require('masterrecord/Tools');
 
 class SQLLiteEngine {
@@ -423,13 +423,22 @@ class SQLLiteEngine {
         return "";
     }
 
-    // return a list of entity names and skip foreign keys and underscore.
-    getEntityList(entity){
-        var entitiesList = [];
-        var $that = this;
-        for (var ent in entity) {
-                if(!ent.startsWith("_")){
-                    if(!entity[ent].foreignKey){
+ // return a list of entity names and skip foreign keys and underscore.
+ getEntityList(entity){
+    var entitiesList = [];
+    var $that = this;
+    for (var ent in entity) {
+            if(!ent.startsWith("_")){
+                if(!entity[ent].foreignKey){
+                    if(entity[ent].relationshipTable){
+                        if($that.chechUnsupportedWords(entity[ent].relationshipTable)){
+                            entitiesList.push(`'${entity[ent].relationshipTable}'`);
+                        }
+                        else{
+                            entitiesList.push(entity[ent].relationshipTable);
+                        }
+                    }
+                    else{
                         if($that.chechUnsupportedWords(ent)){
                             entitiesList.push(`'${ent}'`);
                         }
@@ -437,16 +446,26 @@ class SQLLiteEngine {
                             entitiesList.push(ent);
                         }
                     }
-                    else{
-                        if(entity[ent].type === 'belongsTo'){
-                            entitiesList.push(`${entity[ent].foreignKey}`);
+                }
+                else{
+                    
+                    if(entity[ent].relationshipType === "belongsTo"){
+                        var name = entity[ent].foreignKey;
+                        if($that.chechUnsupportedWords(name)){
+                            entitiesList.push(`'${name}'`);
+                            //entitiesList.push(`'${ent}'`);
+                        }
+                        else{
+                            entitiesList.push(name);
+                            //entitiesList.push(ent);
                         }
                     }
+                    
                 }
             }
-        return entitiesList
-    }
-
+        }
+    return entitiesList
+}
     chechUnsupportedWords(word){
         for (var item in this.unsupportedWords) {
             var text = this.unsupportedWords[item];

package/context.js

@@ -1,4 +1,4 @@
-// Version 0.0.7
+// Version 0.0.8
 
 var modelBuilder  = require('./Entity/entityModelBuilder');
 var query = require('masterrecord/QueryLanguage/queryMethods');
@@ -91,6 +91,9 @@ class context {
 
     __findSettings(root, rootFolderLocation, envType){
 
+        if(envType === undefined){
+            envType = "development";
+        }
         var rootFolder = `${root}/${rootFolderLocation}`;
         var search = `${rootFolder}/**/*env.${envType}.json`;
         var files = globSearch.sync(search, rootFolder);

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "masterrecord",
   "dependencies": {
-    "commander": "^11.1.0",
-    "glob" : "^10.3.10",
+    "commander": "^13.1.0",
+    "glob" : "^11.0.1",
     "deep-object-diff" : "^1.1.9",
-    "pg" : "^8.13.3",
-    "sync-mysql2" : "^1.0.4",
+    "pg" : "^8.14.1",
+    "sync-mysql2" : "^1.0.5",
     "app-root-path": "^3.1.0"
   },
-  "version": "0.1.1",
+  "version": "0.1.3",
   "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": {