foxhound 2.0.9 → 2.0.11

package/Dockerfile_LUXURYCode

@@ -1,6 +1,6 @@
 # Use the codercom/code-server image
 FROM codercom/code-server:latest
-MAINTAINER steven velozo
+LABEL org.opencontainers.image.authors="steven@velozo.com"
 
 VOLUME /home/coder/.config
 VOLUME /home/coder/.vscode
@@ -9,13 +9,7 @@ RUN echo "...installing debian dependencies..."
 RUN sudo apt update
 RUN sudo apt install vim curl tmux -y
 
-RUN echo "Building RETOLD development image..."
-
-
-RUN echo "...mapping library specific volumes..."
-# Volume mappings for RETOLD:Foxhound library
-VOLUME /home/coder/foxhound
-# VOLUME /home/coder/foxhound/node_modules
+RUN echo "Building development image..."
 
 RUN echo "...installing vscode extensions..."
 
@@ -55,8 +49,10 @@ RUN code-server --install-extension eamodio.gitlens
 # An easy on the eyes color theme
 # RUN code-server --install-extension daylerees.rainglow
 
-# MySQL2 CLient
-RUN code-server --install-extension cweijan.vscode-mysql-client2
+RUN echo "...mapping library specific volumes..."
+
+# Volume mapping for code
+VOLUME /home/coder/foxhound
 
 SHELL ["/bin/bash", "-c"]
 USER coder

package/package.json

@@ -1,63 +1,55 @@
 {
-  "name": "foxhound",
-  "version": "2.0.9",
-  "description": "A Database Query generation library.",
-  "main": "source/FoxHound.js",
-  "scripts": {
-    "start": "node source/FoxHound.js",
-    "coverage": "./node_modules/.bin/nyc --reporter=lcov --reporter=text-lcov ./node_modules/mocha/bin/_mocha -- -u tdd -R spec",
-    "test": "./node_modules/.bin/mocha -u tdd -R spec",
-    "build": "./node_modules/.bin/gulp build",
-    "docker-dev-build-image": "docker build ./ -f Dockerfile_LUXURYCode -t retold/foxhound:local",
-    "docker-dev-run": "docker run -it -d --name foxhound-dev -p 127.0.0.1:12346:8080 -v \"$PWD/.config:/home/coder/.config\"  -v \"$PWD:/home/coder/foxhound\" -u \"$(id -u):$(id -g)\" -e \"DOCKER_USER=$USER\" retold/foxhound:local"
-  },
-  "mocha": {
-    "diff": true,
-    "extension": [
-      "js"
+    "name": "foxhound",
+    "version": "2.0.11",
+    "description": "A Database Query generation library.",
+    "main": "source/FoxHound.js",
+    "scripts": {
+        "start": "node source/FoxHound.js",
+        "test": "npx mocha -u tdd -R spec",
+        "tests": "npx mocha -u tdd --exit -R spec --grep",
+        "coverage": "npx nyc --reporter=lcov --reporter=text-lcov npx mocha -- -u tdd -R spec",
+        "build": "npx quack build",
+        "docker-dev-build": "docker build ./ -f Dockerfile_LUXURYCode -t foxhound-image:local",
+        "docker-dev-run": "docker run -it -d --name foxhound-dev -p 24238:8080 -p 42889:8086 -v \"$PWD/.config:/home/coder/.config\"  -v \"$PWD:/home/coder/foxhound\" -u \"$(id -u):$(id -g)\" -e \"DOCKER_USER=$USER\" foxhound-image:local",
+        "docker-dev-shell": "docker exec -it foxhound-dev /bin/bash"
+    },
+    "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/foxhound.git"
+    },
+    "keywords": [
+        "orm",
+        "dal",
+        "query"
     ],
-    "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/foxhound.git"
-  },
-  "keywords": [
-    "orm",
-    "dal",
-    "query"
-  ],
-  "author": "Steven Velozo <steven@velozo.com> (http://velozo.com/)",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/stevenvelozo/foxhound/issues"
-  },
-  "homepage": "https://github.com/stevenvelozo/foxhound",
-  "devDependencies": {
-    "browserify": "^17.0.0",
-    "chai": "4.3.7",
-    "gulp": "^4.0.2",
-    "gulp-babel": "^8.0.0",
-    "gulp-sourcemaps": "^3.0.0",
-    "gulp-terser": "^2.1.0",
-    "gulp-util": "^3.0.8",
-    "mocha": "10.2.0",
-    "nyc": "^15.1.0",
-    "vinyl-buffer": "^1.0.1",
-    "vinyl-source-stream": "^2.0.0"
-  },
-  "dependencies": {
-    "fable": "^3.0.11"
-  }
-}
+    "author": "Steven Velozo <steven@velozo.com> (http://velozo.com/)",
+    "license": "MIT",
+    "bugs": {
+        "url": "https://github.com/stevenvelozo/foxhound/issues"
+    },
+    "homepage": "https://github.com/stevenvelozo/foxhound",
+    "devDependencies": {
+        "quackage": "^1.0.29"
+    },
+    "dependencies": {
+        "fable": "^3.0.119"
+    }
+}

package/source/Foxhound-Dialects.js

@@ -2,8 +2,9 @@ getDialects = () =>
 {
 	let tmpDialects = {};
 
-	tmpDialects.ALASQL = require('./dialects/ALASQL/FoxHound-Dialect-ALASQL.js');
 	tmpDialects.English = require('./dialects/English/FoxHound-Dialect-English.js');
+	tmpDialects.SQLite = require('./dialects/SQLite/FoxHound-Dialect-SQLite.js');
+	tmpDialects.ALASQL = require('./dialects/ALASQL/FoxHound-Dialect-ALASQL.js');
 	tmpDialects.MeadowEndpoints = require('./dialects/MeadowEndpoints/FoxHound-Dialect-MeadowEndpoints.js');
 	tmpDialects.MySQL = require('./dialects/MySQL/FoxHound-Dialect-MySQL.js');
 	tmpDialects.MSSQL = require('./dialects/MicrosoftSQL/FoxHound-Dialect-MSSQL.js');

package/source/dialects/MicrosoftSQL/FoxHound-Dialect-MSSQL.js

@@ -38,7 +38,7 @@ var FoxHoundDialectMSSQL = function(pFable)
 		{
 			pParameters.query.parameterTypes = {};
 		}
-		return ' '+pParameters.scope;
+		return ' ['+pParameters.scope+']';
 	};
 
 	var generateMSSQLParameterTypeEntry = function(pParameters, pColumnParameterName, pColumn)
@@ -152,7 +152,7 @@ var FoxHoundDialectMSSQL = function(pFable)
 				// this means there is no autoincrementing unique ID column; treat as above
 				return '';
 			}
-			const qualifiedIDColumn = `${tmpTableName}.${idColumn.Column}`;
+			const qualifiedIDColumn = `${idColumn.Column}`;
 			return ` ${generateSafeFieldName(qualifiedIDColumn)}`;
 		}
 
@@ -184,7 +184,15 @@ var FoxHoundDialectMSSQL = function(pFable)
 	*/
 	var generateSafeFieldName = function(pFieldName)
 	{
-		return pFieldName;
+		// This isn't great but best we can do for MS SQL needing brackets around field names for reserved keywords
+		if ((pFieldName != '*') && (pFieldName.indexOf('[') < 0) && pFieldName.indexOf('.') < 0)
+		{
+			return '['+pFieldName+']';
+		}
+		else
+		{
+			return pFieldName;
+		}
 	}
 
 	/**
@@ -238,7 +246,7 @@ var FoxHoundDialectMSSQL = function(pFable)
 						//if not, we need to add it
 						tmpFilter.push(
 						{
-							Column: tmpTableName + '.' + tmpSchemaEntry.Column,
+							Column: tmpSchemaEntry.Column,
 							Operator: '=',
 							Value: 0,
 							Connector: 'AND',
@@ -287,7 +295,7 @@ var FoxHoundDialectMSSQL = function(pFable)
 			{
 				tmpColumnParameter = tmpFilter[i].Parameter+'_w'+i;
 				// Add the column name, operator and parameter name to the list of where value parenthetical
-				tmpWhere += ' '+tmpFilter[i].Column+' '+tmpFilter[i].Operator+' ( @'+tmpColumnParameter+' )';
+				tmpWhere += ' ['+tmpFilter[i].Column+'] '+tmpFilter[i].Operator+' ( @'+tmpColumnParameter+' )';
 				pParameters.query.parameters[tmpColumnParameter] = tmpFilter[i].Value;
 				// Find the column in the schema
 				generateMSSQLParameterTypeEntry(pParameters, tmpColumnParameter, tmpFilter[i].Parameter)
@@ -295,18 +303,18 @@ var FoxHoundDialectMSSQL = function(pFable)
 			else if (tmpFilter[i].Operator === 'IS NULL')
 			{
 				// IS NULL is a special operator which doesn't require a value, or parameter
-				tmpWhere += ' '+tmpFilter[i].Column+' '+tmpFilter[i].Operator;
+				tmpWhere += ' ['+tmpFilter[i].Column+'] '+tmpFilter[i].Operator;
 			}
 			else if (tmpFilter[i].Operator === 'IS NOT NULL')
 			{
 				// IS NOT NULL is a special operator which doesn't require a value, or parameter
-				tmpWhere += ' '+tmpFilter[i].Column+' '+tmpFilter[i].Operator;
+				tmpWhere += ' ['+tmpFilter[i].Column+'] '+tmpFilter[i].Operator;
 			}
 			else
 			{
 				tmpColumnParameter = tmpFilter[i].Parameter+'_w'+i;
 				// Add the column name, operator and parameter name to the list of where value parenthetical
-				tmpWhere += ' '+tmpFilter[i].Column+' '+tmpFilter[i].Operator+' @'+tmpColumnParameter;
+				tmpWhere += ' ['+tmpFilter[i].Column+'] '+tmpFilter[i].Operator+' @'+tmpColumnParameter;
 				pParameters.query.parameters[tmpColumnParameter] = tmpFilter[i].Value;
 				generateMSSQLParameterTypeEntry(pParameters, tmpColumnParameter, tmpFilter[i].Parameter)
 			}
@@ -340,7 +348,7 @@ var FoxHoundDialectMSSQL = function(pFable)
 			{
 				tmpOrderClause += ',';
 			}
-			tmpOrderClause += ' '+tmpOrderBy[i].Column;
+			tmpOrderClause += ' ['+tmpOrderBy[i].Column+']';
 
 			if (tmpOrderBy[i].Direction == 'Descending')
 			{
@@ -419,7 +427,7 @@ var FoxHoundDialectMSSQL = function(pFable)
 			//verify that all required fields are valid
 			if (join.Type && join.Table && join.From && join.To)
 			{
-				tmpJoinClause += ` ${join.Type} ${join.Table} ON ${join.From} = ${join.To}`;
+				tmpJoinClause += ` ${join.Type} [${join.Table}] ON ${join.From} = ${join.To}`;
 			}
 		}
 
@@ -494,20 +502,20 @@ var FoxHoundDialectMSSQL = function(pFable)
 			{
 				case 'UpdateDate':
 					// This is an autoidentity, so we don't parameterize it and just pass in NULL
-					tmpUpdate += ' '+tmpColumn+' = ' + SQL_NOW;
+					tmpUpdate += ' ['+tmpColumn+'] = ' + SQL_NOW;
 					break;
 				case 'UpdateIDUser':
 					// This is the user ID, which we hope is in the query.
 					// This is how to deal with a normal column
 					var tmpColumnParameter = tmpColumn+'_'+tmpCurrentColumn;
-					tmpUpdate += ' '+tmpColumn+' = @'+tmpColumnParameter;
+					tmpUpdate += ' ['+tmpColumn+'] = @'+tmpColumnParameter;
 					// Set the query parameter
 					pParameters.query.parameters[tmpColumnParameter] = pParameters.query.IDUser;
 					generateMSSQLParameterTypeEntry(pParameters, tmpColumnParameter, tmpColumn)
 					break;
 				default:
 					var tmpColumnDefaultParameter = tmpColumn+'_'+tmpCurrentColumn;
-					tmpUpdate += ' '+tmpColumn+' = @'+tmpColumnDefaultParameter;
+					tmpUpdate += ' ['+tmpColumn+'] = @'+tmpColumnDefaultParameter;
 
 					// Set the query parameter
 					pParameters.query.parameters[tmpColumnDefaultParameter] = tmpRecords[0][tmpColumn];
@@ -561,21 +569,21 @@ var FoxHoundDialectMSSQL = function(pFable)
 			switch (tmpSchemaEntry.Type)
 			{
 				case 'Deleted':
-					tmpUpdateSql = ' '+tmpSchemaEntry.Column+' = 1';
+					tmpUpdateSql = ' ['+tmpSchemaEntry.Column+'] = 1';
 					tmpHasDeletedField = true; //this field is required in order for query to be built
 					break;
 				case 'DeleteDate':
-					tmpUpdateSql = ' '+tmpSchemaEntry.Column+' = ' + SQL_NOW;
+					tmpUpdateSql = ' ['+tmpSchemaEntry.Column+'] = ' + SQL_NOW;
 					break;
 				case 'UpdateDate':
 					// Delete operation is an Update, so we should stamp the update time
-					tmpUpdateSql = ' '+tmpSchemaEntry.Column+' = ' + SQL_NOW;
+					tmpUpdateSql = ' ['+tmpSchemaEntry.Column+'] = ' + SQL_NOW;
 					break;
 				case 'DeleteIDUser':
 					// This is the user ID, which we hope is in the query.
 					// This is how to deal with a normal column
 					var tmpColumnParameter = tmpSchemaEntry.Column+'_'+tmpCurrentColumn;
-					tmpUpdateSql = ' '+tmpSchemaEntry.Column+' = @'+tmpColumnParameter;
+					tmpUpdateSql = ' ['+tmpSchemaEntry.Column+'] = @'+tmpColumnParameter;
 					// Set the query parameter
 					pParameters.query.parameters[tmpColumnParameter] = pParameters.query.IDUser;
 					generateMSSQLParameterTypeEntry(pParameters, tmpColumnParameter, tmpSchemaEntry)
@@ -634,16 +642,16 @@ var FoxHoundDialectMSSQL = function(pFable)
 			switch (tmpSchemaEntry.Type)
 			{
 				case 'Deleted':
-					tmpUpdateSql = ' '+tmpSchemaEntry.Column+' = 0';
+					tmpUpdateSql = ' ['+tmpSchemaEntry.Column+'] = 0';
 					tmpHasDeletedField = true; //this field is required in order for query to be built
 					break;
 				case 'UpdateDate':
 					// The undelete operation is an Update, so we should stamp the update time
-					tmpUpdateSql = ' '+tmpSchemaEntry.Column+' = ' + SQL_NOW;
+					tmpUpdateSql = ' ['+tmpSchemaEntry.Column+'] = ' + SQL_NOW;
 					break;
 				case 'UpdateIDUser':
 					var tmpColumnParameter = tmpSchemaEntry.Column+'_'+tmpCurrentColumn;
-					tmpUpdateSql = ' '+tmpSchemaEntry.Column+' = @'+tmpColumnParameter;
+					tmpUpdateSql = ' ['+tmpSchemaEntry.Column+'] = @'+tmpColumnParameter;
 					pParameters.query.parameters[tmpColumnParameter] = pParameters.query.IDUser;
 					generateMSSQLParameterTypeEntry(pParameters, tmpColumnParameter, tmpSchemaEntry)
 					break;
@@ -872,7 +880,7 @@ var FoxHoundDialectMSSQL = function(pFable)
 						{
 							tmpCreateSet += ',';
 						}
-						tmpCreateSet += ' '+tmpColumn;
+						tmpCreateSet += ' ['+tmpColumn+']';
 					}
 					continue;
 				default:
@@ -880,7 +888,7 @@ var FoxHoundDialectMSSQL = function(pFable)
 					{
 						tmpCreateSet += ',';
 					}
-					tmpCreateSet += ' '+tmpColumn;
+					tmpCreateSet += ' ['+tmpColumn+']';
 					break;
 			}
 		}