foxhound 2.0.19 → 2.0.21

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "foxhound",
-    "version": "2.0.19",
+    "version": "2.0.21",
     "description": "A Database Query generation library.",
     "main": "source/FoxHound.js",
     "scripts": {
@@ -47,7 +47,7 @@
     },
     "homepage": "https://github.com/stevenvelozo/foxhound",
     "devDependencies": {
-        "quackage": "^1.0.59"
+        "quackage": "^1.0.60"
     },
     "dependencies": {
         "fable": "^3.1.63"

package/source/Foxhound-Dialects.js

@@ -1,4 +1,4 @@
-getDialects = () =>
+let getDialects = () =>
 {
 	let tmpDialects = {};
 

package/source/dialects/PostgreSQL/FoxHound-Dialect-PostgreSQL.js

@@ -176,7 +176,7 @@ var FoxHoundDialectPostgreSQL = function(pFable)
 					{
 						tmpFilter.push(
 						{
-							Column: tmpTableName + '.' + tmpSchemaEntry.Column,
+							Column: generateSafeFieldName(pParameters.scope + '.' + tmpSchemaEntry.Column),
 							Operator: '=',
 							Value: 0,
 							Connector: 'AND',
@@ -220,21 +220,21 @@ var FoxHoundDialectPostgreSQL = function(pFable)
 			else if (tmpFilter[i].Operator === 'IN' || tmpFilter[i].Operator === "NOT IN")
 			{
 				tmpColumnParameter = tmpFilter[i].Parameter+'_w'+i;
-				tmpWhere += ' '+tmpFilter[i].Column+' '+tmpFilter[i].Operator+' ( :'+tmpColumnParameter+' )';
+				tmpWhere += ' '+generateSafeFieldName(tmpFilter[i].Column)+' '+tmpFilter[i].Operator+' ( :'+tmpColumnParameter+' )';
 				pParameters.query.parameters[tmpColumnParameter] = tmpFilter[i].Value;
 			}
 			else if (tmpFilter[i].Operator === 'IS NULL')
 			{
-				tmpWhere += ' '+tmpFilter[i].Column+' '+tmpFilter[i].Operator;
+				tmpWhere += ' '+generateSafeFieldName(tmpFilter[i].Column)+' '+tmpFilter[i].Operator;
 			}
 			else if (tmpFilter[i].Operator === 'IS NOT NULL')
 			{
-				tmpWhere += ' '+tmpFilter[i].Column+' '+tmpFilter[i].Operator;
+				tmpWhere += ' '+generateSafeFieldName(tmpFilter[i].Column)+' '+tmpFilter[i].Operator;
 			}
 			else
 			{
 				tmpColumnParameter = tmpFilter[i].Parameter+'_w'+i;
-				tmpWhere += ' '+tmpFilter[i].Column+' '+tmpFilter[i].Operator+' :'+tmpColumnParameter;
+				tmpWhere += ' '+generateSafeFieldName(tmpFilter[i].Column)+' '+tmpFilter[i].Operator+' :'+tmpColumnParameter;
 				pParameters.query.parameters[tmpColumnParameter] = tmpFilter[i].Value;
 			}
 		}
@@ -267,7 +267,7 @@ var FoxHoundDialectPostgreSQL = function(pFable)
 			{
 				tmpOrderClause += ',';
 			}
-			tmpOrderClause += ' '+tmpOrderBy[i].Column;
+			tmpOrderClause += ' '+generateSafeFieldName(tmpOrderBy[i].Column);
 
 			if (tmpOrderBy[i].Direction == 'Descending')
 			{
@@ -387,16 +387,16 @@ var FoxHoundDialectPostgreSQL = function(pFable)
 			switch (tmpSchemaEntry.Type)
 			{
 				case 'UpdateDate':
-					tmpUpdate += ' '+tmpColumn+' = ' + SQL_NOW;
+					tmpUpdate += ' '+generateSafeFieldName(tmpColumn)+' = ' + SQL_NOW;
 					break;
 				case 'UpdateIDUser':
 					var tmpColumnParameter = tmpColumn+'_'+tmpCurrentColumn;
-					tmpUpdate += ' '+tmpColumn+' = :'+tmpColumnParameter;
+					tmpUpdate += ' '+generateSafeFieldName(tmpColumn)+' = :'+tmpColumnParameter;
 					pParameters.query.parameters[tmpColumnParameter] = pParameters.query.IDUser;
 					break;
 				default:
 					var tmpColumnDefaultParameter = tmpColumn+'_'+tmpCurrentColumn;
-					tmpUpdate += ' '+tmpColumn+' = :'+tmpColumnDefaultParameter;
+					tmpUpdate += ' '+generateSafeFieldName(tmpColumn)+' = :'+tmpColumnDefaultParameter;
 					pParameters.query.parameters[tmpColumnDefaultParameter] = tmpRecords[0][tmpColumn];
 					break;
 			}
@@ -440,18 +440,18 @@ var FoxHoundDialectPostgreSQL = function(pFable)
 			switch (tmpSchemaEntry.Type)
 			{
 				case 'Deleted':
-					tmpUpdateSql = ' '+tmpSchemaEntry.Column+' = 1';
+					tmpUpdateSql = ' '+generateSafeFieldName(tmpSchemaEntry.Column)+' = 1';
 					tmpHasDeletedField = true;
 					break;
 				case 'DeleteDate':
-					tmpUpdateSql = ' '+tmpSchemaEntry.Column+' = ' + SQL_NOW;
+					tmpUpdateSql = ' '+generateSafeFieldName(tmpSchemaEntry.Column)+' = ' + SQL_NOW;
 					break;
 				case 'UpdateDate':
-					tmpUpdateSql = ' '+tmpSchemaEntry.Column+' = ' + SQL_NOW;
+					tmpUpdateSql = ' '+generateSafeFieldName(tmpSchemaEntry.Column)+' = ' + SQL_NOW;
 					break;
 				case 'DeleteIDUser':
 					var tmpColumnParameter = tmpSchemaEntry.Column+'_'+tmpCurrentColumn;
-					tmpUpdateSql = ' '+tmpSchemaEntry.Column+' = :'+tmpColumnParameter;
+					tmpUpdateSql = ' '+generateSafeFieldName(tmpSchemaEntry.Column)+' = :'+tmpColumnParameter;
 					pParameters.query.parameters[tmpColumnParameter] = pParameters.query.IDUser;
 					break;
 				default:
@@ -501,15 +501,15 @@ var FoxHoundDialectPostgreSQL = function(pFable)
 			switch (tmpSchemaEntry.Type)
 			{
 				case 'Deleted':
-					tmpUpdateSql = ' '+tmpSchemaEntry.Column+' = 0';
+					tmpUpdateSql = ' '+generateSafeFieldName(tmpSchemaEntry.Column)+' = 0';
 					tmpHasDeletedField = true;
 					break;
 				case 'UpdateDate':
-					tmpUpdateSql = ' '+tmpSchemaEntry.Column+' = ' + SQL_NOW;
+					tmpUpdateSql = ' '+generateSafeFieldName(tmpSchemaEntry.Column)+' = ' + SQL_NOW;
 					break;
 				case 'UpdateIDUser':
 					var tmpColumnParameter = tmpSchemaEntry.Column+'_'+tmpCurrentColumn;
-					tmpUpdateSql = ' '+tmpSchemaEntry.Column+' = :'+tmpColumnParameter;
+					tmpUpdateSql = ' '+generateSafeFieldName(tmpSchemaEntry.Column)+' = :'+tmpColumnParameter;
 					pParameters.query.parameters[tmpColumnParameter] = pParameters.query.IDUser;
 					break;
 				default:
@@ -702,7 +702,7 @@ var FoxHoundDialectPostgreSQL = function(pFable)
 					{
 						tmpCreateSet += ',';
 					}
-					tmpCreateSet += ' '+tmpColumn;
+					tmpCreateSet += ' '+generateSafeFieldName(tmpColumn);
 					break;
 			}
 		}

package/test/FoxHound-Dialect-PostgreSQL_tests.js

@@ -87,7 +87,7 @@ suite
 						tmpQuery.buildCreateQuery();
 						_Fable.log.trace('Create Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal('INSERT INTO "Animal" ( IDAnimal, Name, Age) VALUES ( :IDAnimal_0, :Name_1, :Age_2) RETURNING *;');
+							.to.equal('INSERT INTO "Animal" ( "IDAnimal", "Name", "Age") VALUES ( :IDAnimal_0, :Name_1, :Age_2) RETURNING *;');
 					}
 				);
 				test
@@ -135,7 +135,7 @@ suite
 						tmpQuery.buildReadQuery();
 						_Fable.log.trace('Simple Select Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal('SELECT "Animal".* FROM "Animal" ORDER BY Cost DESC;');
+							.to.equal('SELECT "Animal".* FROM "Animal" ORDER BY "Cost" DESC;');
 					}
 				);
 				test
@@ -149,7 +149,7 @@ suite
 						tmpQuery.buildReadQuery();
 						_Fable.log.trace('Simple Select Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal('SELECT DISTINCT "Animal".* FROM "Animal" ORDER BY Cost DESC;');
+							.to.equal('SELECT DISTINCT "Animal".* FROM "Animal" ORDER BY "Cost" DESC;');
 					}
 				);
 				test
@@ -169,7 +169,7 @@ suite
 						tmpQuery.buildReadQuery();
 						_Fable.log.trace('Select Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal('SELECT "Name", "Age", "Cost" FROM "Animal" WHERE Age = :Age_w0 ORDER BY Age, Cost LIMIT 10 OFFSET 0;');
+							.to.equal('SELECT "Name", "Age", "Cost" FROM "Animal" WHERE "Age" = :Age_w0 ORDER BY "Age", "Cost" LIMIT 10 OFFSET 0;');
 					}
 				);
 				test
@@ -189,7 +189,7 @@ suite
 						tmpQuery.buildReadQuery();
 						_Fable.log.trace('Select Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal('SELECT *, "Name", "Age", "Cost", "Animal".* FROM "Animal" WHERE Age = :Age_w0 ORDER BY Age, Cost LIMIT 10 OFFSET 0;');
+							.to.equal('SELECT *, "Name", "Age", "Cost", "Animal".* FROM "Animal" WHERE "Age" = :Age_w0 ORDER BY "Age", "Cost" LIMIT 10 OFFSET 0;');
 					}
 				);
 				test
@@ -213,7 +213,7 @@ suite
 						tmpQuery.buildReadQuery();
 						_Fable.log.trace('Select Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal('SELECT "Name", "Age", "Cost" FROM "Animal" WHERE Age = :Age_w0 AND ( Color = :Color_w2 OR Color = :Color_w3 ) AND Description IS NOT NULL AND IDOffice IN ( :IDOffice_w6 ) ORDER BY Age LIMIT 100;');
+							.to.equal('SELECT "Name", "Age", "Cost" FROM "Animal" WHERE "Age" = :Age_w0 AND ( "Color" = :Color_w2 OR "Color" = :Color_w3 ) AND "Description" IS NOT NULL AND "IDOffice" IN ( :IDOffice_w6 ) ORDER BY "Age" LIMIT 100;');
 					}
 				);
 				test
@@ -229,7 +229,7 @@ suite
 						tmpQuery.buildUpdateQuery();
 						_Fable.log.trace('Update Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal('UPDATE "Animal" SET Name = :Name_0, Age = :Age_1 WHERE IDAnimal = :IDAnimal_w0;');
+							.to.equal('UPDATE "Animal" SET "Name" = :Name_0, "Age" = :Age_1 WHERE "IDAnimal" = :IDAnimal_w0;');
 					}
 				);
 				test
@@ -244,7 +244,7 @@ suite
 						tmpQuery.buildCountQuery();
 						_Fable.log.trace('Count Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal('SELECT COUNT(*) AS RowCount FROM "Animal" WHERE Age = :Age_w0;');
+							.to.equal('SELECT COUNT(*) AS RowCount FROM "Animal" WHERE "Age" = :Age_w0;');
 					}
 				);
 				test
@@ -263,7 +263,7 @@ suite
 						Expect(tmpQuery.query.body)
 							.to.contain('UPDATE "Animal" SET');
 						Expect(tmpQuery.query.body)
-							.to.contain('Deleted = 1');
+							.to.contain('"Deleted" = 1');
 						Expect(tmpQuery.query.body)
 							.to.contain('NOW()');
 					}
@@ -280,7 +280,7 @@ suite
 						tmpQuery.buildDeleteQuery();
 						_Fable.log.trace('Delete Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal('DELETE FROM "Animal" WHERE IDAnimal = :IDAnimal_w0;');
+							.to.equal('DELETE FROM "Animal" WHERE "IDAnimal" = :IDAnimal_w0;');
 					}
 				);
 				test
@@ -299,7 +299,7 @@ suite
 						Expect(tmpQuery.query.body)
 							.to.contain('UPDATE "Animal" SET');
 						Expect(tmpQuery.query.body)
-							.to.contain('Deleted = 0');
+							.to.contain('"Deleted" = 0');
 						Expect(tmpQuery.query.body)
 							.to.contain('NOW()');
 					}