@sqb/builder 4.0.1-beta.8 → 4.0.3

package/dist/{sql-objects/op.initializers.js → op.initializers.js}

@@ -1,28 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NotExists = exports.Exists = exports.IsNot = exports.Is = exports.Nilike = exports.NotILike = exports.Ilike = exports.NLike = exports.NotLike = exports.Like = exports.Nin = exports.NotIn = exports.In = exports.NotBetween = exports.Between = exports.LowerAndEqualTo = exports.Lte = exports.LowerThan = exports.Lt = exports.GreaterAnEqualTo = exports.Gte = exports.GreaterThan = exports.Gt = exports.NotEqual = exports.Ne = exports.Equal = exports.Eq = exports.Or = exports.And = exports.op = void 0;
-const OpAnd_1 = require("./operators/OpAnd");
-const OpOr_1 = require("./operators/OpOr");
-const OpEq_1 = require("./operators/OpEq");
-const OpGt_1 = require("./operators/OpGt");
-const OpGte_1 = require("./operators/OpGte");
-const OpLt_1 = require("./operators/OpLt");
-const OpLte_1 = require("./operators/OpLte");
-const OpBetween_1 = require("./operators/OpBetween");
-const OpIn_1 = require("./operators/OpIn");
-const OpIs_1 = require("./operators/OpIs");
-const OpIsNot_1 = require("./operators/OpIsNot");
-const OpLike_1 = require("./operators/OpLike");
-const OpILike_1 = require("./operators/OpILike");
-const OpNe_1 = require("./operators/OpNe");
-const OpNotBetween_1 = require("./operators/OpNotBetween");
-const OpNotIn_1 = require("./operators/OpNotIn");
-const OpNotLike_1 = require("./operators/OpNotLike");
-const OpNotILike_1 = require("./operators/OpNotILike");
-const OpExists_1 = require("./operators/OpExists");
-const OpNotExists_1 = require("./operators/OpNotExists");
+const OpAnd_1 = require("./sql-objects/operators/OpAnd");
+const OpOr_1 = require("./sql-objects/operators/OpOr");
+const OpEq_1 = require("./sql-objects/operators/OpEq");
+const OpGt_1 = require("./sql-objects/operators/OpGt");
+const OpGte_1 = require("./sql-objects/operators/OpGte");
+const OpLt_1 = require("./sql-objects/operators/OpLt");
+const OpLte_1 = require("./sql-objects/operators/OpLte");
+const OpBetween_1 = require("./sql-objects/operators/OpBetween");
+const OpIn_1 = require("./sql-objects/operators/OpIn");
+const OpIs_1 = require("./sql-objects/operators/OpIs");
+const OpIsNot_1 = require("./sql-objects/operators/OpIsNot");
+const OpLike_1 = require("./sql-objects/operators/OpLike");
+const OpILike_1 = require("./sql-objects/operators/OpILike");
+const OpNe_1 = require("./sql-objects/operators/OpNe");
+const OpNotBetween_1 = require("./sql-objects/operators/OpNotBetween");
+const OpNotIn_1 = require("./sql-objects/operators/OpNotIn");
+const OpNotLike_1 = require("./sql-objects/operators/OpNotLike");
+const OpNotILike_1 = require("./sql-objects/operators/OpNotILike");
+const OpExists_1 = require("./sql-objects/operators/OpExists");
+const OpNotExists_1 = require("./sql-objects/operators/OpNotExists");
 // Avoids circular reference
-const LogicalOperator_1 = require("./operators/LogicalOperator");
+const LogicalOperator_1 = require("./sql-objects/operators/LogicalOperator");
 function And(...args) {
     return new OpAnd_1.OpAnd(...args);
 }

package/dist/query/DeleteQuery.d.ts

@@ -3,7 +3,7 @@ import { RawStatement } from '../sql-objects/RawStatement';
 import { SerializationType } from '../enums';
 import { TableName } from '../sql-objects/TableName';
 import { LogicalOperator } from '../sql-objects/operators/LogicalOperator';
-import { SerializeContext } from '../types';
+import { SerializeContext } from '../SerializeContext';
 export declare class DeleteQuery extends Query {
     _table: TableName | RawStatement;
     _where?: LogicalOperator;

package/dist/query/DeleteQuery.js

@@ -5,12 +5,11 @@ const Query_1 = require("./Query");
 const enums_1 = require("../enums");
 const TableName_1 = require("../sql-objects/TableName");
 const OpAnd_1 = require("../sql-objects/operators/OpAnd");
-const Serializable_1 = require("../Serializable");
 const typeguards_1 = require("../typeguards");
 class DeleteQuery extends Query_1.Query {
     constructor(tableName) {
         super();
-        if (!tableName || !(typeof tableName === 'string' || typeguards_1.isRawStatement(tableName)))
+        if (!tableName || !(typeof tableName === 'string' || (0, typeguards_1.isRawStatement)(tableName)))
             throw new TypeError('String or Raw instance required as first argument (tableName) for UpdateQuery');
         this._table = typeof tableName === 'string' ? new TableName_1.TableName(tableName) : tableName;
     }
@@ -45,7 +44,7 @@ class DeleteQuery extends Query_1.Query {
         if (!this._where)
             return '';
         const s = this._where._serialize(ctx);
-        return Serializable_1.serializeFallback(ctx, enums_1.SerializationType.CONDITIONS_BLOCK, s, () => {
+        return ctx.serialize(enums_1.SerializationType.CONDITIONS_BLOCK, s, () => {
             /* istanbul ignore next */
             return s ? 'where ' + s : '';
         });

package/dist/query/InsertQuery.d.ts

@@ -2,7 +2,7 @@ import { ReturningQuery } from './ReturningQuery';
 import { SerializationType } from '../enums';
 import { TableName } from '../sql-objects/TableName';
 import type { RawStatement } from '../sql-objects/RawStatement';
-import type { SerializeContext } from '../types';
+import { SerializeContext } from '../SerializeContext';
 export declare class InsertQuery extends ReturningQuery {
     _table: TableName | RawStatement;
     _input: any;

package/dist/query/InsertQuery.js

@@ -4,12 +4,12 @@ exports.InsertQuery = void 0;
 const ReturningQuery_1 = require("./ReturningQuery");
 const enums_1 = require("../enums");
 const TableName_1 = require("../sql-objects/TableName");
-const Serializable_1 = require("../Serializable");
 const typeguards_1 = require("../typeguards");
+const helpers_1 = require("../helpers");
 class InsertQuery extends ReturningQuery_1.ReturningQuery {
     constructor(tableName, input) {
         super();
-        if (!tableName || !(typeof tableName === 'string' || typeguards_1.isRawStatement(tableName)))
+        if (!tableName || !(typeof tableName === 'string' || (0, typeguards_1.isRawStatement)(tableName)))
             throw new TypeError('String or Raw instance required as first argument (tableName) for InsertQuery');
         if (!input || !((typeof input === 'object' && !Array.isArray(input)) ||
             input.isSelect))
@@ -41,7 +41,7 @@ class InsertQuery extends ReturningQuery_1.ReturningQuery {
      */
     __serializeColumns(ctx) {
         let arr;
-        if (typeguards_1.isSelectQuery(this._input)) {
+        if ((0, typeguards_1.isSelectQuery)(this._input)) {
             arr = [];
             const cols = this._input._columns;
             if (cols) {
@@ -55,22 +55,22 @@ class InsertQuery extends ReturningQuery_1.ReturningQuery {
         }
         else
             arr = Object.keys(this._input);
-        return Serializable_1.serializeFallback(ctx, enums_1.SerializationType.INSERT_QUERY_COLUMNS, arr, () => Serializable_1.printArray(arr));
+        return ctx.serialize(enums_1.SerializationType.INSERT_QUERY_COLUMNS, arr, () => (0, helpers_1.printArray)(arr));
     }
     /**
      *
      */
     __serializeValues(ctx) {
-        if (typeguards_1.isSerializable(this._input))
+        if ((0, typeguards_1.isSerializable)(this._input))
             return this._input._serialize(ctx);
         const arr = [];
         const allValues = this._input;
         for (const n of Object.keys(allValues)) {
-            const s = Serializable_1.serializeObject(ctx, allValues[n]);
+            const s = ctx.anyToSQL(allValues[n]);
             if (s)
-                arr.push(s);
+                arr.push((0, typeguards_1.isSelectQuery)(allValues[n]) ? '(' + s + ')' : s);
         }
-        return Serializable_1.serializeFallback(ctx, enums_1.SerializationType.INSERT_QUERY_VALUES, arr, () => Serializable_1.printArray(arr));
+        return ctx.serialize(enums_1.SerializationType.INSERT_QUERY_VALUES, arr, () => (0, helpers_1.printArray)(arr));
     }
 }
 exports.InsertQuery = InsertQuery;

package/dist/query/Query.js

@@ -8,6 +8,7 @@ const events_1 = require("events");
 const putil_merge_1 = __importDefault(require("putil-merge"));
 const putil_flattentext_1 = __importDefault(require("putil-flattentext"));
 const Serializable_1 = require("../Serializable");
+const SerializeContext_1 = require("../SerializeContext");
 class Query extends Serializable_1.Serializable {
     constructor() {
         super();
@@ -17,15 +18,16 @@ class Query extends Serializable_1.Serializable {
      * Generates Sql script
      */
     generate(options) {
-        const ctx = Object.assign({}, options);
+        const ctx = new SerializeContext_1.SerializeContext(options);
         if (this._params)
-            ctx.params = Object.assign(Object.assign({}, ctx.params), this._params);
+            ctx.params = { ...ctx.params, ...this._params };
         ctx.serializeHooks = this.listeners('serialize');
         /* generate output */
         const sql = this._serialize(ctx);
         return {
-            sql: putil_flattentext_1.default(sql, { noWrap: !ctx.prettyPrint }),
-            params: ctx.queryParams,
+            sql: (0, putil_flattentext_1.default)(sql, { noWrap: !ctx.prettyPrint }),
+            params: ctx.preparedParams,
+            paramOptions: ctx.paramOptions,
             returningFields: ctx.returningFields
         };
     }
@@ -37,4 +39,4 @@ class Query extends Serializable_1.Serializable {
     }
 }
 exports.Query = Query;
-putil_merge_1.default(Query.prototype, events_1.EventEmitter.prototype, { descriptor: true });
+(0, putil_merge_1.default)(Query.prototype, events_1.EventEmitter.prototype, { descriptor: true });

package/dist/query/ReturningQuery.d.ts

@@ -1,6 +1,6 @@
 import { Query } from './Query';
-import { SerializeContext } from '../types';
 import { ReturningColumn } from '../sql-objects/ReturningColumn';
+import { SerializeContext } from '../SerializeContext';
 export declare abstract class ReturningQuery extends Query {
     _returningColumns?: ReturningColumn[];
     /**

package/dist/query/ReturningQuery.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReturningQuery = void 0;
 const Query_1 = require("./Query");
-const Serializable_1 = require("../Serializable");
 const enums_1 = require("../enums");
 const ReturningColumn_1 = require("../sql-objects/ReturningColumn");
+const helpers_1 = require("../helpers");
 class ReturningQuery extends Query_1.Query {
     /**
      *
@@ -35,8 +35,8 @@ class ReturningQuery extends Query_1.Query {
             if (s)
                 arr.push(s);
         }
-        return Serializable_1.serializeFallback(ctx, enums_1.SerializationType.RETURNING_BLOCK, arr, () => {
-            const s = Serializable_1.printArray(arr);
+        return ctx.serialize(enums_1.SerializationType.RETURNING_BLOCK, arr, () => {
+            const s = (0, helpers_1.printArray)(arr);
             return s ? 'returning ' + s : '';
         });
     }

package/dist/query/SelectQuery.d.ts

@@ -6,7 +6,7 @@ import { LogicalOperator } from '../sql-objects/operators/LogicalOperator';
 import { GroupColumn } from '../sql-objects/GroupColumn';
 import { OrderColumn } from '../sql-objects/OrderColumn';
 import { Serializable } from '../Serializable';
-import { SerializeContext } from '../types';
+import { SerializeContext } from '../SerializeContext';
 export declare class SelectQuery extends Query {
     _tables?: Serializable[];
     _columns?: Serializable[];

package/dist/query/SelectQuery.js

@@ -4,13 +4,13 @@ exports.SelectQuery = void 0;
 const putil_varhelpers_1 = require("putil-varhelpers");
 const Query_1 = require("./Query");
 const TableName_1 = require("../sql-objects/TableName");
-const SelectColumn_1 = require("../sql-objects/SelectColumn");
+const FieldExpression_1 = require("../sql-objects/FieldExpression");
 const enums_1 = require("../enums");
 const GroupColumn_1 = require("../sql-objects/GroupColumn");
 const OrderColumn_1 = require("../sql-objects/OrderColumn");
-const Serializable_1 = require("../Serializable");
 const OpAnd_1 = require("../sql-objects/operators/OpAnd");
 const typeguards_1 = require("../typeguards");
+const helpers_1 = require("../helpers");
 class SelectQuery extends Query_1.Query {
     constructor(...column) {
         super();
@@ -32,7 +32,7 @@ class SelectQuery extends Query_1.Query {
             if (Array.isArray(arg))
                 self.addColumn(...arg);
             else
-                this._columns.push(typeguards_1.isSerializable(arg) ? arg : new SelectColumn_1.SelectColumn(arg));
+                this._columns.push((0, typeguards_1.isSerializable)(arg) ? arg : new FieldExpression_1.FieldExpression(arg));
         }
         return this;
     }
@@ -56,7 +56,7 @@ class SelectQuery extends Query_1.Query {
         for (const arg of join) {
             if (!arg)
                 continue;
-            if (!typeguards_1.isJoinStatement(arg))
+            if (!(0, typeguards_1.isJoinStatement)(arg))
                 throw new TypeError('Join statement required');
             this._joins.push(arg);
         }
@@ -105,14 +105,14 @@ class SelectQuery extends Query_1.Query {
      * Sets limit for query
      */
     limit(limit) {
-        this._limit = putil_varhelpers_1.coerceToInt(limit);
+        this._limit = (0, putil_varhelpers_1.coerceToInt)(limit);
         return this;
     }
     /**
      * Sets offset for query
      */
     offset(offset) {
-        this._offset = putil_varhelpers_1.coerceToInt(offset);
+        this._offset = (0, putil_varhelpers_1.coerceToInt)(offset);
         return this;
     }
     /**
@@ -144,7 +144,7 @@ class SelectQuery extends Query_1.Query {
             limit: this._limit,
             offset: this._offset
         };
-        return Serializable_1.serializeFallback(ctx, this._type, o, () => {
+        return ctx.serialize(this._type, o, () => {
             let out = 'select';
             if (this._distinct)
                 out += ' distinct';
@@ -194,7 +194,7 @@ class SelectQuery extends Query_1.Query {
                         arr.push(s);
                 }
             }
-        return Serializable_1.serializeFallback(ctx, enums_1.SerializationType.SELECT_QUERY_COLUMNS, arr, () => Serializable_1.printArray(arr) || '*');
+        return ctx.serialize(enums_1.SerializationType.SELECT_QUERY_COLUMNS, arr, () => (0, helpers_1.printArray)(arr) || '*');
     }
     /**
      *
@@ -215,7 +215,7 @@ class SelectQuery extends Query_1.Query {
                         arr.push(s);
                 }
             }
-        return Serializable_1.serializeFallback(ctx, enums_1.SerializationType.SELECT_QUERY_FROM, arr, () => {
+        return ctx.serialize(enums_1.SerializationType.SELECT_QUERY_FROM, arr, () => {
             const s = arr.join(',');
             return s ? ('from' + (s.substring(0, 1) !== '\n' ? ' ' : '') + s) : '';
         });
@@ -232,7 +232,7 @@ class SelectQuery extends Query_1.Query {
                 if (s)
                     arr.push(s);
             }
-        return Serializable_1.serializeFallback(ctx, enums_1.SerializationType.SELECT_QUERY_JOIN, arr, () => {
+        return ctx.serialize(enums_1.SerializationType.SELECT_QUERY_JOIN, arr, () => {
             return arr.join('\n');
         });
     }
@@ -243,7 +243,7 @@ class SelectQuery extends Query_1.Query {
         if (!this._where)
             return '';
         const s = this._where._serialize(ctx);
-        return Serializable_1.serializeFallback(ctx, enums_1.SerializationType.CONDITIONS_BLOCK, s, () => {
+        return ctx.serialize(enums_1.SerializationType.CONDITIONS_BLOCK, s, () => {
             /* istanbul ignore next */
             return s ? 'where ' + s : '';
         });
@@ -260,8 +260,8 @@ class SelectQuery extends Query_1.Query {
                 if (s)
                     arr.push(s);
             }
-        return Serializable_1.serializeFallback(ctx, enums_1.SerializationType.SELECT_QUERY_GROUPBY, arr, () => {
-            const s = Serializable_1.printArray(arr);
+        return ctx.serialize(enums_1.SerializationType.SELECT_QUERY_GROUPBY, arr, () => {
+            const s = (0, helpers_1.printArray)(arr);
             return s ? 'group by ' + s : '';
         });
     }
@@ -274,8 +274,8 @@ class SelectQuery extends Query_1.Query {
                 if (s)
                     arr.push(s);
             }
-        return Serializable_1.serializeFallback(ctx, enums_1.SerializationType.SELECT_QUERY_ORDERBY, arr, () => {
-            const s = Serializable_1.printArray(arr);
+        return ctx.serialize(enums_1.SerializationType.SELECT_QUERY_ORDERBY, arr, () => {
+            const s = (0, helpers_1.printArray)(arr);
             return s ? 'order by ' + s : '';
         });
     }

package/dist/query/UpdateQuery.d.ts

@@ -3,7 +3,7 @@ import { SerializationType } from '../enums';
 import { RawStatement } from '../sql-objects/RawStatement';
 import { TableName } from '../sql-objects/TableName';
 import { LogicalOperator } from '../sql-objects/operators/LogicalOperator';
-import { SerializeContext } from '../types';
+import { SerializeContext } from '../SerializeContext';
 export declare class UpdateQuery extends ReturningQuery {
     _table: TableName | RawStatement;
     _input: any;

package/dist/query/UpdateQuery.js

@@ -5,12 +5,12 @@ const ReturningQuery_1 = require("./ReturningQuery");
 const enums_1 = require("../enums");
 const TableName_1 = require("../sql-objects/TableName");
 const OpAnd_1 = require("../sql-objects/operators/OpAnd");
-const Serializable_1 = require("../Serializable");
 const typeguards_1 = require("../typeguards");
+const helpers_1 = require("../helpers");
 class UpdateQuery extends ReturningQuery_1.ReturningQuery {
     constructor(tableName, input) {
         super();
-        if (!tableName || !(typeof tableName === 'string' || typeguards_1.isRawStatement(tableName)))
+        if (!tableName || !(typeof tableName === 'string' || (0, typeguards_1.isRawStatement)(tableName)))
             throw new TypeError('String or Raw instance required as first argument (tableName) for UpdateQuery');
         if (!input || !((typeof input === 'object' && !Array.isArray(input)) ||
             input.isSelect))
@@ -53,14 +53,15 @@ class UpdateQuery extends ReturningQuery_1.ReturningQuery {
         const arr = [];
         const allValues = this._input;
         for (const n of Object.getOwnPropertyNames(allValues)) {
+            const value = ctx.anyToSQL(allValues[n]);
             arr.push({
                 field: n,
-                value: Serializable_1.serializeObject(ctx, allValues[n])
+                value: (0, typeguards_1.isSelectQuery)(allValues[n]) ? '(' + value + ')' : value
             });
         }
-        return Serializable_1.serializeFallback(ctx, enums_1.SerializationType.UPDATE_QUERY_VALUES, arr, () => {
+        return ctx.serialize(enums_1.SerializationType.UPDATE_QUERY_VALUES, arr, () => {
             const a = arr.map(o => o.field + ' = ' + o.value);
-            return Serializable_1.printArray(a, ',');
+            return (0, helpers_1.printArray)(a, ',');
         });
     }
     /**
@@ -70,7 +71,7 @@ class UpdateQuery extends ReturningQuery_1.ReturningQuery {
         if (!this._where)
             return '';
         const s = this._where._serialize(ctx);
-        return Serializable_1.serializeFallback(ctx, enums_1.SerializationType.CONDITIONS_BLOCK, s, () => {
+        return ctx.serialize(enums_1.SerializationType.CONDITIONS_BLOCK, s, () => {
             /* istanbul ignore next */
             return s ? 'where ' + s : '';
         });

package/dist/sql-objects/BaseField.d.ts

@@ -0,0 +1,7 @@
+import { Expression } from './Expression';
+export declare abstract class BaseField extends Expression {
+    _field: string;
+    _schema?: string;
+    _table?: string;
+    _descending?: boolean;
+}

package/dist/sql-objects/{Column.js → BaseField.js}

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Column = void 0;
-const Serializable_1 = require("../Serializable");
-class Column extends Serializable_1.Serializable {
+exports.BaseField = void 0;
+const Expression_1 = require("./Expression");
+class BaseField extends Expression_1.Expression {
     constructor() {
         super(...arguments);
         this._field = '';
     }
 }
-exports.Column = Column;
+exports.BaseField = BaseField;

package/dist/sql-objects/CaseStatement.d.ts

@@ -1,9 +1,9 @@
 import { Serializable } from '../Serializable';
 import { SerializationType } from '../enums';
 import { LogicalOperator } from './operators/LogicalOperator';
-import { SerializeContext } from '../types';
 import { Operator } from './Operator';
 import { RawStatement } from './RawStatement';
+import { SerializeContext } from '../SerializeContext';
 export declare class CaseStatement extends Serializable {
     _expressions: {
         condition: Serializable;

package/dist/sql-objects/CaseStatement.js

@@ -60,16 +60,16 @@ class CaseStatement extends Serializable_1.Serializable {
         const q = {
             expressions: [],
             elseValue: this._elseValue !== undefined ?
-                Serializable_1.serializeObject(ctx, this._elseValue) : undefined
+                ctx.anyToSQL(this._elseValue) : undefined
         };
         for (const x of this._expressions) {
             const o = {
                 condition: x.condition._serialize(ctx),
-                value: Serializable_1.serializeObject(ctx, x.value)
+                value: ctx.anyToSQL(x.value)
             };
             q.expressions.push(o);
         }
-        return Serializable_1.serializeFallback(ctx, this._type, q, () => this.__defaultSerialize(ctx, q));
+        return ctx.serialize(this._type, q, () => this.__defaultSerialize(ctx, q));
     }
     __defaultSerialize(ctx, o) {
         let out = 'case\n\t';

package/dist/sql-objects/CountStatement.d.ts

@@ -1,6 +1,6 @@
 import { Serializable } from '../Serializable';
 import { SerializationType } from '../enums';
-import { SerializeContext } from '../types';
+import { SerializeContext } from '../SerializeContext';
 export declare class CountStatement extends Serializable {
     _alias?: string;
     get _type(): SerializationType;

package/dist/sql-objects/CountStatement.js

@@ -22,7 +22,7 @@ class CountStatement extends Serializable_1.Serializable {
      * @override
      */
     _serialize(ctx) {
-        return Serializable_1.serializeFallback(ctx, this._type, undefined, () => this.__defaultSerialize(ctx, undefined));
+        return ctx.serialize(this._type, undefined, () => this.__defaultSerialize(ctx, undefined));
     }
     // noinspection JSUnusedLocalSymbols
     __defaultSerialize(

package/dist/sql-objects/Expression.d.ts

@@ -0,0 +1,7 @@
+import { Serializable } from '../Serializable';
+import { DataType } from '../enums';
+export declare abstract class Expression extends Serializable {
+    _dataType?: DataType;
+    _isArray?: boolean;
+    _isDataSet?: boolean;
+}

package/dist/sql-objects/Expression.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Expression = void 0;
+const Serializable_1 = require("../Serializable");
+class Expression extends Serializable_1.Serializable {
+}
+exports.Expression = Expression;

package/dist/sql-objects/FieldExpression.d.ts

@@ -0,0 +1,14 @@
+import { DataType, SerializationType } from '../enums';
+import { BaseField } from './BaseField';
+import { SerializeContext } from '../SerializeContext';
+export declare class FieldExpression extends BaseField {
+    _alias?: string;
+    constructor(expression: string, dataType?: DataType, isArray?: boolean);
+    constructor(args: {
+        expression: string;
+        dataType?: DataType;
+        isArray?: boolean;
+    });
+    get _type(): SerializationType;
+    _serialize(ctx: SerializeContext): string;
+}

package/dist/sql-objects/FieldExpression.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FieldExpression = void 0;
+const enums_1 = require("../enums");
+const BaseField_1 = require("./BaseField");
+const TABLE_COLUMN_PATTERN = /^((?:[a-zA-Z_][\w$_]*\.){0,2}) *([0-9a-zA-Z_][\w$_]*|\*) *(?:as)? *([a-zA-Z_][\w$_]*)?$/;
+class FieldExpression extends BaseField_1.BaseField {
+    constructor(arg0, arg1, arg2) {
+        super();
+        let expression;
+        if (typeof arg0 === 'object') {
+            expression = arg0.expression;
+            this._dataType = arg0.dataType;
+            this._isArray = arg0.isArray;
+        }
+        else {
+            expression = arg0;
+            this._dataType = arg1;
+            this._isArray = arg2;
+        }
+        const m = expression.match(TABLE_COLUMN_PATTERN);
+        if (!m)
+            throw new TypeError(`${expression} does not match table column format`);
+        this._field = m[2];
+        if (m[1]) {
+            const a = m[1].split(/\./g);
+            a.pop();
+            this._table = a.pop();
+            this._schema = a.pop();
+        }
+        this._alias = this._field !== '*' ? m[3] : '';
+    }
+    get _type() {
+        return enums_1.SerializationType.SELECT_COLUMN;
+    }
+    _serialize(ctx) {
+        const o = {
+            schema: this._schema,
+            table: this._table,
+            field: this._field,
+            alias: this._alias,
+            isReservedWord: !!(this._field && ctx.isReservedWord(this._field))
+        };
+        return ctx.serialize(this._type, o, () => {
+            const prefix = ctx.escapeReserved(this._schema ? this._schema + '.' : '') +
+                (this._table ? this._table + '.' : '');
+            return prefix +
+                (!prefix && o.isReservedWord ? '"' + this._field + '"' : this._field) +
+                (this._alias ? ' as ' + this._alias : '');
+        });
+    }
+}
+exports.FieldExpression = FieldExpression;

package/dist/sql-objects/GroupColumn.d.ts

@@ -1,7 +1,7 @@
 import { SerializationType } from '../enums';
-import { Column } from './Column';
-import { SerializeContext } from '../types';
-export declare class GroupColumn extends Column {
+import { BaseField } from './BaseField';
+import { SerializeContext } from '../SerializeContext';
+export declare class GroupColumn extends BaseField {
     constructor(value: string);
     get _type(): SerializationType;
     _serialize(ctx: SerializeContext): string;

package/dist/sql-objects/GroupColumn.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GroupColumn = void 0;
-const Serializable_1 = require("../Serializable");
 const enums_1 = require("../enums");
-const Column_1 = require("./Column");
+const BaseField_1 = require("./BaseField");
 const GROUP_COLUMN_PATTERN = /^((?:[a-zA-Z][\w$]*\.){0,2})([\w$]*)$/;
-class GroupColumn extends Column_1.Column {
+class GroupColumn extends BaseField_1.BaseField {
     constructor(value) {
         super();
         const m = value.match(GROUP_COLUMN_PATTERN);
@@ -27,9 +26,9 @@ class GroupColumn extends Column_1.Column {
             schema: this._schema,
             table: this._table,
             field: this._field,
-            isReservedWord: !!(this._field && Serializable_1.isReservedWord(ctx, this._field))
+            isReservedWord: !!(this._field && ctx.isReservedWord(this._field))
         };
-        return Serializable_1.serializeFallback(ctx, this._type, o, () => {
+        return ctx.serialize(this._type, o, () => {
             return (this._schema ? this._schema + '.' : '') +
                 (this._table ? this._table + '.' : '') +
                 (o.isReservedWord ? '"' + this._field + '"' : this._field);

package/dist/sql-objects/JoinStatement.d.ts

@@ -3,8 +3,8 @@ import { JoinType, SerializationType } from '../enums';
 import { TableName } from './TableName';
 import { SelectQuery } from '../query/SelectQuery';
 import { RawStatement } from './RawStatement';
-import { SerializeContext } from '../types';
 import { LogicalOperator } from './operators/LogicalOperator';
+import { SerializeContext } from '../SerializeContext';
 export declare class JoinStatement extends Serializable {
     _joinType: JoinType;
     _table: TableName | SelectQuery | RawStatement;
@@ -13,5 +13,5 @@ export declare class JoinStatement extends Serializable {
     get _type(): SerializationType;
     on(...conditions: Serializable[]): this;
     _serialize(ctx: SerializeContext): string;
-    protected __serializeConditions(ctx: any, join: JoinStatement): string;
+    protected __serializeConditions(ctx: any, join: JoinStatement): any;
 }