foxhound 2.0.16 → 2.0.17

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "foxhound",
-    "version": "2.0.16",
+    "version": "2.0.17",
     "description": "A Database Query generation library.",
     "main": "source/FoxHound.js",
     "scripts": {

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

@@ -211,12 +211,29 @@ var FoxHoundDialectSQLite = function(pFable)
 				// Close a logical grouping
 				tmpWhere += ' )';
 			}
-			else if (tmpFilter[i].Operator === 'IN')
+			else if (tmpFilter[i].Operator === 'IN' || tmpFilter[i].Operator === 'NOT IN')
 			{
 				tmpColumnParameter = tmpFilter[i].Parameter+'_w'+i;
-				// Add the column name, operator and parameter name to the list of where value parenthetical
-				tmpWhere += ' '+escapeColumn(tmpFilter[i].Column, pParameters)+' '+tmpFilter[i].Operator+' ( :'+tmpColumnParameter+' )';
-				pParameters.query.parameters[tmpColumnParameter] = tmpFilter[i].Value;
+				// SQLite (better-sqlite3) cannot bind arrays as a single parameter.
+				// Expand the array into individual named parameters for each element.
+				var tmpFilterValue = tmpFilter[i].Value;
+				if (Array.isArray(tmpFilterValue))
+				{
+					var tmpParameterNames = [];
+					for (var j = 0; j < tmpFilterValue.length; j++)
+					{
+						var tmpElementParameter = tmpColumnParameter+'_'+j;
+						tmpParameterNames.push(':'+tmpElementParameter);
+						pParameters.query.parameters[tmpElementParameter] = tmpFilterValue[j];
+					}
+					tmpWhere += ' '+escapeColumn(tmpFilter[i].Column, pParameters)+' '+tmpFilter[i].Operator+' ( '+tmpParameterNames.join(', ')+' )';
+				}
+				else
+				{
+					// If for some reason the value is not an array, fall back to the old behavior
+					tmpWhere += ' '+escapeColumn(tmpFilter[i].Column, pParameters)+' '+tmpFilter[i].Operator+' ( :'+tmpColumnParameter+' )';
+					pParameters.query.parameters[tmpColumnParameter] = tmpFilterValue;
+				}
 			}
 			else if (tmpFilter[i].Operator === 'IS NOT NULL')
 			{

package/test/FoxHound-Dialect-SQLite_tests.js

@@ -207,7 +207,7 @@ suite
 						// This is the query generated by the SQLite dialect
 						_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_0, :IDOffice_w6_1, :IDOffice_w6_2, :IDOffice_w6_3, :IDOffice_w6_4 ) ORDER BY `Age` LIMIT 100;');
 					}
 				);
 				test
@@ -655,7 +655,7 @@ suite
 						// This is the query generated by the SQLite dialect
 						_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 ) AND `Deleted` = :Deleted_w7 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_0, :IDOffice_w6_1, :IDOffice_w6_2, :IDOffice_w6_3, :IDOffice_w6_4 ) AND `Deleted` = :Deleted_w7 LIMIT 100;');
 					}
 				);
 				test