orange-orm 4.4.2 → 4.5.0-beta.1

package/src/table/column/string/newEncode.js

@@ -3,7 +3,7 @@ var purify = require('./purify');
 
 function _new(column) {
 
-	var encode = function(value) {
+	var encode = function(_context, value) {
 		value = purify(value);
 		if (value == null) {
 			if (column.dbNull === null)
@@ -13,7 +13,7 @@ function _new(column) {
 		return newPara('?', [value]);
 	};
 
-	encode.unsafe = function(value) {
+	encode.unsafe = function(_context, value) {
 		value = purify(value);
 		if (value == null) {
 			if (column.dbNull === null)
@@ -23,7 +23,7 @@ function _new(column) {
 		return '\'' + value + '\'';
 	};
 
-	encode.direct = function(value) {
+	encode.direct = function(_context, value) {
 		return value ;
 	};
 

package/src/table/column/string/startsWith.js

@@ -1,3 +1,3 @@
 var startsWithCore = require('./startsWithCore');
 
-module.exports = startsWithCore.bind(null, 'LIKE');
+module.exports = (context, ...rest) => startsWithCore.apply(null, [context, 'LIKE', ...rest]);

package/src/table/column/string/startsWithCore.js

@@ -2,14 +2,14 @@ var newBoolean = require('../newBoolean');
 var nullOperator = ' is ';
 var quote = require('../../quote');
 
-function startsWithCore(operator, column,arg,alias) {
+function startsWithCore(context, operator, column,arg,alias) {
 	operator = ' ' + operator + ' ';
-	var encoded = column.encode(arg);
+	var encoded = column.encode(context, arg);
 	if (encoded.sql() == 'null')
 		operator = nullOperator;
 	else
-		encoded = column.encode(arg + '%');
-	var firstPart = quote(alias) + '.' + quote(column._dbName) + operator;
+		encoded = column.encode(context, arg + '%');
+	var firstPart = quote(context, alias) + '.' + quote(context, column._dbName) + operator;
 	var filter =  encoded.prepend(firstPart);
 	return newBoolean(filter);
 }

package/src/table/column/string.js

@@ -17,34 +17,34 @@ function _new(table, column) {
 	column.decode = newDecode(column);
 	var extractAlias = _extractAlias.bind(null, table);
 
-	column.startsWith = function(arg, alias) {
+	column.startsWith = function(context, arg, alias) {
 		alias = extractAlias(alias);
-		return startsWith(column, arg, alias);
+		return startsWith(context, column, arg, alias);
 	};
-	column.endsWith = function(arg, alias) {
+	column.endsWith = function(context, arg, alias) {
 		alias = extractAlias(alias);
-		return endsWith(column, arg, alias);
+		return endsWith(context, column, arg, alias);
 	};
-	column.contains = function(arg, alias) {
+	column.contains = function(context, arg, alias) {
 		alias = extractAlias(alias);
-		return contains(column, arg, alias);
+		return contains(context, column, arg, alias);
 	};
-	column.iStartsWith = function(arg, alias) {
+	column.iStartsWith = function(context, arg, alias) {
 		alias = extractAlias(alias);
-		return iStartsWith(column, arg, alias);
+		return iStartsWith(context, column, arg, alias);
 	};
-	column.iEndsWith = function(arg, alias) {
+	column.iEndsWith = function(context, arg, alias) {
 		alias = extractAlias(alias);
-		return iEndsWith(column, arg, alias);
+		return iEndsWith(context, column, arg, alias);
 	};
-	column.iContains = function(arg, alias) {
+	column.iContains = function(context, arg, alias) {
 		alias = extractAlias(alias);
-		return iContains(column, arg, alias);
+		return iContains(context, column, arg, alias);
 	};
 
-	column.iEqual = function(arg, alias) {
+	column.iEqual = function(context, arg, alias) {
 		alias = extractAlias(alias);
-		return iEqual(column, arg, alias);
+		return iEqual(context, column, arg, alias);
 	};
 
 	column.iEq = column.iEqual;

package/src/table/commands/beginCommand.js

@@ -1,8 +1,8 @@
 let newParameterized = require('../query/newParameterized');
 let getSessionContext = require('../getSessionContext');
 
-module.exports = function() {
-	let command = newParameterized(getSessionContext().begin || 'BEGIN');
+module.exports = function(context) {
+	let command = newParameterized(getSessionContext(context).begin || 'BEGIN');
 	command.endEdit = empty;
 	command.matches = empty;
 

package/src/table/commands/compressChanges.js

@@ -1,8 +1,8 @@
 var newParameterized = require('../query/newParameterized');
 var getSessionSingleton = require('../getSessionSingleton');
 
-function compress(queries) {
-	var multipleStatements = getSessionSingleton('multipleStatements');
+function compress(context, queries) {
+	var multipleStatements = getSessionSingleton(context, 'multipleStatements');
 	var compressed = [];
 	var queryCount = queries.length;
 

package/src/table/commands/delete/newSingleCommand.js

@@ -4,14 +4,14 @@ var extractFilter = require('../../query/extractFilter');
 var newSingleCommandCore = require('./singleCommand/newSingleCommandCore');
 var createAlias = require('./createAlias');
 
-function _new(table,filter,relations) {
+function _new(context, table, filter, relations) {
 	var alias = createAlias(table, relations.length);
 	filter = extractFilter(filter);
-	filter = newSubFilter(relations, filter);
-	var discriminator = newDiscriminatorSql(table, alias);
+	filter = newSubFilter(context, relations, filter);
+	var discriminator = newDiscriminatorSql(context, table, alias);
 	if (discriminator !== '')
-		filter = filter.and(discriminator);
-	return newSingleCommandCore(table, filter, alias);
+		filter = filter.and(context, discriminator);
+	return newSingleCommandCore(context, table, filter, alias);
 }
 
 module.exports = _new;

package/src/table/commands/delete/singleCommand/joinSql.js

@@ -1,21 +1,21 @@
-var newShallowJoinSql = require('../../../query/singleQuery/joinSql/newShallowJoinSql');
-var createAlias = require('../createAlias');
+const newShallowJoinSql = require('../../../query/singleQuery/joinSql/newShallowJoinSql');
+const createAlias = require('../createAlias');
 
-function newJoinSql(relations) {
-	var length = relations.length;
-	var leftAlias,
+function newJoinSql(context, relations) {
+	const length = relations.length;
+	let leftAlias,
 		rightAlias;
-	var sql = '';
+	let sql = '';
 
 	function addSql(relation) {
-		var rightColumns = relation.childTable._primaryColumns;
-		var leftColumns = relation.columns;
-		sql += ' INNER' + newShallowJoinSql(relation.childTable,leftColumns,rightColumns,leftAlias,rightAlias).sql();
+		const rightColumns = relation.childTable._primaryColumns;
+		const leftColumns = relation.columns;
+		sql += ' INNER' + newShallowJoinSql(context, relation.childTable, leftColumns, rightColumns, leftAlias, rightAlias).sql();
 	}
 
-	relations.forEach(function(relation, i){
-		leftAlias = 'x' + (length-i);
-		rightAlias = createAlias(relation.childTable, length-i-1);
+	relations.forEach(function(relation, i) {
+		leftAlias = 'x' + (length - i);
+		rightAlias = createAlias(relation.childTable, length - i - 1);
 		addSql(relation);
 
 	});

package/src/table/commands/delete/singleCommand/newSingleCommandCore.js

@@ -1,13 +1,13 @@
 var getSessionSingleton = require('../../../getSessionSingleton');
 
-function newSingleCommandCore(table,filter,alias) {
+function newSingleCommandCore(context, table, filter, alias) {
 	var c = {};
 
 	c.sql = function() {
 		var whereSql = filter.sql();
 		if (whereSql)
 			whereSql = ' where ' + whereSql;
-		var deleteFromSql = getSessionSingleton('deleteFromSql');
+		var deleteFromSql = getSessionSingleton(context, 'deleteFromSql');
 		return deleteFromSql(table, alias, whereSql);
 	};
 

package/src/table/commands/delete/singleCommand/selectSql.js

@@ -1,11 +1,11 @@
-var newParameterized = require('../../../query/newParameterized');
-var newBoolean = require('../../../column/newBoolean');
+const newParameterized = require('../../../query/newParameterized');
+const newBoolean = require('../../../column/newBoolean');
 const quote = require('../../../quote');
 
-function newSelectSql(table, alias) {
-	var colName = quote(table._primaryColumns[0]._dbName);
-	alias = quote(alias);
-	var sql = 'SELECT ' + alias + '.' + colName + ' FROM ' + quote(table._dbName) + ' ' + alias;
+function newSelectSql(context, table, alias) {
+	const colName = quote(context, table._primaryColumns[0]._dbName);
+	alias = quote(context, alias);
+	let sql = 'SELECT ' + alias + '.' + colName + ' FROM ' + quote(context, table._dbName) + ' ' + alias;
 	sql = newParameterized(sql);
 	return newBoolean(sql);
 }

package/src/table/commands/delete/singleCommand/subFilter.js

@@ -1,17 +1,17 @@
-var newSelect = require('./selectSql');
-var newJoin = require('./joinSql');
-var newWhere = require('./whereSql');
-var createAlias = require('../createAlias');
+const newSelect = require('./selectSql');
+const newJoin = require('./joinSql');
+const newWhere = require('./whereSql');
+const createAlias = require('../createAlias');
 
-function newSubFilter(relations, shallowFilter) {
-	var relationCount = relations.length;
+function newSubFilter(context,relations, shallowFilter) {
+	const relationCount = relations.length;
 	if (relationCount === 0)
 		return shallowFilter;
-	var table = relations[0].childTable;
-	var alias = createAlias(table, relationCount -1);
-	var filter = newSelect(table,alias).prepend('EXISTS (');
-	var join = newJoin(relations.slice(1));
-	var where = newWhere(relations,shallowFilter,alias);
+	const table = relations[0].childTable;
+	const alias = createAlias(table, relationCount -1);
+	const filter = newSelect(context,table,alias).prepend('EXISTS (');
+	const join = newJoin(context, relations.slice(1));
+	const where = newWhere(context,relations,shallowFilter,alias);
 	return filter.append(join).append(where).append(')');
 
 }

package/src/table/commands/delete/singleCommand/whereSql.js

@@ -1,6 +1,6 @@
 var newShallowJoinSql = require('../../../query/singleQuery/joinSql/newShallowJoinSqlCore');
 
-function newWhereSql(relations, shallowFilter, rightAlias) {
+function newWhereSql(context, relations, shallowFilter, rightAlias) {
 	var sql;
 	var relationCount = relations.length;
 	var relation = relations[0];
@@ -12,7 +12,7 @@ function newWhereSql(relations, shallowFilter, rightAlias) {
 
 	function where() {
 		var table = relation.childTable;
-		var joinCore = newShallowJoinSql(table, leftColumns, rightColumns, leftAlias, rightAlias);
+		var joinCore = newShallowJoinSql(context, table, leftColumns, rightColumns, leftAlias, rightAlias);
 		if (shallowFilter.sql())
 			sql = shallowFilter.prepend(' AND ').prepend(joinCore).prepend(' WHERE ');
 		else

package/src/table/commands/getChangeSet.js

@@ -1,6 +1,6 @@
 var getSessionSingleton = require('../getSessionSingleton');
-function getChangeSet() {
-	return getSessionSingleton('changes');
+function getChangeSet(context) {
+	return getSessionSingleton(context, 'changes');
 }
 
 module.exports = getChangeSet;

package/src/table/commands/insert/getSqlTemplate.js

@@ -1,19 +1,19 @@
 let getSessionContext = require('../../getSessionContext');
 let quote = require('../../quote');
 
-function getSqlTemplate(_table, _row) {
-	let context = getSessionContext();
-	if (context.insertSql)
-		return context.insertSql.apply(null, arguments);
+function getSqlTemplate(context, _table, _row) {
+	let rdb = getSessionContext(context);
+	if (rdb.insertSql)
+		return rdb.insertSql.apply(null, arguments);
 	else
 		return getSqlTemplateDefault.apply(null, arguments);
 
 }
 
-function getSqlTemplateDefault(table, row) {
+function getSqlTemplateDefault(context, table, row) {
 	let columnNames = [];
 	let values = [];
-	let sql = 'INSERT INTO ' + quote(table._dbName) + ' ';
+	let sql = 'INSERT INTO ' + quote(context, table._dbName) + ' ';
 	addDiscriminators();
 	addColumns();
 	if (columnNames.length === 0)
@@ -26,7 +26,7 @@ function getSqlTemplateDefault(table, row) {
 		let discriminators = table._columnDiscriminators;
 		for (let i = 0; i < discriminators.length; i++) {
 			let parts = discriminators[i].split('=');
-			columnNames.push(quote(parts[0]));
+			columnNames.push(quote(context, parts[0]));
 			values.push(parts[1]);
 		}
 	}
@@ -36,29 +36,29 @@ function getSqlTemplateDefault(table, row) {
 		for (let i = 0; i < columns.length; i++) {
 			let column = columns[i];
 			if (row['__' + column.alias] !== undefined) {
-				columnNames.push(quote(column._dbName));
+				columnNames.push(quote(context, column._dbName));
 				values.push('%s');
 			}
 		}
 	}
 
 	function lastInserted() {
-		let context = getSessionContext();
-		if (!context.lastInsertedIsSeparate && context.lastInsertedSql)
-			return ' ' + context.lastInsertedSql(table);
+		let rdb = getSessionContext(context);
+		if (!rdb.lastInsertedIsSeparate && rdb.lastInsertedSql)
+			return ' ' + rdb.lastInsertedSql(table);
 		return '';
 	}
 
 	function outputInserted() {
-		let context = getSessionContext();
-		if (!context.lastInsertedIsSeparate && context.outputInsertedSql)
-			return ' ' + context.outputInsertedSql(table) + ' ';
+		let rdb = getSessionContext(context);
+		if (!rdb.lastInsertedIsSeparate && rdb.outputInsertedSql)
+			return ' ' + rdb.outputInsertedSql(table) + ' ';
 		return '';
 	}
 
 	function defaultValues() {
-		let context = getSessionContext();
-		let _default = context.insertDefault || 'DEFAULT VALUES';
+		let rdb = getSessionContext(context);
+		let _default = rdb.insertDefault || 'DEFAULT VALUES';
 		return `${_default}${lastInserted()}`;
 
 	}

package/src/table/commands/lastCommandMatches.js

@@ -1,7 +1,7 @@
 var getChangeSet = require('./getChangeSet');
 
-function lastCommandMatches(row) {
-	var changeSet = getChangeSet();
+function lastCommandMatches(context, row) {
+	var changeSet = getChangeSet(context);
 	var lastIndex = changeSet.length-1;
 	if (lastIndex >= 0 && changeSet[lastIndex].matches)
 		return changeSet[lastIndex].matches(row);

package/src/table/commands/newDeleteCommand.js

@@ -5,16 +5,16 @@ var nextCommand = function() {
 	nextCommand.apply(null, arguments);
 };
 
-function newCommand(queries,table,filter,strategy,relations) {
-	var singleCommand = newSingleCommand(table,filter,relations);
-	for(var name in strategy) {
+function newCommand(context, queries, table, filter, strategy, relations) {
+	var singleCommand = newSingleCommand(context, table, filter, relations);
+	for (var name in strategy) {
 		if (!(strategy[name] === null || strategy[name]))
 			continue;
 		var childStrategy = strategy[name];
 		var childRelation = table._relations[name];
 		var joinRelation = childRelation.joinRelation;
-		var	childRelations = [joinRelation].concat(relations);
-		nextCommand(queries,childRelation.childTable,filter,childStrategy,childRelations);
+		var childRelations = [joinRelation].concat(relations);
+		nextCommand(context, queries, childRelation.childTable, filter, childStrategy, childRelations);
 	}
 	queries.push(singleCommand);
 	return queries;

package/src/table/commands/newGetLastInsertedCommand.js

@@ -1,15 +1,15 @@
 var newGetLastInsertedCommandCore = require('./newGetLastInsertedCommandCore');
 var newImmutable = require('../../newImmutable');
 
-function newGetLastInsertedCommand(table, row, insertCommand) {
-	let cmd =  new InsertCommand(table, row, insertCommand);
+function newGetLastInsertedCommand(context, table, row, insertCommand) {
+	let cmd =  new InsertCommand(context, table, row, insertCommand);
 	insertCommand.endEdit = () => {};
 	return cmd;
 }
 
-function InsertCommand(table, row, insertCommand) {
+function InsertCommand(context, table, row, insertCommand) {
 	this._insertCommand = insertCommand;
-	this.__getCoreCommand = newImmutable(newGetLastInsertedCommandCore);
+	this.__getCoreCommand = newImmutable(newGetLastInsertedCommandCore.bind(null, context));
 	this._table = table;
 	this._row = row;
 }

package/src/table/commands/newGetLastInsertedCommandCore.js

@@ -3,19 +3,19 @@ const getSessionContext = require('../getSessionContext');
 const newDiscriminatorSql = require('../query/singleQuery/newDiscriminatorSql');
 const quote = require('../quote');
 
-function newGetLastInsertedCommandCore(table, row) {
+function newGetLastInsertedCommandCore(context, table, row) {
 	let parameters = [];
 	let keyValues = table._primaryColumns.map(column => row['__' + column.alias]);
-	let sql = `SELECT ${columnNames()} FROM ${quote(table._dbName)} WHERE ${whereSql()}`;
+	let sql = `SELECT ${columnNames()} FROM ${quote(context, table._dbName)} WHERE ${whereSql()}`;
 	return newParameterized(sql, parameters);
 
 	function columnNames() {
-		return table._columns.map(col => quote(col._dbName)).join(',');
+		return table._columns.map(col => quote(context, col._dbName)).join(',');
 	}
 
 	function whereSql() {
 		let parameterized;
-		let filter = getSessionContext().lastInsertedSql(table, keyValues);
+		let filter = getSessionContext(context).lastInsertedSql(context, table, keyValues);
 		if (Array.isArray(filter)) {
 			for (let i = 0; i < filter.length; i++) {
 				const sep = i === 0 ? '' : ' AND ';
@@ -37,7 +37,7 @@ function newGetLastInsertedCommandCore(table, row) {
 	}
 
 	function discriminators() {
-		return newDiscriminatorSql(table, table._dbName);
+		return newDiscriminatorSql(context, table, table._dbName);
 	}
 }
 

package/src/table/commands/newInsertCommand.js

@@ -1,4 +1,3 @@
-// var newInsertCommandCore = require('./newInsertCommandCore');
 var newImmutable = require('../../newImmutable');
 var createPatch = require('../../client/createPatch');
 var createDto = require('../resultToRows/toDto/createDto');

package/src/table/commands/newInsertCommandCore.js

@@ -2,16 +2,16 @@ var newParameterized = require('../query/newParameterized');
 var getSqlTemplate = require('./insert/getSqlTemplate');
 var util = require('util');
 
-function newInsertCommandCore(table, row, options = {}) {
+function newInsertCommandCore(context, table, row, options = {}) {
 	var parameters = [];
-	var values = [getSqlTemplate(table, row, options)];
+	var values = [getSqlTemplate(context, table, row, options)];
 
 	var columns = table._columns;
 	for (var i = 0; i < columns.length; i++) {
 		var column = columns[i];
 		var alias = column.alias;
 		if (row['__' + column.alias] !== undefined) {
-			var encoded = column.encode(row[alias]);
+			var encoded = column.encode(context, row[alias]);
 			if (encoded.parameters.length > 0) {
 				values.push('?');
 				parameters.push(encoded.parameters[0]);

package/src/table/commands/newRow.js

@@ -1,7 +1,7 @@
 var decodeDbRow = require('../resultToRows/decodeDbRow');
 var flags = require('../../flags');
 
-function newRow({table, _options}) {
+function newRow(context, {table, _options}) {
 	var dto = {};
 	table._columns.forEach(addColumn);
 
@@ -28,20 +28,20 @@ function newRow({table, _options}) {
 		else
 			dto[alias] = undefined;
 	}
-	const arg = arguments[1];
+	const arg = arguments[2];
 	if (isObject(arg))
 		for (let name in arg) {
 			if (table[name] && table[name].equal)
 				dto[name] = arg[name];
 		}
 	else
-		for (var i = 1; i < arguments.length; i++) {
+		for (var i = 2; i < arguments.length; i++) {
 			var pkValue = arguments[i];
 			var column = table._primaryColumns[i - 1];
 			dto[column.alias] = pkValue;
 		}
 
-	return decodeDbRow(table, table, dto, true, true);
+	return decodeDbRow(context, table, table, dto, true, true);
 }
 
 function isObject(object) {

package/src/table/commands/newUpdateCommand.js

@@ -4,14 +4,14 @@ let newColumnList = require('../../newObject');
 var createPatch = require('../../client/createPatch');
 let createDto = require('../resultToRows/toDto/createDto');
 
-function newUpdateCommand(table, column, row) {
-	return new UpdateCommand(table, column, row);
+function newUpdateCommand(context, table, column, row) {
+	return new UpdateCommand(context, table, column, row);
 }
 
-function UpdateCommand(table, column, row) {
+function UpdateCommand(context, table, column, row) {
 	this._table = table;
 	this._row = row;
-	this.__getCoreCommand = newImmutable(newUpdateCommandCore);
+	this.__getCoreCommand = newImmutable(newUpdateCommandCore.bind(null, context));
 	this._columnList = newColumnList();
 	this._columnList[column.alias] = column;
 	this.onFieldChanged = this.onFieldChanged.bind(this);

package/src/table/commands/newUpdateCommandCore.js

@@ -1,8 +1,8 @@
 const getSessionSingleton = require('../getSessionSingleton');
 var newParameterized = require('../query/newParameterized');
 
-function newUpdateCommandCore(table, columns, row) {
-	const quote = getSessionSingleton('quote');
+function newUpdateCommandCore(context, table, columns, row) {
+	const quote = getSessionSingleton(context, 'quote');
 	var command = newParameterized('UPDATE ' + quote(table._dbName) + ' SET');
 	var separator = ' ';
 
@@ -13,7 +13,7 @@ function newUpdateCommandCore(table, columns, row) {
 	function addColumns() {
 		for (var alias in columns) {
 			var column = columns[alias];
-			var encoded = column.encode(row[alias]);
+			var encoded = column.encode(context, row[alias]);
 			command = command.append(separator + quote(column._dbName) + '=').append(encoded);
 			separator = ',';
 		}
@@ -25,7 +25,7 @@ function newUpdateCommandCore(table, columns, row) {
 		for (var i = 0; i < columns.length; i++) {
 			var column = columns[i];
 			var value = row[column.alias];
-			var encoded = column.encode(value);
+			var encoded = column.encode(context, value);
 			command = command.append(separator + quote(column._dbName) + '=').append(encoded);
 			separator = ' AND ';
 		}

package/src/table/commands/pushCommand.js

@@ -1,8 +1,8 @@
 var getChangeSet = require('./getChangeSet');
 var negotiateEndEdit = require('./negotiateEndEdit');
 
-function pushCommand(command) {
-	var changes = getChangeSet();
+function pushCommand(context, command) {
+	var changes = getChangeSet(context);
 	negotiateEndEdit(changes);
 	changes.push(command);
 }

package/src/table/commit.js

@@ -5,9 +5,9 @@ let releaseDbClient = require('./releaseDbClient');
 let popChanges = require('./popChanges');
 const getSessionSingleton = require('./getSessionSingleton');
 
-function commit(result) {
+function _commit(context, result) {
 	return popAndPushChanges()
-		.then(releaseDbClient)
+		.then(releaseDbClient.bind(null, context))
 		.then(onReleased);
 
 	function onReleased() {
@@ -15,18 +15,20 @@ function commit(result) {
 	}
 
 	async function popAndPushChanges() {
-		let changes = popChanges();
+		let changes = popChanges(context);
 		while (changes.length > 0) {
-			await executeChanges(changes);
-			changes = popChanges();
+			await executeChanges(context, changes);
+			changes = popChanges(context);
 		}
-		if (!getSessionSingleton('readonly'))
-			pushCommand(commitCommand);
-		return executeChanges(popChanges());
+		if (!getSessionSingleton(context, 'transactionLess'))
+			pushCommand(context, commitCommand);
+		return executeChanges(context, popChanges(context));
 	}
 }
 
-module.exports = function(result) {
+function commit(context, result) {
 	return Promise.resolve()
-		.then(() => commit(result));
-};
+		.then(() => _commit(context, result));
+}
+
+module.exports = commit;

package/src/table/count.js

@@ -4,11 +4,11 @@ const extractFilter = require('./query/extractFilter');
 const newWhereSql = require('./query/singleQuery/newWhereSql');
 const quote = require('./quote');
 
-async function count(table, filter) {
+async function count(context, table, filter) {
 	let alias = table._dbName;
-	filter = negotiateRawSqlFilter(filter, table);
-	let query = newQuery(table, filter, alias);
-	let allResults = await executeQueries([query]);
+	filter = negotiateRawSqlFilter(context,filter, table);
+	let query = newQuery(context, table, filter, alias);
+	let allResults = await executeQueries(context, [query]);
 	let count = await allResults[0].then((rows) => {
 
 		const count = Number.parseInt(rows[0]._count);
@@ -17,11 +17,11 @@ async function count(table, filter) {
 	return count;
 }
 
-function newQuery(table, filter, alias) {
+function newQuery(context, table, filter, alias) {
 	filter = extractFilter(filter);
-	var name = quote(table._dbName);
-	alias = quote(alias);
-	var whereSql = newWhereSql(table, filter, alias);
+	var name = quote(context, table._dbName);
+	alias = quote(context, alias);
+	var whereSql = newWhereSql(context, table, filter, alias);
 
 	return whereSql.prepend('select count(*) "_count" from ' + name + ' ' + alias);