meadow 2.0.4 → 2.0.5

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

@@ -1,4 +1,4 @@
 {
 	"optOut": false,
-	"lastUpdateCheck": 1648097783781
+	"lastUpdateCheck": 1684949112628
 }

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

@@ -1,4 +1,4 @@
 {
 	"optOut": false,
-	"lastUpdateCheck": 1677869923810
+	"lastUpdateCheck": 1684948692058
 }

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

@@ -0,0 +1,13 @@
+{
+  "numericVersion": 10000,
+  "releaseNotes": "https://vscode-sqltools.mteixeira.dev/changelog#v-1-0-0",
+  "run": 1684949902043,
+  "updated": false,
+  "version": "1.0.0",
+  "lastNotificationDate": 0,
+  "installedExtPlugins": {
+    "driver": [
+      "mtxr.sqltools-driver-mysql"
+    ]
+  }
+}

package/Dockerfile_LUXURYCode

@@ -27,19 +27,45 @@ RUN ( sudo mysqld_safe --skip-grant-tables --skip-networking & ) && sleep 5 &&
 RUN sudo service mariadb restart && sleep 5 && mysql -u root -p"123456789" -e "CREATE DATABASE FableTest;"
 
 RUN echo "...installing vscode extensions..."
-RUN code-server --install-extension rangav.vscode-thunder-client \
-    code-server --install-extension hbenl.vscode-mocha-test-adapter \
-    code-server --install-extension hbenl.vscode-test-explorer \
-    code-server --install-extension hbenl.test-adapter-converter \
-    code-server --install-extension cweijan.vscode-mysql-client2 \
-    code-server --install-extension daylerees.rainglow \
-    code-server --install-extension oderwat.indent-rainbow \
-    code-server --install-extension evan-buss.font-switcher \
-    code-server --install-extension vscode-icons-team.vscode-icons \
-    code-server --install-extension bengreenier.vscode-node-readme \
-    code-server --install-extension bierner.color-info \
-    code-server --install-extension dbaeumer.vscode-eslint \
-    code-server --install-extension PKief.material-icon-theme
+# Mocha unit testing in the sidebar
+RUN code-server --install-extension hbenl.vscode-mocha-test-adapter
+RUN code-server --install-extension hbenl.test-adapter-converter
+RUN code-server --install-extension hbenl.vscode-test-explorer
+
+# Magic indentation rainbow
+RUN code-server --install-extension oderwat.indent-rainbow
+RUN code-server --install-extension dbaeumer.vscode-eslint
+
+# Contextual git
+RUN code-server --install-extension eamodio.gitlens
+
+# Other extensions (uncomment them to have them automagic, or run this from a terminal to install in the container):
+
+# SQL Tools
+RUN code-server --install-extension mtxr.sqltools
+RUN code-server --install-extension mtxr.sqltools-driver-mysql
+
+# Microsoft's AI code completion
+# RUN code-server --install-extension  VisualStudioExptTeam.vscodeintellicode
+
+# Live server -- make sure to open up the port on the docker image
+# RUN code-server --install-extension ritwickdey.LiveServer
+
+# Quick link to required modules' documentation
+# RUN code-server --install-extension bengreenier.vscode-node-readme
+
+# Switch up fonts
+# RUN code-server --install-extension evan-buss.font-switcher
+
+# Icons
+# RUN code-server --install-extension vscode-icons-team.vscode-icons
+# RUN code-server --install-extension PKief.material-icon-theme
+
+# Hover over CSS colors to see them previewed
+# RUN code-server --install-extension bierner.color-info
+
+# An easy on the eyes color theme
+# RUN code-server --install-extension daylerees.rainglow
 
 SHELL ["/bin/bash", "-c"]
 USER coder

package/debug/Harness.js

@@ -38,7 +38,7 @@ const _AnimalDefault = (
     {
         IDAnimal: null,
         GUIDAnimal: '',
-    
+
         CreateDate: false,
         CreatingIDUser: 0,
         UpdateDate: false,
@@ -46,7 +46,7 @@ const _AnimalDefault = (
         Deleted: 0,
         DeleteDate: false,
         DeletingIDUser: 0,
-    
+
         Name: 'Unknown',
         Type: 'Unclassified'
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meadow",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "A data access library.",
   "main": "source/Meadow.js",
   "scripts": {
@@ -9,8 +9,9 @@
     "test": "./node_modules/mocha/bin/_mocha -u tdd --exit -R spec",
     "tests": "./node_modules/mocha/bin/_mocha -u tdd --exit -R spec --grep",
     "build": "./node_modules/.bin/gulp build --full-paths",
-    "docker-dev-build-image": "docker build ./ -f Dockerfile_LUXURYCode -t retold/meadow:local",
-    "docker-dev-run": "docker run -it -d --name meadow-dev -p 127.0.0.1:12342:8080 -p 12106:3306 -v \"$PWD/.config:/home/coder/.config\"  -v \"$PWD:/home/coder/meadow\" -u \"$(id -u):$(id -g)\" -e \"DOCKER_USER=$USER\" retold/meadow:local"
+    "docker-dev-build": "docker build ./ -f Dockerfile_LUXURYCode -t retold/meadow:local",
+    "docker-dev-run": "docker run -it -d --name meadow-dev -p 12342:8080 -p 12106:3306 -v \"$PWD/.config:/home/coder/.config\"  -v \"$PWD:/home/coder/meadow\" -u \"$(id -u):$(id -g)\" -e \"DOCKER_USER=$USER\" retold/meadow:local",
+    "docker-dev-shell": "docker exec -it meadow-dev /bin/bash"
   },
   "mocha": {
     "diff": true,
@@ -48,22 +49,24 @@
     "alasql": "^3.1.0",
     "browserify": "^17.0.0",
     "chai": "4.3.7",
+    "fable": "^3.0.46",
     "gulp": "^4.0.2",
     "gulp-babel": "^8.0.0",
     "gulp-sourcemaps": "^3.0.0",
     "gulp-terser": "^2.1.0",
-    "fable": "^3.0.11",
     "gulp-util": "^3.0.8",
+    "meadow-connection-mysql": "^1.0.2",
     "mocha": "10.2.0",
+    "mysql2": "^3.3.2",
     "nyc": "^15.1.0",
     "vinyl-buffer": "^1.0.1",
-    "vinyl-source-stream": "^2.0.0",
-    "mysql2": "^3.1.2"
+    "vinyl-source-stream": "^2.0.0"
   },
   "dependencies": {
     "async": "3.2.4",
-    "foxhound": "^2.0.2",
+    "foxhound": "^2.0.3",
     "is-my-json-valid": "2.20.6",
+    "npm-check-updates": "^16.10.12",
     "simple-get": "^4.0.1"
   }
 }

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

@@ -25,14 +25,20 @@ var MeadowProvider = function()
 		 */
 		var getSQLPool = function()
 		{
-			if (typeof(_Fable.MeadowMySQLConnectionPool) !== 'object')
+			let tmpSqlPool = false;
+			if (typeof(_Fable.MeadowMySQLConnectionPool) == 'object')
 			{
-				// This is going to be problematic.
-				_Fable.log.fatal('Meadow is trying to perform queries without a valid [Fable.MeadowMySQLConnectionPool] object.  See the documentation for how to initialize one.');
-				return false;
+				// This is where the old-style SQL Connection pool is.  Refactor doesn't even look for it anymore
+				return _Fable.MeadowMySQLConnectionPool;
 			}
 
-			return _Fable.MeadowMySQLConnectionPool;
+			// New-style default connection pool provider
+			if (typeof(_Fable.MeadowMySQLProvider) == 'object' && _Fable.MeadowMySQLProvider.connected)
+			{
+				return _Fable.MeadowMySQLProvider.pool;
+			}
+
+			return false;
 		};
 
 		// The Meadow marshaller also passes in the Schema as the third parameter, but this is a blunt function ATM.

package/test/Meadow-Provider-MySQL_tests.js

@@ -258,6 +258,55 @@ suite
 					}
 				);
 				test
+				(
+					'New provider format',
+					function(fDone)
+					{
+						let _FableClass = require('fable');
+						let _Fable = new _FableClass({
+							MySQL:
+								{
+									// This is queued up for Travis defaults.
+									Server: "localhost",
+									Port: 3306,
+									User: "root",
+									Password: "123456789",
+									Database: "FableTest",
+									ConnectionPoolLimit: 20
+								},
+							MeadowConnectionMySQLAutoConnect: true
+						});
+						_Fable.serviceManager.addAndInstantiateServiceType('MeadowMySQLProvider', require('meadow-connection-mysql'));
+
+						var testMeadow = require('../source/Meadow.js')
+							.new(_Fable, 'FableTest')
+							.setProvider('MySQL')
+							.setSchema(_AnimalSchema)
+							.setJsonSchema(_AnimalJsonSchema)
+							.setDefaultIdentifier('IDAnimal')
+							.setDefault(_AnimalDefault);
+
+						testMeadow.setIDUser(90210);
+
+						var tmpQuery = testMeadow.query.addFilter('IDAnimal', 1);
+
+						testMeadow.doRead(tmpQuery,
+							function(pError, pQuery, pRecord)
+							{
+								// We should have a record ....
+								Expect(pRecord.IDAnimal)
+									.to.equal(1);
+								Expect(pRecord.Name)
+									.to.equal('Foo Foo');
+
+								testMeadow.fable.settings.QueryThresholdWarnTime = 1000;
+
+								fDone();
+							}
+						)
+					}
+				);
+				test
 				(
 					'Create a record in the database with Deleted bit already set',
 					function(fDone)