masterrecord 0.2.7 → 0.2.9

package/Migrations/cli.js

@@ -218,6 +218,84 @@ program.option('-V', 'output the version');
   });
 
 
+  program
+  .command('update-database-down <contextFileName>')
+  .alias('udd')
+  .description('Run the latest migration down method for the given context')
+  .action(function(contextFileName){
+    var executedLocation = process.cwd();
+    contextFileName = contextFileName.toLowerCase();
+    var migration = new Migration();
+    try{
+       var search = `${executedLocation}/**/*${contextFileName}_contextSnapShot.json`;
+       var files = globSearch.sync(search, executedLocation);
+       var file = files && files[0];
+       if(!file){
+         console.log(`Error - Cannot read or find Context snapshot '${contextFileName}_contextSnapShot.json' in '${executedLocation}'.`);
+         return;
+       }
+       var contextSnapshot;
+       try{
+         contextSnapshot = require(file);
+       }catch(_){
+         console.log(`Error - Cannot read context snapshot at '${file}'.`);
+         return;
+       }
+       var searchMigration = `${contextSnapshot.migrationFolder}/**/*_migration.js`;
+       var migrationFiles = globSearch.sync(searchMigration, contextSnapshot.migrationFolder);
+       if(!(migrationFiles && migrationFiles.length)){
+         console.log("Error - Cannot read or find migration file");
+         return;
+       }
+       // Sort and select latest
+       var mFiles = migrationFiles.slice().sort(function(a, b){
+         return __getMigrationTimestamp(a) - __getMigrationTimestamp(b);
+       });
+       var latestFile = mFiles[mFiles.length - 1];
+
+       // Prepare context and table object
+       let ContextCtor;
+       try{
+         ContextCtor = require(contextSnapshot.contextLocation);
+       }catch(_){
+         console.log(`Error - Cannot load Context file at '${contextSnapshot.contextLocation}'.`);
+         return;
+       }
+       var contextInstance;
+       try{
+         contextInstance = new ContextCtor();
+       }catch(_){
+         console.log(`Error - Failed to construct Context from '${contextSnapshot.contextLocation}'.`);
+         return;
+       }
+       var cleanEntities = migration.cleanEntities(contextInstance.__entities);
+       var tableObj = migration.buildUpObject(contextSnapshot.schema, cleanEntities);
+
+       var MigCtor = require(latestFile);
+       var migInstance = new MigCtor(ContextCtor);
+       if(typeof migInstance.down === 'function'){
+         migInstance.down(tableObj);
+       }else{
+         console.log(`Warning - Migration '${path.basename(latestFile)}' has no down method; skipping.`);
+       }
+
+       // Update snapshot
+       var snap = {
+         file : contextSnapshot.contextLocation,
+         executedLocation : executedLocation,
+         context : contextInstance,
+         contextEntities : cleanEntities,
+         contextFileName: contextFileName
+       }
+       migration.createSnapShot(snap);
+       console.log("database updated");
+
+    }catch (e){
+      console.log("Error - Cannot read or find file ", e);
+    }
+  });
+
+
   program
   .command('update-database-restart <contextFileName>')
   .alias('udr')

package/Migrations/migrations.js

@@ -1,4 +1,4 @@
-// version 0.0.8
+// version 0.0.9
 // learn more about seeding info -  https://www.pauric.blog/Database-Updates-and-Migrations-with-Entity-Framework/
 
 var fs = require('fs');
@@ -238,6 +238,9 @@ class Migrations{
         tables.forEach(function (item, index) {
                     // add new columns for table
                     var columnInfo = tables[index];
+                    // Always expose each table under its name so templates like
+                    // this.createTable(table.TableName) can safely access it.
+                    tableObj[item.name] = columnInfo.new;
                     
                     item.newTables.forEach(function (column, ind) {
                         tableObj[item.name] = columnInfo.new;

package/Migrations/schema.js

@@ -1,4 +1,4 @@
-// version 0.0.5
+// version 0.0.6
 class schema{
 
     constructor(context){
@@ -85,7 +85,7 @@ class schema{
                 }
             }
         }else{
-            console.log("Table that your trying to create is undefined. PLease check if there are any changes that need to be made");
+            console.log("Table that you're trying to create is undefined. Please check if there are any changes that need to be made");
         }
     }
 

package/mySQLEngine.js

@@ -570,8 +570,23 @@ class SQLLiteEngine {
 
     _execute(query){
         console.log("SQL:", query);
-        this.db.connect(this.db);
-        return this.db.query(query);
+        try{
+            this.db.connect(this.db);
+            const res = this.db.query(query);
+            if(res === null){
+                console.error('MySQL execute skipped: connection not defined');
+                return null;
+            }
+            return res;
+        }catch(err){
+            const code = err && err.code ? err.code : '';
+            if(code === 'ER_BAD_DB_ERROR' || code === 'ECONNREFUSED' || code === 'PROTOCOL_CONNECTION_LOST'){
+                console.error('MySQL execute skipped: connection not defined');
+                return null;
+            }
+            console.error(err);
+            return null;
+        }
     }
 
      _run(query){

package/mySQLSyncConnect.js

@@ -1,28 +1,45 @@
-// version : 0.0.1
+// version : 0.0.3
 
 var MySql = require('sync-mysql2');
 
 class MySQLClient {
     constructor(config) {
-        this.config = config;
+        this.config = config ? { ...config } : {};
+        if (this.config && Object.prototype.hasOwnProperty.call(this.config, 'type')) {
+            delete this.config.type;
+        }
         this.connection = null;
     }
 
     connect() {
-        if (!this.connection) {
-            this.connection = new MySql(this.config);
+        try {
+            if (!this.connection) {
+                const { type, ...safeConfig } = this.config || {};
+                this.connection = new MySql(safeConfig);
+            }
+        } catch (err) {
+            // Swallow connection errors and leave connection undefined so callers can react gracefully
+            console.error('MySQL connect error:', err && err.code ? err.code : err);
+            this.connection = null;
+            return null;
         }
     }
 
     query(sql, params = []) {
         try {
             if (!this.connection) {
-                throw new Error('Database connection not established. Call connect() first.');
+                return null;
             }
             var jj = this.connection.query(sql);
             this.connection.finishAll();
             return jj;
         } catch (err) {
+            // If the underlying driver surfaces bad DB or network errors, normalize to null
+            const code = err && err.code ? err.code : '';
+            if(code === 'ER_BAD_DB_ERROR' || code === 'ECONNREFUSED' || code === 'PROTOCOL_CONNECTION_LOST'){
+                console.error('MySQL query skipped due to connection not defined');
+                return null;
+            }
             console.error(err);
             return null;
         }

package/package.json

@@ -9,7 +9,7 @@
     "app-root-path": "^3.1.0",
     "better-sqlite3": "^12.4.1"
   },
-  "version": "0.2.7",
+  "version": "0.2.9",
   "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": {