masterrecord 0.0.33 → 0.0.34

package/Migrations/cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-// version 0.0.5
+// version 0.0.7
 // https://docs.microsoft.com/en-us/ef/ef6/modeling/code-first/migrations/
 // how to add environment variables on cli call example - master=development masterrecord add-migration auth authContext
 
@@ -16,7 +16,7 @@ const [,, ...args] = process.argv
 
 program
   .version('0.0.2')
-  .option('-v, --version', '0.0.33') 
+  .option('-v, --version', '0.0.34') 
   .description('A ORM framework that facilitates the creation and use of business objects whose data requires persistent storage to a database');
 
   // Instructions : to run command you must go to main project folder is located and run the command using the context file name.
@@ -46,7 +46,7 @@ program
   });
 
   // Instructions : to run command you must go to folder where migration file is located.
-  program
+  program //// TODO ---- WHY MIGRATION IS CREATING ADD COLUMSN AS WELL AS NEW TABLE
   .command('add-migration <name> <contextFileName>')
   .alias('am')
   .action(function(name, contextFileName){
@@ -62,7 +62,7 @@ program
           var contextSnapshot = require(files[0]);
           var context = require(contextSnapshot.contextLocation);
           var contextInstance = new context();
-          var newEntity = migration.template(name, contextSnapshot.schema, contextInstance .__entities);
+          var newEntity = migration.template(name, contextSnapshot.schema, contextInstance.__entities);
           var migrationDate = Date.now();
           var file = `${contextSnapshot.migrationFolder}/${migrationDate}_${name}_migration.js`
           fs.writeFile(file, newEntity, 'utf8', function (err) {
@@ -103,13 +103,12 @@ program
              });
  
              var mFile = mFiles[0];
-             var migrationFile = require(mFile);
+             var migrationProjectFile = require(mFile);
              var context = require(contextSnapshot.contextLocation);
              var contextInstance = new context();
-             var newMigrationInstance = new migrationFile(context);
-        
-             var tableObj = migration.up(contextSnapshot.schema, contextInstance.__entities);
-             newMigrationInstance.up(tableObj);
+             var newMigrationProjectInstance = new migrationProjectFile(context);
+             var tableObj = migration.buildUpObject(contextSnapshot.schema, contextInstance.__entities);
+             newMigrationProjectInstance.up(tableObj);
             
              var snap = {
                file : contextSnapshot.contextLocation,

package/Migrations/migrationSQLiteQuery.js

@@ -1,5 +1,5 @@
 
-// verison 0.0.3
+// verison 0.0.5
 class migrationSQLiteQuery {
 
     #tempTableName = "_temp_alter_column_update"
@@ -60,12 +60,12 @@ class migrationSQLiteQuery {
 
     alterColumn(fullTable, table){
         if(table){
-            table.newName = this.tempTableName;
+            table.newName = this.#tempTableName;
             return {
                 1 : this.renameTable(table),
-                2 : this.createTable(table.tableName, fullTable),
+                2 : this.createTable(fullTable),
                 3 : this.insertInto(table.tableName, fullTable),
-                4 : this.dropTable(this.tempTableName)
+                4 : this.dropTable(this.#tempTableName)
             }
         }
         else{
@@ -100,7 +100,7 @@ class migrationSQLiteQuery {
 
     insertInto(name, table){
         return `INSERT INTO ${name} (${this.#getTableColumns(table)})
-        SELECT ${this.#getTableColumns(table)} FROM ${this.tempTableName}`;
+        SELECT ${this.#getTableColumns(table)} FROM ${this.#tempTableName}`;
     }
 
     createTable(table){
@@ -110,21 +110,21 @@ class migrationSQLiteQuery {
                 queryVar += `${this.#columnMapping(table[key])}, `;
             }
         }
-     
+    
         return `CREATE TABLE ${table.__name} (${queryVar.replace(/,\s*$/, "")});`;
 
             /*
-            INTEGER PRIMARY KEY AUTOINCREMENT
-                all these are equal to interger
-            INT
-            INTEGER
-            TINYINT
-            SMALLINT
-            MEDIUMINT
-            BIGINT
-            UNSIGNED BIG INT
-            INT2
-            INT8 
+                INTEGER PRIMARY KEY AUTOINCREMENT
+                    all these are equal to interger
+                INT
+                INTEGER
+                TINYINT
+                SMALLINT
+                MEDIUMINT
+                BIGINT
+                UNSIGNED BIG INT
+                INT2
+                INT8 
             */
     }
 

package/Migrations/migrations.js

@@ -1,4 +1,4 @@
-// version 0.0.5
+// version 0.0.7
 // learn more about seeding info -  https://www.pauric.blog/Database-Updates-and-Migrations-with-Entity-Framework/
 
 var fs = require('fs');
@@ -186,22 +186,22 @@ class Migrations{
     }
 
     //
-    up(oldSchema, newSchema){
+    buildUpObject(oldSchema, newSchema){
         var tableObj = {}
         var tables = this.#buildMigrationObject(oldSchema, newSchema); 
         tables.forEach(function (item, index) {
                     // add new columns for table
                     var columnInfo = tables[index];
                     
+                    item.newTables.forEach(function (column, ind) {
+                        tableObj[item.name] = columnInfo.new;
+                    });
+
                     item.newColumns.forEach(function (column, ind) {
                         columnInfo.new[column].tableName = item.name;
                         tableObj[column] = columnInfo.new[column];
                     });
 
-                    item.newTables.forEach(function (column, ind) {
-                        tableObj[item.name] = columnInfo.new;
-                    });
-
                     item.deletedColumns.forEach(function (column, ind) {
                         columnInfo.old[column].tableName = item.name;
                         tableObj[column] = columnInfo.old[column];
@@ -218,24 +218,35 @@ class Migrations{
 
                     tableObj.___table = item;
                 });
-                return tableObj;
+        return tableObj;
     }
 
     template(name, oldSchema, newSchema){
+        
         var MT = new MigrationTemplate(name);
         var tables = this.#buildMigrationObject(oldSchema, newSchema);
         tables.forEach(function (item, index) {
-            // add new columns for table
-            item.newColumns.forEach(function (column, index) {
-                MT.addColumn("up", column, item.name);
-                MT.dropColumn("down", column, item.name);
-            });
+            if(item.old === null){
+                MT.createTable("up", column, item.name);
+                MT.dropTable("down", column, item.name);
+            }
+            
+            if(item.new === null){
+                MT.dropTable("up", column, item.name);
+                MT.createTable("down", column, item.name);
+            }
 
             item.newTables.forEach(function (column, ind) {
                 MT.createTable("up", item.name);
                 MT.dropTable("down", item.name);
             });
 
+            // add new columns for table
+            item.newColumns.forEach(function (column, index) {
+                MT.addColumn("up", column, item.name);
+                MT.dropColumn("down", column, item.name);
+            });
+
             item.deletedColumns.forEach(function (column, index) {
                 MT.dropColumn("up", column, item.name);
                 MT.addColumn("down",column, item.name);
@@ -249,16 +260,6 @@ class Migrations{
                 }
             });
 
-            if(item.old === null){
-                MT.createTable("up", column, item.name);
-                MT.dropTable("down", column, item.name);
-
-            }
-            if(item.new === null){
-                MT.dropTable("up", column, item.name);
-                MT.createTable("down", column, item.name);
-            }
-
         });
 
        return MT.get();

package/context.js

@@ -1,4 +1,4 @@
-// Version 0.0.1
+// Version 0.0.3
 
 var modelBuilder  = require('./Entity/EntityModelBuilder');
 var query = require('masterrecord/QueryLanguage/queryMethods');
@@ -8,7 +8,7 @@ var MYSQLEngine = require('masterrecord/MYSQLEngine');
 var insertManager = require('./InsertManager');
 var deleteManager = require('./DeleteManager');
 var globSearch = require("glob");
-
+var fs = require('fs');
 
 class context {
     _isModelValid = {
@@ -41,6 +41,7 @@ class context {
     */
     __SQLiteInit(env, sqlName){
         try{
+           
             const sqlite3 = require(sqlName);
             let DBAddress = env.completeConnection;
             var db = new sqlite3(DBAddress, env);
@@ -65,6 +66,7 @@ class context {
           */
     __mysqlInit(env, sqlName){
         try{
+            
             const mysql = require(sqlName);
             const connection = mysql.createConnection(env);
             connection.connect();
@@ -121,22 +123,26 @@ class context {
     }
 
     useSqlite(rootFolderLocation){
-            this.isSQite = true;
-            var root =  process.cwd();
-            var envType = this.__enviornment;
-            var contextName = this.__name;
-            var file = this.__findSettings(root, rootFolderLocation, envType);
-            var settings = require(file.file);
-            var options = settings[contextName];
-            if(options === undefined){
-                console.log("settings missing context name settings");
-                throw error("settings missing context name settings");
-            }
-            this.validateSQLiteOptions(options);
-            options.completeConnection = `${file.rootFolder}${options.connection}`;
-            this.db = this.__SQLiteInit(options,  "better-sqlite3");
-            this._SQLEngine.setDB(this.db, "better-sqlite3");
-            return this;
+        this.isSQite = true;
+        var root =  process.cwd();
+        var envType = this.__enviornment;
+        var contextName = this.__name;
+        var file = this.__findSettings(root, rootFolderLocation, envType);
+        var settings = require(file.file);
+        var options = settings[contextName];
+        if(options === undefined){
+            console.log("settings missing context name settings");
+            throw error("settings missing context name settings");
+        }
+        this.validateSQLiteOptions(options);
+        options.completeConnection = `${file.rootFolder}${options.connection}`;
+        var dbDirectory = options.completeConnection.substr(0, options.completeConnection.lastIndexOf("\/"));
+        if (!fs.existsSync(dbDirectory)){
+            fs.mkdirSync(dbDirectory);
+        }
+        this.db = this.__SQLiteInit(options,  "better-sqlite3");
+        this._SQLEngine.setDB(this.db, "better-sqlite3");
+        return this;
     }
 
     validateSQLiteOptions(options){

package/package.json

@@ -6,7 +6,7 @@
     "glob" : "^8.0.3",
     "deep-object-diff" : "^1.1.7"
   },
-  "version": "0.0.33",
+  "version": "0.0.34",
   "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": {