meadow 1.0.34 → 1.0.35

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

@@ -1,4 +1,4 @@
 {
 	"optOut": false,
-	"lastUpdateCheck": 1649732399378
+	"lastUpdateCheck": 1653488643323
 }

package/Dockerfile

@@ -26,6 +26,21 @@ RUN ( sudo mysqld_safe --skip-grant-tables --skip-networking & ) && sleep 5 &&
 # Import the initial database
 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
+
 SHELL ["/bin/bash", "-c"]
 USER coder
 

package/README.md

@@ -3,11 +3,6 @@ Meadow
 
 A Javascript Data Broker.
 
-[![Coverage Status](https://coveralls.io/repos/stevenvelozo/meadow/badge.svg?branch=master)](https://coveralls.io/r/stevenvelozo/meadow?branch=master)
-[![Build Status](https://travis-ci.org/stevenvelozo/meadow.svg?branch=master)](https://travis-ci.org/stevenvelozo/meadow)
-[![Dependency Status](https://david-dm.org/stevenvelozo/meadow.svg)](https://david-dm.org/stevenvelozo/meadow)
-[![devDependency Status](https://david-dm.org/stevenvelozo/meadow/dev-status.svg)](https://david-dm.org/stevenvelozo/meadow#info=devDependencies)
-
 Who doesn't love writing the same code over and over again? Good question. Anybody who doesn't probably wants something to do simple data access stuff. And some of the complicated interactions as well. Meadow aims to provide a simple “magic where you want it, programmability where you don't” pattern.
 
 ## Install

package/debug/Harness.js

@@ -1,2 +1 @@
 var testMeadow = require('../source/Meadow.js').new();
-Expect(testMeadow).to.be.an('object', 'Meadow should initialize as an object directly from the require statement.');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meadow",
-  "version": "1.0.34",
+  "version": "1.0.35",
   "description": "A data access library.",
   "main": "source/Meadow.js",
   "scripts": {
@@ -11,6 +11,24 @@
     "docker-dev-build-image": "docker build ./ -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"
   },
+  "mocha": {
+    "diff": true,
+    "extension": [
+      "js"
+    ],
+    "package": "./package.json",
+    "reporter": "spec",
+    "slow": "75",
+    "timeout": "5000",
+    "ui": "tdd",
+    "watch-files": [
+      "source/**/*.js",
+      "test/**/*.js"
+    ],
+    "watch-ignore": [
+      "lib/vendor"
+    ]
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/stevenvelozo/meadow.git"
@@ -28,8 +46,6 @@
   "devDependencies": {
     "alasql": "^0.4.0",
     "chai": "3.5.0",
-    "codeclimate-test-reporter": "0.4.1",
-    "coveralls": "2.13.1",
     "groc": "^0.8.0",
     "istanbul": "0.4.5",
     "mocha": "3.4.1",
@@ -38,7 +54,7 @@
   "dependencies": {
     "async": "2.4.0",
     "fable": "~1.0.1",
-    "foxhound": "^1.0.37",
+    "foxhound": "^1.0.39",
     "is-my-json-valid": "2.16.0",
     "underscore": "1.8.3"
   }

package/source/Meadow.js

@@ -43,6 +43,7 @@ var Meadow = function()
 		var _ReadsBehavior = require('./behaviors/Meadow-Reads.js');
 		var _UpdateBehavior = require('./behaviors/Meadow-Update.js');
 		var _DeleteBehavior = require('./behaviors/Meadow-Delete.js');
+		var _UndeleteBehavior = require('./behaviors/Meadow-Undelete.js');
 		var _CountBehavior = require('./behaviors/Meadow-Count.js');
 
 		// The data provider
@@ -70,12 +71,12 @@ var Meadow = function()
 		/**
 		 * Load a Meadow Package JSON from file, create a Meadow object from it.
 		 */
-		 var _MeadowPackageObjectLoader = require('./Meadow-PackageObjectLoader.js');
-		 var loadFromPackageObject = function(pPackage)
-		 {
-			 return _MeadowPackageObjectLoader(this, pPackage);
-		 };
- 
+		var _MeadowPackageObjectLoader = require('./Meadow-PackageObjectLoader.js');
+		var loadFromPackageObject = function(pPackage)
+		{
+			return _MeadowPackageObjectLoader(this, pPackage);
+		};
+
 		/**
 		* Pass relevant state into the provider
 		*
@@ -276,6 +277,14 @@ var Meadow = function()
 			return _DeleteBehavior(this, pQuery, fCallBack);
 		};
 
+		/**
+		 * Undelete a record
+		 */
+		var doUndelete = function(pQuery, fCallBack)
+		{
+			return _UndeleteBehavior(this, pQuery, fCallBack);
+		};
+
 		/**
 		 * Count multiple records
 		 */
@@ -366,6 +375,7 @@ var Meadow = function()
 			doReads: doReads,
 			doUpdate: doUpdate,
 			doDelete: doDelete,
+			doUndelete: doUndelete,
 			doCount: doCount,
 
 			validateObject: _Schema.validateObject,

package/source/behaviors/Meadow-Undelete.js

@@ -0,0 +1,42 @@
+// ##### Part of the **[retold](https://stevenvelozo.github.io/retold/)** system
+/**
+* @license MIT
+* @author <steven@velozo.com>
+*/
+var libAsync = require('async');
+
+/**
+* Meadow Behavior - Undelete a single record
+*
+* @function meadowBehaviorUndelete
+*/
+var meadowBehaviorUndelete = function(pMeadow, pQuery, fCallBack)
+{
+	// TODO: Check if this recordset has implicit delete tracking, branch in this module?
+	// Undelete the record(s) if they were deleted with a bit
+	libAsync.waterfall(
+		[
+			// Step 1: Undelete the record
+			function (fStageComplete)
+			{
+				if (pMeadow.rawQueries.checkQuery('Undelete'))
+				{
+					pQuery.parameters.queryOverride = pMeadow.rawQueries.getQuery('Undelete');
+				}
+				pMeadow.provider.Undelete(pQuery, function(){ fStageComplete(pQuery.result.error, pQuery, pQuery.result.value); });
+			}
+		],
+		function(pError, pQuery, pRecord)
+		{
+			if (pError)
+			{
+				pMeadow.fable.log.warn('Error during the undelete waterfall', {Error:pError, Message: pError.message, Query: pQuery.query});
+			}
+			fCallBack(pError, pQuery, pRecord);
+		}
+	);
+
+	return pMeadow;
+};
+
+module.exports = meadowBehaviorUndelete;

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

@@ -304,6 +304,38 @@ var MeadowProvider = function()
 			fCallback();
 		};
 
+		var Undelete = function(pQuery, fCallback)
+		{
+			var tmpResult = pQuery.parameters.result;
+
+			checkDataExists(pQuery.parameters);
+
+			pQuery.setDialect('ALASQL').buildUndeleteQuery();
+			var fQuery = libALASQL.compile(pQuery.query.body);
+
+			if (pQuery.logLevel > 0 ||
+				_GlobalLogLevel > 0)
+			{
+				_Fable.log.trace(pQuery.query.body, pQuery.query.parameters);
+			}
+
+			try
+			{
+				tmpResult.error = undefined;
+				tmpResult.executed = false;
+
+				tmpResult.value =  fQuery(pQuery.query.parameters);
+
+				tmpResult.executed = true;
+			}
+			catch (pError)
+			{
+				tmpResult.error = pError;
+			}
+
+			fCallback();
+		};
+
 		var Count = function(pQuery, fCallback)
 		{
 			var tmpResult = pQuery.parameters.result;
@@ -463,6 +495,7 @@ var MeadowProvider = function()
 			Read: Read,
 			Update: Update,
 			Delete: Delete,
+			Undelete: Undelete,
 			Count: Count,
 
 			new: createNew

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

@@ -189,6 +189,45 @@ var MeadowProvider = function()
 			});
 		};
 
+		var Undelete = function(pQuery, fCallback)
+		{
+			var tmpResult = pQuery.parameters.result;
+
+			pQuery.setDialect('MySQL').buildUndeleteQuery();
+
+			if (pQuery.logLevel > 0 ||
+				_GlobalLogLevel > 0)
+			{
+				_Fable.log.trace(pQuery.query.body, pQuery.query.parameters);
+			}
+
+			getSQLPool().getConnection(function(pError, pDBConnection)
+			{
+				pDBConnection.query
+				(
+					pQuery.query.body,
+					pQuery.query.parameters,
+					// The MySQL library also returns the Fields as the third parameter
+					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;
@@ -235,6 +274,7 @@ var MeadowProvider = function()
 			Read: Read,
 			Update: Update,
 			Delete: Delete,
+			Undelete: Undelete,
 			Count: Count,
 
 			new: createNew

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

@@ -52,6 +52,13 @@ var MeadowProvider = function()
 			fCallback();
 		};
 
+		var Undelete = function(pQuery, fCallback)
+		{
+			// This does nothing because it's the none data provider!
+			pQuery.parameters.result.executed = true;
+			fCallback();
+		};
+
 		var Count = function(pQuery, fCallback)
 		{
 			// This does nothing because it's the none data provider!
@@ -67,6 +74,7 @@ var MeadowProvider = function()
 			Read: Read,
 			Update: Update,
 			Delete: Delete,
+			Undelete: Undelete,
 			Count: Count,
 
 			new: createNew

package/test/Meadow-Provider-ALASQL.js

@@ -18,14 +18,14 @@ var libALASQL = require('alasql');
 var libFable = require('fable').new({
 	LogStreams:
 	[
-	    {
-	        level: 'fatal',
-	        streamtype:'process.stdout',
-	    },
-	    {
-	        level: 'trace',
-	        path: __dirname+'/../tests.log'
-	    }
+		{
+			level: 'fatal',
+			streamtype:'process.stdout',
+		},
+		{
+			level: 'trace',
+			path: __dirname+'/../tests.log'
+		}
 	]
 });
 
@@ -291,6 +291,30 @@ suite
 					}
 				);
 				test
+				(
+					'Undelete a record in the database',
+					function(fDone)
+					{
+						var testMeadow = newMeadow();
+
+						testMeadow.fable.settings.QueryThresholdWarnTime = 1;
+						var tmpQuery = testMeadow.query.addFilter('IDAnimal',3);
+
+						testMeadow.doUndelete(tmpQuery,
+							function(pError, pQuery, pRecord)
+							{
+								// TODO: Research why this is working but not returning the row count
+								Expect(pRecord)
+									.to.equal(0);
+
+								testMeadow.fable.settings.QueryThresholdWarnTime = 1000;
+
+								fDone();
+							}
+						)
+					}
+				);
+				test
 				(
 					'Count all records from the database',
 					function(fDone)

package/test/Meadow-Provider-MySQL_tests.js

@@ -29,14 +29,14 @@ var tmpFableSettings = 	(
 		},
 	LogStreams:
 	[
-	    {
-	        level: 'fatal',
-	        streamtype:'process.stdout',
-	    },
-	    {
-	        level: 'trace',
-	        path: __dirname+'/../tests.log'
-	    }
+		{
+			level: 'fatal',
+			streamtype:'process.stdout',
+		},
+		{
+			level: 'trace',
+			path: __dirname+'/../tests.log'
+		}
 	]
 });
 
@@ -379,6 +379,35 @@ suite
 					}
 				);
 				test
+				(
+					'Undelete a record in the database',
+					function(fDone)
+					{
+						var testMeadow = newMeadow();
+
+						testMeadow.fable.settings.QueryThresholdWarnTime = 1;
+						var tmpDeleteQuery = testMeadow.query.addFilter('IDAnimal',5);
+
+						// Make sure the record is deleted!
+						testMeadow.doDelete(tmpDeleteQuery,
+							function(pDeleteError, pDeleteQuery, pDeleteRecord)
+							{
+								var tmpQuery = testMeadow.query.addFilter('IDAnimal',5);
+								testMeadow.doUndelete(tmpQuery,
+									function(pError, pQuery, pRecord)
+									{
+										// It returns the number of rows deleted
+										Expect(pRecord)
+											.to.equal(1);
+
+										testMeadow.fable.settings.QueryThresholdWarnTime = 1000;
+
+										fDone();
+									});
+							});
+					}
+				);
+				test
 				(
 					'Count all records from the database',
 					function(fDone)

package/test/Meadow-Provider-None_tests.js

@@ -186,6 +186,21 @@ suite
 					}
 				);
 				test
+				(
+					'Undelete a record in the database',
+					function(fDone)
+					{
+						var testMeadow = newMeadow();
+						testMeadow.doUndelete(testMeadow.query,
+							function(pError, pQuery, pRecord)
+							{
+								Expect(pQuery.parameters.result.executed).to.equal(true);
+								fDone();
+							}
+						)
+					}
+				);
+				test
 				(
 					'Count all records from the database',
 					function(fDone)