meadow 2.0.14 → 2.0.16

package/.config/configstore/update-notifier-npm.json

@@ -1,4 +1,4 @@
 {
 	"optOut": false,
-	"lastUpdateCheck": 1690759243854
+	"lastUpdateCheck": 1699195015190
 }

package/.config/vscode-sqltools/runningInfo.json

@@ -1,7 +1,7 @@
 {
   "numericVersion": 10000,
   "releaseNotes": "https://vscode-sqltools.mteixeira.dev/changelog#v-1-0-0",
-  "run": 1690759233978,
+  "run": 1754854114603,
   "updated": false,
   "version": "1.0.0",
   "lastNotificationDate": 0,

package/README.md

@@ -119,6 +119,20 @@ meadow.doRead(queryDescription,
 ```
 
 
+## MSSQL Docker Image
+
+To run the Microsoft SQL Server tests, you can use the free image on dockerhub.
+
+```
+docker run -e "ACCEPT_EULA=Y" -e "MSSQL_SA_PASSWORD=1234567890abc." -p 14333:1433 --name meadow-mssql-test --hostname meadowsqltest -d mcr.microsoft.com/mssql/server:2022-latest
+```
+
+Then you need to create the test database:
+
+```
+docker exec meadow-mssql-test sh -c "/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P '1234567890abc.' -Q 'CREATE DATABASE bookstore;'"
+```
+
 ### Docker Development Environment
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meadow",
-  "version": "2.0.14",
+  "version": "2.0.16",
   "description": "A data access library.",
   "main": "source/Meadow.js",
   "scripts": {
@@ -46,28 +46,28 @@
   },
   "homepage": "https://github.com/stevenvelozo/meadow",
   "devDependencies": {
-    "alasql": "^4.1.3",
+    "alasql": "^4.1.10",
     "browserify": "^17.0.0",
-    "chai": "4.3.7",
-    "fable": "^3.0.75",
+    "chai": "4.3.10",
+    "fable": "^3.1.18",
     "gulp": "^4.0.2",
     "gulp-babel": "^8.0.0",
     "gulp-sourcemaps": "^3.0.0",
     "gulp-terser": "^2.1.0",
     "gulp-util": "^3.0.8",
-    "meadow-connection-mssql": "^1.0.4",
+    "meadow-connection-mssql": "^1.0.9",
     "meadow-connection-mysql": "^1.0.4",
     "mocha": "10.2.0",
-    "mysql2": "^3.5.2",
+    "mysql2": "^3.6.3",
     "nyc": "^15.1.0",
     "vinyl-buffer": "^1.0.1",
     "vinyl-source-stream": "^2.0.0"
   },
   "dependencies": {
-    "async": "3.2.4",
-    "foxhound": "^2.0.10",
+    "async": "3.2.5",
+    "foxhound": "^2.0.13",
     "is-my-json-valid": "2.20.6",
-    "npm-check-updates": "^16.10.17",
+    "npm-check-updates": "^16.14.6",
     "simple-get": "^4.0.1"
   }
 }

package/source/behaviors/Meadow-Update.js

@@ -47,8 +47,18 @@ var meadowBehaviorUpdate = function(pMeadow, pQuery, fCallBack)
 					switch (pMeadow.schema[i].Type)
 					{
 						case 'UpdateIDUser':
+							// Don't obliterate these from the record if automagic is disabled
+							if (!pQuery.query.disableAutoUserStamp)
+							{
+								pQuery.query.records[0][pMeadow.schema[i].Column] = false;
+							}
+							break;
 						case 'UpdateDate':
-							pQuery.query.records[0][pMeadow.schema[i].Column] = false;
+							// Don't obliterate these from the record if automagic is disabled
+							if (!pQuery.query.disableAutoDateStamp)
+							{
+								pQuery.query.records[0][pMeadow.schema[i].Column] = false;
+							}
 							break;
 					}
 				}

package/source/providers/Meadow-Provider-SQLite.js

@@ -0,0 +1,296 @@
+/**
+* @license MIT
+* @author <steven@velozo.com>
+*/
+var MeadowProvider = function ()
+{
+	function createNew(pFable)
+	{
+		// If a valid Fable object isn't passed in, return a constructor
+		if (typeof (pFable) !== 'object')
+		{
+			return { new: createNew };
+		}
+		var _Fable = pFable;
+
+		/**
+		 * Build a connection pool, shared within this provider.
+		 * This may be more performant as a shared object.
+		 */
+		var getDB = function ()
+		{
+			if (typeof (_Fable.MeadowMySQLConnectionPool) == 'object')
+			{
+				// This is where the old-style SQL Connection pool is.  Refactor doesn't even look for it anymore
+				return _Fable.MeadowMySQLConnectionPool;
+			}
+
+			// New-style default connection pool provider
+			if (typeof (_Fable.MeadowMySQLProvider) == 'object' && _Fable.MeadowMySQLProvider.connected)
+			{
+				return _Fable.MeadowMySQLProvider.pool;
+			}
+
+			return false;
+		};
+
+		var getProvider = function ()
+		{
+			if (typeof (_Fable.MeadowMySQLConnectionPool) == 'object')
+			{
+				// This is where the old-style SQL Connection pool is.  Refactor doesn't even look for it anymore
+				return _Fable.MeadowMySQLConnectionPool;
+			}
+
+			// New-style default connection pool provider
+			if (typeof (_Fable.MeadowMySQLProvider) == 'object')
+			{
+				return _Fable.MeadowMySQLProvider;
+			}
+
+			return false;
+		}
+
+		// The Meadow marshaller also passes in the Schema as the third parameter, but this is a blunt function ATM.
+		var marshalRecordFromSourceToObject = function (pObject, pRecord)
+		{
+			// For now, crudely assign everything in pRecord to pObject
+			// This is safe in this context, and we don't want to slow down marshalling with millions of hasOwnProperty checks
+			for (var tmpColumn in pRecord)
+			{
+				pObject[tmpColumn] = pRecord[tmpColumn];
+			}
+		};
+
+		var Create = function (pQuery, fCallback)
+		{
+			var tmpResult = pQuery.parameters.result;
+
+			pQuery.setDialect('SQLite').buildCreateQuery();
+
+			// TODO: Test the query before executing
+			if (pQuery.logLevel > 0)
+			{
+				_Fable.log.trace(pQuery.query.body, pQuery.query.parameters);
+			}
+
+			getDB().getConnection(function (pError, pDBConnection)
+			{
+				pDBConnection.query(
+					pQuery.query.body,
+					pQuery.query.parameters,
+					function (pError, pRows)
+					{
+						pDBConnection.release();
+						tmpResult.error = pError;
+						tmpResult.value = false;
+						try
+						{
+							tmpResult.value = pRows.insertId;
+						}
+						catch (pErrorGettingRowcount)
+						{
+							_Fable.log.warn('Error getting insert ID during create query', { Body: pQuery.query.body, Parameters: pQuery.query.parameters });
+						}
+
+						tmpResult.executed = true;
+						return fCallback();
+					}
+				);
+			});
+		};
+
+		// This is a synchronous read, good for a few records.
+		// TODO: Add a pipe-able read for huge sets
+		var Read = function (pQuery, fCallback)
+		{
+			var tmpResult = pQuery.parameters.result;
+
+			pQuery.setDialect('MySQL').buildReadQuery();
+
+			if (pQuery.logLevel > 0)
+			{
+				_Fable.log.trace(pQuery.query.body, pQuery.query.parameters);
+			}
+
+			getDB().getConnection(function (pError, pDBConnection)
+			{
+				pDBConnection.query(
+					pQuery.query.body,
+					pQuery.query.parameters,
+					function (pError, pRows)
+					{
+						pDBConnection.release();
+						tmpResult.error = pError;
+						tmpResult.value = pRows;
+						tmpResult.executed = true;
+						return fCallback();
+					}
+				);
+			});
+		};
+
+		var Update = function (pQuery, fCallback)
+		{
+			var tmpResult = pQuery.parameters.result;
+
+			pQuery.setDialect('MySQL').buildUpdateQuery();
+
+			if (pQuery.logLevel > 0)
+			{
+				_Fable.log.trace(pQuery.query.body, pQuery.query.parameters);
+			}
+
+			getDB().getConnection(function (pError, pDBConnection)
+			{
+				pDBConnection.query(
+					pQuery.query.body,
+					pQuery.query.parameters,
+					function (pError, pRows)
+					{
+						pDBConnection.release();
+						tmpResult.error = pError;
+						tmpResult.value = pRows;
+						tmpResult.executed = true;
+						return fCallback();
+					}
+				);
+			});
+		}
+
+		var Delete = function (pQuery, fCallback)
+		{
+			var tmpResult = pQuery.parameters.result;
+
+			pQuery.setDialect('MySQL').buildDeleteQuery();
+
+			if (pQuery.logLevel > 0)
+			{
+				_Fable.log.trace(pQuery.query.body, pQuery.query.parameters);
+			}
+
+			getDB().getConnection(function (pError, pDBConnection)
+			{
+				pDBConnection.query
+					(
+						pQuery.query.body,
+						pQuery.query.parameters,
+						function (pError, pRows)
+						{
+							pDBConnection.release();
+							tmpResult.error = pError;
+							tmpResult.value = false;
+							try
+							{
+								tmpResult.value = pRows.affectedRows;
+							}
+							catch (pErrorGettingRowcount)
+							{
+								_Fable.log.warn('Error getting affected rowcount during delete query', { Body: pQuery.query.body, Parameters: pQuery.query.parameters });
+							}
+							tmpResult.executed = true;
+							return fCallback();
+						}
+					);
+			});
+		};
+
+		var Undelete = function (pQuery, fCallback)
+		{
+			var tmpResult = pQuery.parameters.result;
+
+			pQuery.setDialect('MySQL').buildUndeleteQuery();
+
+			if (pQuery.logLevel > 0)
+			{
+				_Fable.log.trace(pQuery.query.body, pQuery.query.parameters);
+			}
+
+			getDB().getConnection(function (pError, pDBConnection)
+			{
+				pDBConnection.query
+					(
+						pQuery.query.body,
+						pQuery.query.parameters,
+						function (pError, pRows)
+						{
+							pDBConnection.release();
+							tmpResult.error = pError;
+							tmpResult.value = false;
+							try
+							{
+								tmpResult.value = pRows.affectedRows;
+							}
+							catch (pErrorGettingRowcount)
+							{
+								_Fable.log.warn('Error getting affected rowcount during delete query', { Body: pQuery.query.body, Parameters: pQuery.query.parameters });
+							}
+							tmpResult.executed = true;
+							return fCallback();
+						}
+					);
+			});
+		};
+
+		var Count = function (pQuery, fCallback)
+		{
+			var tmpResult = pQuery.parameters.result;
+
+			pQuery.setDialect('MySQL').buildCountQuery();
+
+			if (pQuery.logLevel > 0)
+			{
+				_Fable.log.trace(pQuery.query.body, pQuery.query.parameters);
+			}
+
+			getDB().getConnection(function (pError, pDBConnection)
+			{
+				pDBConnection.query(
+					pQuery.query.body,
+					pQuery.query.parameters,
+					// The SQLite library also returns the Fields as the third parameter
+					function (pError, pRows)
+					{
+						pDBConnection.release();
+						tmpResult.executed = true;
+						tmpResult.error = pError;
+						tmpResult.value = false;
+						try
+						{
+							tmpResult.value = pRows[0].RowCount;
+						}
+						catch (pErrorGettingRowcount)
+						{
+							_Fable.log.warn('Error getting rowcount during count query', { Body: pQuery.query.body, Parameters: pQuery.query.parameters });
+						}
+						return fCallback();
+					}
+				);
+			});
+		};
+
+		var tmpNewProvider = (
+			{
+				marshalRecordFromSourceToObject: marshalRecordFromSourceToObject,
+
+				Create: Create,
+				Read: Read,
+				Update: Update,
+				Delete: Delete,
+				Undelete: Undelete,
+				Count: Count,
+
+				getProvider: getProvider,
+				providerCreatesSupported: true,
+
+				new: createNew
+			});
+
+
+		return tmpNewProvider;
+	}
+
+	return createNew();
+};
+
+module.exports = new MeadowProvider();

package/test/Meadow-Provider-MSSQL_tests.js

@@ -33,7 +33,7 @@ var tmpFableSettings = (
 		"MSSQL":
 		{
 			"server": "127.0.0.1",
-			"port": 3306,
+			"port": 14333,
 			"user": "sa",
 			"password": "1234567890abc.",
 			"database": "bookstore",
@@ -149,6 +149,15 @@ suite
 										);
 									},
 									function (fStageComplete)
+									{
+										libFable.MeadowMSSQLProvider.pool.query(`
+IF NOT EXISTS(SELECT * FROM sys.databases WHERE name = 'bookstore')
+BEGIN
+    CREATE DATABASE [bookstore]
+END
+										`).then(()=>{ return fStageComplete(); }).catch(fStageComplete);
+									},
+									function (fStageComplete)
 									{
 										libFable.MeadowMSSQLProvider.pool.query('DROP TABLE IF EXISTS FableTest').then(()=>{ return fStageComplete(); }).catch(fStageComplete);
 									},
@@ -195,8 +204,8 @@ suite
 			suiteTeardown((fDone) =>
 			{
 				//_SQLConnectionPool.end(fDone);
-			}
-			);
+				return fDone();
+			});
 
 			suite
 				(