orange-orm 4.7.10-beta.3 → 4.7.11-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orange-orm",
-  "version": "4.7.10-beta.3",
+  "version": "4.7.11-beta.0",
   "main": "./src/index.js",
   "module": "./dist/index.mjs",
   "browser": "./dist/index.browser.mjs",

package/src/bunSqlite/newTransaction.js

@@ -2,6 +2,7 @@ const wrapQuery = require('./wrapQuery');
 const encodeBoolean = require('../sqlite/encodeBoolean');
 const encodeBinary = require('../nodeSqlite/encodeBinary');
 const decodeBinary = require('../nodeSqlite/decodeBinary');
+const formatBigintOut = require('../sqlite/formatBigintOut');
 const deleteFromSql = require('../sqlite/deleteFromSql');
 const selectForUpdateSql = require('../sqlite/selectForUpdateSql');
 const lastInsertedSql = require('../sqlite/lastInsertedSql');
@@ -20,6 +21,7 @@ function newResolveTransaction(domain, pool, { readonly = false } = {})  {
 	rdb.encodeBoolean = encodeBoolean;
 	rdb.encodeBinary = encodeBinary;
 	rdb.decodeBinary = decodeBinary;
+	rdb.formatBigintOut = formatBigintOut;
 	rdb.decodeJSON = decodeJSON;
 	rdb.encodeJSON = JSON.stringify;
 	rdb.deleteFromSql = deleteFromSql;

package/src/d1/newTransaction.js

@@ -1,5 +1,6 @@
 const wrapQuery = require('./wrapQuery');
 const encodeBoolean = require('../sqlite/encodeBoolean');
+const formatBigintOut = require('../sqlite/formatBigintOut');
 const deleteFromSql = require('../sqlite/deleteFromSql');
 const selectForUpdateSql = require('../sqlite/selectForUpdateSql');
 const lastInsertedSql = require('../sqlite/lastInsertedSql');
@@ -18,6 +19,7 @@ function newResolveTransaction(domain, pool, { readonly = false } = {})  {
 	rdb.encodeBoolean = encodeBoolean;
 	rdb.decodeJSON = decodeJSON;
 	rdb.encodeJSON = JSON.stringify;
+	rdb.formatBigintOut = formatBigintOut;
 	rdb.deleteFromSql = deleteFromSql;
 	rdb.selectForUpdateSql = selectForUpdateSql;
 	rdb.lastInsertedSql = lastInsertedSql;

package/src/map.d.ts

@@ -102,6 +102,8 @@ type ColumnToType<T> = T extends UuidColumnSymbol
 	? string
 	: T extends NumericColumnSymbol
 	? number
+	: T extends BigIntColumnSymbol
+	? bigint
 	: T extends DateColumnSymbol
 	? string | Date
 	: T extends DateWithTimeZoneColumnSymbol
@@ -134,6 +136,7 @@ type RelatedColumns<T> = RemoveNeverFlat<{
 	T[K] extends StringColumnTypeDef<infer M> ? StringColumnSymbol
 	: T[K] extends UuidColumnTypeDef<infer M> ? UuidColumnSymbol
 	: T[K] extends NumericColumnTypeDef<infer M> ? NumericColumnSymbol
+	: T[K] extends BigIntColumnTypeDef<infer M> ? BigIntColumnSymbol
 	: T[K] extends DateColumnTypeDef<infer M> ? DateColumnSymbol
 	: T[K] extends DateWithTimeZoneColumnTypeDef<infer M> ? DateWithTimeZoneColumnSymbol
 	: T[K] extends BinaryColumnTypeDef<infer M> ? BinaryColumnSymbol
@@ -149,6 +152,7 @@ type RelatedColumns<T> = RemoveNeverFlat<{
 type AggregateColumns<T> = RemoveNeverFlat<{
 	[K in keyof T]:
 	T[K] extends NumericColumnTypeDef<infer M> ? NumericColumnSymbol
+	: T[K] extends BigIntColumnTypeDef<infer M> ? BigIntColumnSymbol
 	: T[K] extends ManyRelation
 	? AggregateColumns<T[K]>
 	: T[K] extends RelatedTable
@@ -174,6 +178,7 @@ type ColumnSymbols =
 	| StringColumnSymbol
 	| UuidColumnSymbol
 	| NumericColumnSymbol
+	| BigIntColumnSymbol
 	| DateColumnSymbol
 	| DateWithTimeZoneColumnSymbol
 	| BooleanColumnSymbol
@@ -245,6 +250,8 @@ type ToColumnTypes<T> = {
 	? StringColumnSymbol
 	: T[K] extends NumericColumnSymbol
 	? NumericColumnSymbol
+	: T[K] extends BigIntColumnSymbol
+	? BigIntColumnSymbol
 	: T[K] extends DateColumnSymbol
 	? DateColumnSymbol
 	: T[K] extends DateWithTimeZoneColumnSymbol
@@ -593,6 +600,12 @@ type NumericColumnSymbol = {
 type NumericColumnType<M> = M &
 	NumericColumnSymbol;
 
+type BigIntColumnSymbol = {
+	[' isBigInt']: true;
+};
+type BigIntColumnType<M> = M &
+	BigIntColumnSymbol;
+
 type JSONColumnSymbol = {
 	[' isJSON']: true;
 };
@@ -621,6 +634,7 @@ interface ColumnType<M> {
 	string(): StringColumnTypeDef<M & StringColumnSymbol>;
 	uuid(): UuidColumnTypeDef<M & UuidColumnSymbol>;
 	numeric(): NumericColumnTypeDef<M & NumericColumnSymbol>;
+	bigint(): BigIntColumnTypeDef<M & BigIntColumnSymbol>;
 	date(): DateColumnTypeDef<M & DateColumnSymbol>;
 	dateWithTimeZone(): DateWithTimeZoneColumnTypeDef<M & DateWithTimeZoneColumnSymbol>;
 	binary(): BinaryColumnTypeDef<M & BinaryColumnSymbol>;
@@ -657,6 +671,15 @@ type NumericValidator<M> = M extends NotNull
 			validator: (value?: number | null) => void
 		): NumericColumnTypeDef<M>;
 	};
+type BigIntValidator<M> = M extends NotNull
+	? {
+		validate(validator: (value: bigint) => void): BigIntColumnTypeDef<M>;
+	}
+	: {
+		validate(
+			validator: (value?: bigint | null) => void
+		): BigIntColumnTypeDef<M>;
+	};
 type BinaryValidator<M> = M extends NotNull
 	? {
 		validate(validator: (value: string) => void): BinaryColumnTypeDef<M>;
@@ -732,6 +755,17 @@ type NumericColumnTypeDef<M> = NumericValidator<M> & {
 } & ColumnTypeOf<NumericColumnType<M>> &
 	M;
 
+type BigIntColumnTypeDef<M> = BigIntValidator<M> & {
+	primary(): BigIntColumnTypeDef<M & IsPrimary> & IsPrimary;
+	notNull(): BigIntColumnTypeDef<M & NotNull> & NotNull;
+	notNullExceptInsert(): BigIntColumnTypeDef<M & NotNull & NotNullExceptInsert> & NotNull & NotNullExceptInsert;
+	serializable(value: boolean): BigIntColumnTypeDef<M>;
+	JSONSchema(schema: object, options?: Options): BigIntColumnTypeDef<M>;
+	default(value: bigint | null | undefined | (() => bigint | null | undefined)): BigIntColumnTypeDef<M>;
+	dbNull(value: bigint): BigIntColumnTypeDef<M>;
+} & ColumnTypeOf<BigIntColumnType<M>> &
+	M;
+
 type UuidColumnTypeDef<M> = UuidValidator<M> & {
 	primary(): UuidColumnTypeDef<M & IsPrimary> & IsPrimary;
 	notNull(): UuidColumnTypeDef<M & NotNull> & NotNull;
@@ -992,6 +1026,11 @@ type ColumnToSchemaType<T> =
       & (T extends NotNullExceptInsert ? { ' notNull': true; ' notNullExceptInsert': true }
          : T extends NotNull ? { ' notNull': true }
          : {}) :
+  T extends BigIntColumnSymbol
+    ? { ' type': 'bigint' }
+      & (T extends NotNullExceptInsert ? { ' notNull': true; ' notNullExceptInsert': true }
+         : T extends NotNull ? { ' notNull': true }
+         : {}) :
   T extends DateColumnSymbol | DateWithTimeZoneColumnSymbol
     ? { ' type': 'date' }
       & (T extends NotNullExceptInsert ? { ' notNull': true; ' notNullExceptInsert': true }

package/src/map2.d.ts

@@ -676,20 +676,20 @@ export type TableClient<M extends Record<string, TableDefinition<M>>, K extends
   // Array methods - return arrays with array-level active record methods, but individual items are plain
   getAll(): Promise<WithArrayActiveRecord<Array<DeepExpand<Selection<M, K, {}>>>, M, K>>;
   getAll<strategy extends FetchStrategy<M, K>>(strategy: strategy): Promise<WithArrayActiveRecord<Array<DeepExpand<Selection<M, K, strategy>>>, M, K>>;
-  getMany(filter: RawFilter | Array<PrimaryKeyObject<M, K>>): Promise<WithArrayActiveRecord<Array<DeepExpand<Selection<M, K, {}>>>, M, K>>;
-  getMany<strategy extends FetchStrategy<M, K>>(filter: RawFilter | Array<PrimaryKeyObject<M, K>>, strategy: strategy): Promise<WithArrayActiveRecord<Array<DeepExpand<Selection<M, K, strategy>>>, M, K>>;
+  getMany(filter?: RawFilter | Array<PrimaryKeyObject<M, K>>): Promise<WithArrayActiveRecord<Array<DeepExpand<Selection<M, K, {}>>>, M, K>>;
+  getMany<strategy extends FetchStrategy<M, K>>(filter?: RawFilter | Array<PrimaryKeyObject<M, K>>, strategy?: strategy): Promise<WithArrayActiveRecord<Array<DeepExpand<Selection<M, K, strategy>>>, M, K>>;
 
   // Aggregate methods - return plain objects (no active record methods)
   aggregate<strategy extends AggregateStrategy<M, K>>(strategy: strategy): Promise<Array<DeepExpand<AggregateCustomSelectorProperties<M, K, strategy>>>>;
 
   // Single item methods - return individual objects with individual active record methods
   getOne<strategy extends FetchStrategy<M, K>>(
-    filter: RawFilter | Array<PrimaryKeyObject<M, K>>
+    filter?: RawFilter | Array<PrimaryKeyObject<M, K>>
   ): Promise<WithActiveRecord<DeepExpand<Selection<M, K, strategy>>, M, K>>;
 
   getOne<strategy extends FetchStrategy<M, K>>(
-    filter: RawFilter | Array<PrimaryKeyObject<M, K>>,
-    strategy: strategy
+    filter?: RawFilter | Array<PrimaryKeyObject<M, K>>,
+    strategy?: strategy
   ): Promise<WithActiveRecord<DeepExpand<Selection<M, K, strategy>>, M, K>>;
 
   getById<strategy extends FetchStrategy<M, K>>(

package/src/mssql/formatBigintIn.js

@@ -0,0 +1,5 @@
+function formatBigintIn(value) {
+	return `CONVERT(BIGINT, ${value})`;
+}
+
+module.exports = formatBigintIn;

package/src/mssql/newTransaction.js

@@ -4,6 +4,8 @@ var deleteFromSql = require('../tedious/deleteFromSql');
 var selectForUpdateSql = require('../tedious/selectForUpdateSql');
 const limitAndOffset = require('../tedious/limitAndOffset');
 const formatDateOut = require('../tedious/formatDateOut');
+const formatBigintOut = require('../tedious/formatBigintOut');
+const formatBigintIn = require('./formatBigintIn');
 const formatJSONOut = require('../tedious/formatJSONOut');
 const insertSql = require('../tedious/insertSql');
 const insert = require('../tedious/insert');
@@ -20,6 +22,8 @@ function newResolveTransaction(domain, pool, { readonly = false } = {}) {
 	rdb.decodeJSON = decodeJSON;
 	rdb.encodeJSON = JSON.stringify;
 	rdb.formatDateOut = formatDateOut;
+	rdb.formatBigintOut = formatBigintOut;
+	rdb.formatBigintIn = formatBigintIn;
 	rdb.formatJSONOut = formatJSONOut;
 	rdb.deleteFromSql = deleteFromSql;
 	rdb.selectForUpdateSql = selectForUpdateSql;

package/src/mssql/pool/newGenericPool.js

@@ -22,12 +22,19 @@ function newGenericPool(connectionString, poolOptions) {
 				return cb(err, null);
 			}
 			var client;
+			// const config = {
+			// 	connectionString: connectionString,
+			// 	options: {
+			// 		useNumericString: true
+			// 	}
+			// };
 			mssql.open(connectionString, onConnected);
 
 			function onConnected(err, _client) {
 				if(err)
 					return cb(err, null);
 				client = _client;
+				// client.setUseNumericString(true);
 				client.poolCount = 0;
 				client.msnodesqlv8 = mssql;
 				return cb(null, client);

package/src/mssql/wrapQuery.js

@@ -113,6 +113,7 @@ function wrapQuery(_context, connection) {
 					result.push(rows);
 				return;
 			}
+
 			result.push(rows);
 			if (!hasMore) {
 				if (result.length === 1)

package/src/mySql/formatBigintOut.js

@@ -0,0 +1,11 @@
+const quote = require('./quote');
+
+function formatBigintOut(column, alias) {
+	const quotedCol = quote(column._dbName);
+	if (alias)
+		return `CAST(${alias}.${quotedCol} AS CHAR)`;
+	else
+		return `CAST(${quotedCol} AS CHAR)`;
+}
+
+module.exports = formatBigintOut;

package/src/mySql/newTransaction.js

@@ -4,6 +4,7 @@ const deleteFromSql = require('./deleteFromSql');
 const selectForUpdateSql = require('./selectForUpdateSql');
 const lastInsertedSql = require('./lastInsertedSql');
 const limitAndOffset = require('./limitAndOffset');
+const formatBigintOut = require('./formatBigintOut');
 const insertSql = require('./insertSql');
 const insert = require('./insert');
 const quote = require('./quote');
@@ -21,6 +22,7 @@ function newResolveTransaction(domain, pool, { readonly = false } = {}) {
 	rdb.selectForUpdateSql = selectForUpdateSql;
 	rdb.lastInsertedIsSeparate = true;
 	rdb.lastInsertedSql = lastInsertedSql;
+	rdb.formatBigintOut = formatBigintOut;
 	rdb.insertSql = insertSql;
 	rdb.insert = insert;
 	rdb.multipleStatements = false;

package/src/nodeSqlite/newTransaction.js

@@ -6,6 +6,7 @@ const deleteFromSql = require('../sqlite/deleteFromSql');
 const selectForUpdateSql = require('../sqlite/selectForUpdateSql');
 const lastInsertedSql = require('../sqlite/lastInsertedSql');
 const limitAndOffset = require('../sqlite/limitAndOffset');
+const formatBigintOut = require('../sqlite/formatBigintOut');
 const insertSql = require('../sqlite/insertSql');
 const insert = require('../sqlite/insert');
 const quote = require('../sqlite/quote');
@@ -22,6 +23,7 @@ function newResolveTransaction(domain, pool, { readonly = false } = {})  {
 	rdb.decodeBinary = decodeBinary;
 	rdb.decodeJSON = decodeJSON;
 	rdb.encodeJSON = JSON.stringify;
+	rdb.formatBigintOut = formatBigintOut;
 	rdb.deleteFromSql = deleteFromSql;
 	rdb.selectForUpdateSql = selectForUpdateSql;
 	rdb.lastInsertedSql = lastInsertedSql;

package/src/oracle/formatBigintOut.js

@@ -0,0 +1,12 @@
+const quote = require('./quote');
+
+function formatBigintOut(column, alias) {
+	const quotedCol = quote(column._dbName);
+	if (alias)
+		return `TO_CHAR(${alias}.${quotedCol})`;
+	else
+		return `TO_CHAR(${quotedCol})`;
+}
+
+
+module.exports = formatBigintOut;

package/src/oracle/formatDateOut.js

@@ -1,7 +1,10 @@
 const quote = require('./quote');
 
 function formatDateColumn(column, alias) {
-	return `TO_CHAR(${alias}.${quote(column._dbName)}, 'YYYY-MM-DD"T"HH24:MI:SS.FF3')`;
+	if (alias)
+		return `TO_CHAR(${alias}.${quote(column._dbName)}, 'YYYY-MM-DD"T"HH24:MI:SS.FF3')`;
+	else
+		return `TO_CHAR(${quote(column._dbName)}, 'YYYY-MM-DD"T"HH24:MI:SS.FF3')`;
 }
 
 module.exports = formatDateColumn;

package/src/oracle/insertSql.js

@@ -1,9 +1,9 @@
 let mergeSql = require('./mergeSql');
 const quote = require('./quote');
 
-function getSqlTemplate(_context, _table, _row, options) {
+function getSqlTemplate(context, _table, _row, options) {
 	if (hasConcurrency(_table, options) && hasColumns())
-		return mergeSql.apply(null, [...arguments].slice(1));
+		return mergeSql.apply(null, [...arguments]);
 	else
 		return insertSql.apply(null, [...arguments].slice(1));
 

package/src/oracle/mergeSql.js

@@ -1,6 +1,6 @@
 const quote = require('./quote');
 
-function insertSql(table, row, options) {
+function insertSql(context, table, row, options) {
 	let columnNames = [];
 	let regularColumnNames = [];
 	let conflictColumnUpdateSql = '';

package/src/oracle/newTransaction.js

@@ -6,6 +6,7 @@ const lastInsertedSql = require('./lastInsertedSql');
 const limitAndOffset = require('./limitAndOffset');
 const insertSql = require('./insertSql');
 const insert = require('./insert');
+const formatBigintOut = require('./formatBigintOut');
 const formatDateOut = require('./formatDateOut');
 const formatDateIn = require('./formatDateIn');
 const quote = require('./quote');
@@ -24,6 +25,7 @@ function newResolveTransaction(domain, pool, { readonly = false } = {}) {
 	rdb.encodeJSON = JSON.stringify;
 	rdb.formatDateOut = formatDateOut;
 	rdb.formatDateIn = formatDateIn;
+	rdb.formatBigintOut = formatBigintOut;
 	rdb.deleteFromSql = deleteFromSql;
 	rdb.selectForUpdateSql = selectForUpdateSql;
 	rdb.lastInsertedSql = lastInsertedSql;

package/src/pg/formatDateOut.js

@@ -1,6 +1,9 @@
 
 function formatDateOut(column, alias) {
-	return `${alias}."${(column._dbName)}"::text`;
+	if (alias)
+		return `${alias}."${(column._dbName)}"::text`;
+	else
+		return `"${(column._dbName)}"::text`;
 }
 
 module.exports = formatDateOut;

package/src/sap/encodeBigint.js

@@ -0,0 +1,8 @@
+function encodeBoolean(value) {
+	return {
+		type: 'bigint',
+		value
+	};
+}
+
+module.exports = encodeBoolean;

package/src/sap/formatBigintIn.js

@@ -0,0 +1,5 @@
+function formatBigintIn(value) {
+	return `CONVERT(BIGINT, ${value})`;
+}
+
+module.exports = formatBigintIn;

package/src/sap/formatBigintOut.js

@@ -0,0 +1,11 @@
+const quote = require('./quote');
+
+function formatBigintOut(column, alias) {
+	const quotedCol = quote(column._dbName);
+	if (alias)
+		return `CONVERT(VARCHAR(20), ${alias}.${quotedCol})`;
+	else
+		return `CONVERT(NVARCHAR(20), ${quotedCol})`;
+}
+
+module.exports = formatBigintOut;

package/src/sap/formatDateOut.js

@@ -1,7 +1,10 @@
 const quote = require('./quote');
 
 function formatDateOut(column, alias) {
-	return `CONVERT(VARCHAR, ${alias}.${quote(column._dbName)}, 23)`;
+	if (alias)
+		return `CONVERT(VARCHAR, ${alias}.${quote(column._dbName)}, 23)`;
+	else
+		return `CONVERT(VARCHAR, ${quote(column._dbName)}, 23)`;
 }
 
 module.exports = formatDateOut;

package/src/sap/insertSql.js

@@ -4,7 +4,7 @@ const quote = require('./quote');
 function getSqlTemplate(_context, _table, _row, options) {
 
 	if (hasConcurrency(_table, options) && hasColumns())
-		return mergeSql.apply(null, [...arguments].slice(1));
+		return mergeSql.apply(null, [...arguments]);
 	else
 		return insertSql.apply(null, [...arguments].slice(1));
 

package/src/sap/mergeSql.js

@@ -1,6 +1,6 @@
 const quote = require('./quote');
 
-function insertSql(table, row, options) {
+function insertSql(context, table, row, options) {
 	let columnNames = [];
 	let conflictColumnUpdateSql = '';
 	let values = [];

package/src/sap/newTransaction.js

@@ -1,5 +1,7 @@
 const wrapQuery = require('../mssql/wrapQuery');
 const encodeBoolean = require('./encodeBoolean');
+const formatBigintIn = require('./formatBigintIn');
+const formatBigintOut = require('./formatBigintOut');
 const deleteFromSql = require('./deleteFromSql');
 const selectForUpdateSql = require('./selectForUpdateSql');
 const lastInsertedSql = require('./lastInsertedSql');
@@ -17,6 +19,8 @@ function newResolveTransaction(domain, pool, { readonly = false } = {}) {
 	}
 	rdb.engine = 'sap';
 	rdb.encodeBoolean = encodeBoolean;
+	rdb.formatBigintIn = formatBigintIn;
+	rdb.formatBigintOut = formatBigintOut;
 	rdb.decodeJSON = decodeJSON;
 	rdb.encodeJSON = JSON.stringify;
 	rdb.deleteFromSql = deleteFromSql;

package/src/sqlite/formatBigintOut.js

@@ -0,0 +1,11 @@
+const quote = require('./quote');
+
+function formatBigintOut(column, alias) {
+	const quotedCol = quote(column._dbName);
+	if (alias)
+		return `CAST(${alias}.${quotedCol} AS TEXT)`;
+	else
+		return `CAST(${quotedCol} AS TEXT)`;
+}
+
+module.exports = formatBigintOut;

package/src/sqlite/lastInsertedSql.js

@@ -1,7 +1,7 @@
 function lastInsertedSql(context, table, keyValues) {
 	return keyValues.map((value,i) => {
 		let column = table._primaryColumns[i];
-		if (value === undefined && column.tsType === 'NumberColumn')
+		if (value === undefined && (column.tsType === 'NumberColumn' || column.tsType === 'BigintColumn'))
 			return 'rowid IN (select last_insert_rowid())';
 		else
 			return column.eq(context, value);

package/src/sqlite3/newTransaction.js

@@ -4,6 +4,7 @@ const deleteFromSql = require('../sqlite/deleteFromSql');
 const selectForUpdateSql = require('../sqlite/selectForUpdateSql');
 const lastInsertedSql = require('../sqlite/lastInsertedSql');
 const limitAndOffset = require('../sqlite/limitAndOffset');
+const formatBigintOut = require('../sqlite/formatBigintOut');
 const insertSql = require('../sqlite/insertSql');
 const insert = require('../sqlite/insert');
 const quote = require('../sqlite/quote');
@@ -21,6 +22,7 @@ function newResolveTransaction(domain, pool, { readonly = false } = {})  {
 	rdb.deleteFromSql = deleteFromSql;
 	rdb.selectForUpdateSql = selectForUpdateSql;
 	rdb.lastInsertedSql = lastInsertedSql;
+	rdb.formatBigintOut = formatBigintOut;
 	rdb.insertSql = insertSql;
 	rdb.insert = insert;
 	rdb.lastInsertedIsSeparate = true;

package/src/table/column/bigint/newDecode.js

@@ -0,0 +1,18 @@
+var newDecodeCore = require('../newDecodeCore');
+
+function _new(column) {
+	var decodeCore = newDecodeCore(column);
+
+	return function(context, value) {
+		value = decodeCore(context, value);
+		if (value === null)
+			return value;
+		if (typeof(value) === 'string')
+			return value;
+		if (value.toString)
+			return value.toString();
+		return value;
+	};
+}
+
+module.exports = _new;

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

@@ -0,0 +1,44 @@
+var newPara = require('../../query/newParameterized');
+var purify = require('../string/purify');
+var getSessionContext = require('../../getSessionContext');
+var getSessionSingleton = require('../../getSessionSingleton');
+
+function _new(column) {
+	var encode = function(context, value) {
+		value = purify(value);
+		if (value == null) {
+			if (column.dbNull === null)
+				return newPara('null');
+			return newPara('\'' + column.dbNull + '\'');
+		}
+		var ctx = getSessionContext(context);
+		var encodeCore = ctx.encodeBigint || encodeBigint;
+		var formatIn = ctx.formatBigintIn;
+		return newPara(formatIn ? formatIn('?') : '?', [encodeCore(value)]);
+	};
+
+	encode.unsafe = function(context, value) {
+		value = purify(value);
+		if (value == null) {
+			if (column.dbNull === null)
+				'null';
+			return '\'' + column.dbNull + '\'';
+		}
+		var encodeCore = getSessionSingleton(context, 'encodeBigint') || encodeBigint;
+		return encodeCore(value);
+	};
+
+	encode.direct = function(context, value) {
+		var encodeCore = getSessionSingleton(context, 'encodeBigint') || encodeBigint;
+		return encodeCore(value);
+	};
+
+	return encode;
+
+
+}
+function encodeBigint(value) {
+	return value;
+}
+
+module.exports = _new;

package/src/table/column/bigint.js

@@ -0,0 +1,16 @@
+var newEncode = require('./bigint/newEncode');
+var newDecode = require('./bigint/newDecode');
+var formatOut = require('./formatOutGeneric');
+var purify = require('./string/purify');
+
+function _new(column) {
+	column.tsType = 'BigintColumn';
+	column.purify = purify;
+	column.lazyDefault = '0';
+	column.encode = newEncode(column);
+	column.decode = newDecode(column);
+	column.formatOut = (context, ...rest) => formatOut.apply(null, [context, column, 'formatBigintOut', ...rest]);
+
+}
+
+module.exports = _new;

package/src/table/column/date/formatOut.js

@@ -5,8 +5,10 @@ function formatOut(context, column, alias) {
 	var formatColumn = getSessionSingleton(context, 'formatDateOut');
 	if (formatColumn)
 		return formatColumn(column, alias);
-	else
+	else if (alias)
 		return `${alias}.${quote(context, column._dbName)}`;
+	else
+		return `${quote(context, column._dbName)}`;
 }
 
 module.exports = formatOut;

package/src/table/column/formatOutGeneric.js

@@ -0,0 +1,14 @@
+var getSessionSingleton = require('../getSessionSingleton');
+const quote = require('../quote');
+
+function formatOutGeneric(context, column, fnName, alias) {
+	var formatColumn = getSessionSingleton(context, fnName);
+	if (formatColumn)
+		return formatColumn(column, alias);
+	else if (alias)
+		return `${alias}.${quote(context, column._dbName)}`;
+	else
+		return `${quote(context, column._dbName)}`;
+}
+
+module.exports = formatOutGeneric;

package/src/table/column/in.js

@@ -10,13 +10,15 @@ function _in(context, column,values,alias) {
 	}
 	const firstPart = `${quote(context, alias)}.${quote(context, column._dbName)} in (`;
 
-	const encode = column.encode.direct;
-	const params = new Array(values.length);
+	const encode = column.encode;
+	const paramsSql = new Array(values.length);
+	let paramsValues = [];
 	for (let i = 0; i < values.length; i++) {
-		params[i] = encode(context, values[i]);
+		paramsSql[i] = encode(context, values[i]);
+		paramsValues = [...paramsValues, ...paramsSql[i].parameters];
 	}
-	const sql = `${firstPart +  new Array(values.length).fill('?').join(',')})`;
-	return newBoolean(newParameterized(sql, params));
+	const sql = `${firstPart +  paramsSql.map(x => x.sql()).join(',')})`;
+	return newBoolean(newParameterized(sql, paramsValues));
 }
 
 module.exports = _in;

package/src/table/column/json.js

@@ -1,6 +1,6 @@
 var newEncode = require('./json/newEncode');
 var newDecode = require('./json/newDecode');
-var formatOut = require('./json/formatOut');
+var formatOut = require('./formatOutGeneric');
 var purify = require('./json/purify');
 var onChange = require('@lroal/on-change');
 let clone = require('rfdc/default');
@@ -10,7 +10,7 @@ function _new(column) {
 	column.purify = purify;
 	column.encode = newEncode(column);
 	column.decode = newDecode(column);
-	column.formatOut = (context, ...rest) => formatOut.apply(null, [context, column, ...rest]);
+	column.formatOut = (context, ...rest) => formatOut.apply(null, [context, column, 'formatJSONOut', ...rest]);
 
 	column.onChange = onChange;
 	column.toDto = toDto;

package/src/table/column.js

@@ -39,6 +39,11 @@ function defineColumn(column, table) {
 		return c;
 	};
 
+	c.bigint = function() {
+		require('./column/bigint')(column);
+		return c;
+	};
+
 	c.boolean = function() {
 		require('./column/boolean')(column);
 		return c;