@sqb/builder 4.10.6 → 4.11.0

package/README.md

@@ -1,10 +1,9 @@
-
 <p style="text-align:center">
   <img src="https://user-images.githubusercontent.com/3836517/32965280-1a2b63ce-cbe7-11e7-8ee1-ba47313503c5.png" width="500px" alt="SQB Logo"/>
 </p>
 
 <br>
-  
+
 [![NPM Version][npm-image]][npm-url]
 [![NPM Downloads][downloads-image]][downloads-url]
 [![Build Status][travis-image]][travis-url]
@@ -13,7 +12,6 @@
 [![DevDependencies][devdependencies-image]][devdependencies-url]
 [![Package Quality][quality-image]][quality-url]
 
-
 ## About SQB
 
 SQB is an extensible, multi-dialect SQL query builder and Database connection wrapper for NodeJS.
@@ -25,8 +23,7 @@ SQB is an extensible, multi-dialect SQL query builder and Database connection wr
 - Fast applications with low memory requirements
 - Let applications work with large data tables efficiently
 - Support latest JavaScript language standards
-- Lightweight and extensible framework. 
-
+- Lightweight and extensible framework.
 
 You can report bugs and discuss features on the [GitHub issues](https://github.com/sqbjs/sqb/issues) page
 
@@ -34,7 +31,6 @@ Thanks to all of the great [contributions](https://github.com/sqbjs/sqb/graphs/c
 
 You may want to check detailed [DOCUMENTATION](https://sqbjs.github.io/sqb/)
 
-
 ## Installation
 
 ```bash
@@ -43,25 +39,40 @@ $ npm install @sqb/builder --save
 
 ## Node Compatibility
 
-  - node >= 16.x
-  
-   
+- node >= 16.x
+
 ### License
+
 SQB is available under [MIT](LICENSE) license.
 
 [npm-image]: https://img.shields.io/npm/v/@sqb/builder.svg
+
 [npm-url]: https://npmjs.org/package/@sqb/builder
+
 [travis-image]: https://img.shields.io/travis/sqbjs/@sqb/builder/master.svg
+
 [travis-url]: https://travis-ci.org/sqbjs/@sqb/builder
+
 [coveralls-image]: https://img.shields.io/coveralls/sqbjs/@sqb/builder/master.svg
+
 [coveralls-url]: https://coveralls.io/r/sqbjs/@sqb/builder
+
 [downloads-image]: https://img.shields.io/npm/dm/@sqb/builder.svg
+
 [downloads-url]: https://npmjs.org/package/@sqb/builder
+
 [gitter-image]: https://badges.gitter.im/sqbjs/@sqb/builder.svg
+
 [gitter-url]: https://gitter.im/sqbjs/@sqb/builder?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
+
 [dependencies-image]: https://david-dm.org/sqbjs/@sqb/builder/status.svg
+
 [dependencies-url]:https://david-dm.org/sqbjs/@sqb/builder
+
 [devdependencies-image]: https://david-dm.org/sqbjs/@sqb/builder/dev-status.svg
+
 [devdependencies-url]:https://david-dm.org/sqbjs/@sqb/builder?type=dev
+
 [quality-image]: http://npm.packagequality.com/shield/@sqb/builder.png
+
 [quality-url]: http://packagequality.com/#?package=@sqb/builder

package/cjs/enums.js

@@ -26,6 +26,7 @@ var SerializationType;
     SerializationType["UPDATE_QUERY"] = "update_query";
     SerializationType["UPDATE_QUERY_VALUES"] = "update_query.values";
     SerializationType["DELETE_QUERY"] = "delete_query";
+    SerializationType["UNION_QUERY"] = "union_query";
     SerializationType["FIELD_NAME"] = "field_name";
     SerializationType["GROUP_COLUMN"] = "group_column";
     SerializationType["ORDER_COLUMN"] = "order_column";
@@ -40,8 +41,6 @@ var SerializationType;
     SerializationType["UPPER_STATEMENT"] = "upper_expression";
     SerializationType["MAX_STATEMENT"] = "max_expression";
     SerializationType["MIN_STATEMENT"] = "min_expression";
-    SerializationType["SEQUENCE_GETTER_STATEMENT"] = "sequence_getter_statement";
-    SerializationType["STRINGAGG_STATEMENT"] = "StringAGG_expression";
     SerializationType["COUNT_STATEMENT"] = "count_expression";
     SerializationType["CONDITIONS_BLOCK"] = "conditions_block";
     SerializationType["COMPARISON_EXPRESSION"] = "comparison_expression";
@@ -54,6 +53,8 @@ var SerializationType;
     SerializationType["NUMBER_VALUE"] = "number_value";
     SerializationType["EXTERNAL_PARAMETER"] = "external_parameter";
     SerializationType["ARRAY"] = "array";
+    SerializationType["SEQUENCE_GETTER_STATEMENT"] = "sequence_getter_statement";
+    SerializationType["STRINGAGG_STATEMENT"] = "String_agg_statement";
 })(SerializationType || (exports.SerializationType = SerializationType = {}));
 var OperatorType;
 (function (OperatorType) {

package/cjs/query/delete-query.js

@@ -32,6 +32,9 @@ class DeleteQuery extends query_js_1.Query {
             table: this._table._serialize(ctx),
             where: this._serializeWhere(ctx)
         };
+        return ctx.serialize(this._type, o, () => this.__defaultSerialize(ctx, o));
+    }
+    __defaultSerialize(ctx, o) {
         return 'delete from ' + o.table +
             (o.where ? '\n' + o.where : '');
     }

package/cjs/query/union-query.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UnionQuery = void 0;
+const enums_js_1 = require("../enums.js");
+const query_js_1 = require("./query.js");
+class UnionQuery extends query_js_1.Query {
+    constructor(queries, unionType) {
+        super();
+        this._queries = queries;
+        this._unionType = unionType;
+    }
+    get _type() {
+        return enums_js_1.SerializationType.UNION_QUERY;
+    }
+    /**
+     * Performs serialization
+     */
+    _serialize(ctx) {
+        const queries = this._queries.map(q => q._serialize(ctx));
+        const q = {
+            queries,
+            unionType: this._unionType
+        };
+        return ctx.serialize(this._type, q, () => this.__defaultSerialize(ctx, q));
+    }
+    __defaultSerialize(ctx, o) {
+        return o.queries.join(o.unionType === 'all' ? '\nUNION ALL\n' : '\nUNION\n');
+    }
+}
+exports.UnionQuery = UnionQuery;

package/cjs/sqlobject.initializers.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Field = exports.Param = exports.SequenceCurr = exports.SequenceNext = exports.Count = exports.StringAGG = exports.Max = exports.Min = exports.Upper = exports.Lower = exports.Coalesce = exports.Case = exports.CrossJoin = exports.FullOuterJoin = exports.OuterJoin = exports.RightOuterJoin = exports.RightJoin = exports.LeftOuterJoin = exports.LeftJoin = exports.InnerJoin = exports.Join = exports.Delete = exports.Update = exports.Insert = exports.Select = exports.Raw = void 0;
+exports.Field = exports.Param = exports.SequenceCurr = exports.SequenceNext = exports.Count = exports.StringAGG = exports.Max = exports.Min = exports.Upper = exports.Lower = exports.Coalesce = exports.Case = exports.CrossJoin = exports.FullOuterJoin = exports.OuterJoin = exports.RightOuterJoin = exports.RightJoin = exports.LeftOuterJoin = exports.LeftJoin = exports.InnerJoin = exports.Join = exports.UnionAll = exports.Union = exports.Delete = exports.Update = exports.Insert = exports.Select = exports.Raw = void 0;
 const enums_js_1 = require("./enums.js");
 const delete_query_js_1 = require("./query/delete-query.js");
 const insert_query_js_1 = require("./query/insert-query.js");
 const select_query_js_1 = require("./query/select-query.js");
+const union_query_js_1 = require("./query/union-query.js");
 const update_query_js_1 = require("./query/update-query.js");
 const case_statement_js_1 = require("./sql-objects/case-statement.js");
 const coalesce_statement_js_1 = require("./sql-objects/coalesce-statement.js");
@@ -39,6 +40,14 @@ function Delete(tableName) {
     return new delete_query_js_1.DeleteQuery(tableName);
 }
 exports.Delete = Delete;
+function Union(...queries) {
+    return new union_query_js_1.UnionQuery(queries);
+}
+exports.Union = Union;
+function UnionAll(...queries) {
+    return new union_query_js_1.UnionQuery(queries, 'all');
+}
+exports.UnionAll = UnionAll;
 function Join(table) {
     return new join_statement_js_1.JoinStatement(enums_js_1.JoinType.INNER, table);
 }

package/esm/enums.js

@@ -23,6 +23,7 @@ export var SerializationType;
     SerializationType["UPDATE_QUERY"] = "update_query";
     SerializationType["UPDATE_QUERY_VALUES"] = "update_query.values";
     SerializationType["DELETE_QUERY"] = "delete_query";
+    SerializationType["UNION_QUERY"] = "union_query";
     SerializationType["FIELD_NAME"] = "field_name";
     SerializationType["GROUP_COLUMN"] = "group_column";
     SerializationType["ORDER_COLUMN"] = "order_column";
@@ -37,8 +38,6 @@ export var SerializationType;
     SerializationType["UPPER_STATEMENT"] = "upper_expression";
     SerializationType["MAX_STATEMENT"] = "max_expression";
     SerializationType["MIN_STATEMENT"] = "min_expression";
-    SerializationType["SEQUENCE_GETTER_STATEMENT"] = "sequence_getter_statement";
-    SerializationType["STRINGAGG_STATEMENT"] = "StringAGG_expression";
     SerializationType["COUNT_STATEMENT"] = "count_expression";
     SerializationType["CONDITIONS_BLOCK"] = "conditions_block";
     SerializationType["COMPARISON_EXPRESSION"] = "comparison_expression";
@@ -51,6 +50,8 @@ export var SerializationType;
     SerializationType["NUMBER_VALUE"] = "number_value";
     SerializationType["EXTERNAL_PARAMETER"] = "external_parameter";
     SerializationType["ARRAY"] = "array";
+    SerializationType["SEQUENCE_GETTER_STATEMENT"] = "sequence_getter_statement";
+    SerializationType["STRINGAGG_STATEMENT"] = "String_agg_statement";
 })(SerializationType || (SerializationType = {}));
 export var OperatorType;
 (function (OperatorType) {

package/esm/query/delete-query.js

@@ -29,6 +29,9 @@ export class DeleteQuery extends Query {
             table: this._table._serialize(ctx),
             where: this._serializeWhere(ctx)
         };
+        return ctx.serialize(this._type, o, () => this.__defaultSerialize(ctx, o));
+    }
+    __defaultSerialize(ctx, o) {
         return 'delete from ' + o.table +
             (o.where ? '\n' + o.where : '');
     }

package/esm/query/union-query.js

@@ -0,0 +1,26 @@
+import { SerializationType } from '../enums.js';
+import { Query } from './query.js';
+export class UnionQuery extends Query {
+    constructor(queries, unionType) {
+        super();
+        this._queries = queries;
+        this._unionType = unionType;
+    }
+    get _type() {
+        return SerializationType.UNION_QUERY;
+    }
+    /**
+     * Performs serialization
+     */
+    _serialize(ctx) {
+        const queries = this._queries.map(q => q._serialize(ctx));
+        const q = {
+            queries,
+            unionType: this._unionType
+        };
+        return ctx.serialize(this._type, q, () => this.__defaultSerialize(ctx, q));
+    }
+    __defaultSerialize(ctx, o) {
+        return o.queries.join(o.unionType === 'all' ? '\nUNION ALL\n' : '\nUNION\n');
+    }
+}

package/esm/sqlobject.initializers.js

@@ -2,6 +2,7 @@ import { JoinType } from './enums.js';
 import { DeleteQuery } from './query/delete-query.js';
 import { InsertQuery } from './query/insert-query.js';
 import { SelectQuery } from './query/select-query.js';
+import { UnionQuery } from './query/union-query.js';
 import { UpdateQuery } from './query/update-query.js';
 import { CaseStatement } from './sql-objects/case-statement.js';
 import { CoalesceStatement } from './sql-objects/coalesce-statement.js';
@@ -31,6 +32,12 @@ export function Update(tableName, input) {
 export function Delete(tableName) {
     return new DeleteQuery(tableName);
 }
+export function Union(...queries) {
+    return new UnionQuery(queries);
+}
+export function UnionAll(...queries) {
+    return new UnionQuery(queries, 'all');
+}
 export function Join(table) {
     return new JoinStatement(JoinType.INNER, table);
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sqb/builder",
   "description": "Extensible multi-dialect SQL query builder written with TypeScript",
-  "version": "4.10.6",
+  "version": "4.11.0",
   "author": "Panates",
   "private": false,
   "contributors": [
@@ -25,7 +25,7 @@
     "build:cjs": "tsc -b tsconfig-build-cjs.json",
     "build:esm": "tsc -b tsconfig-build-esm.json",
     "postbuild": "cp README.md package.json ../../LICENSE ../../build/builder && cp ../../package.cjs.json ../../build/builder/cjs/package.json",
-    "lint": "eslint .",
+    "lint": "eslint . --max-warnings=0",
     "test": "jest --runInBand",
     "cover": "jest --collect-coverage",
     "clean": "npm run clean:src | npm run clean:dist | npm run clean:cover",

package/types/enums.d.ts

@@ -21,6 +21,7 @@ export declare enum SerializationType {
     UPDATE_QUERY = "update_query",
     UPDATE_QUERY_VALUES = "update_query.values",
     DELETE_QUERY = "delete_query",
+    UNION_QUERY = "union_query",
     FIELD_NAME = "field_name",
     GROUP_COLUMN = "group_column",
     ORDER_COLUMN = "order_column",
@@ -35,8 +36,6 @@ export declare enum SerializationType {
     UPPER_STATEMENT = "upper_expression",
     MAX_STATEMENT = "max_expression",
     MIN_STATEMENT = "min_expression",
-    SEQUENCE_GETTER_STATEMENT = "sequence_getter_statement",
-    STRINGAGG_STATEMENT = "StringAGG_expression",
     COUNT_STATEMENT = "count_expression",
     CONDITIONS_BLOCK = "conditions_block",
     COMPARISON_EXPRESSION = "comparison_expression",
@@ -48,7 +47,9 @@ export declare enum SerializationType {
     BOOLEAN_VALUE = "boolean_value",
     NUMBER_VALUE = "number_value",
     EXTERNAL_PARAMETER = "external_parameter",
-    ARRAY = "array"
+    ARRAY = "array",
+    SEQUENCE_GETTER_STATEMENT = "sequence_getter_statement",
+    STRINGAGG_STATEMENT = "String_agg_statement"
 }
 export declare enum OperatorType {
     and = "and",

package/types/query/delete-query.d.ts

@@ -17,6 +17,7 @@ export declare class DeleteQuery extends Query {
      * Performs serialization
      */
     _serialize(ctx: SerializeContext): string;
+    protected __defaultSerialize(ctx: SerializeContext, o: any): string;
     /**
      *
      */

package/types/query/union-query.d.ts

@@ -0,0 +1,15 @@
+import { SerializationType } from '../enums.js';
+import { SerializeContext } from '../serialize-context.js';
+import { Query } from './query.js';
+export type UnionQueryType = 'all';
+export declare class UnionQuery extends Query {
+    _queries: Query[];
+    _unionType?: UnionQueryType;
+    constructor(queries: Query[], unionType?: UnionQueryType);
+    get _type(): SerializationType;
+    /**
+     * Performs serialization
+     */
+    _serialize(ctx: SerializeContext): string;
+    protected __defaultSerialize(ctx: SerializeContext, o: any): string;
+}

package/types/sqlobject.initializers.d.ts

@@ -1,7 +1,9 @@
 import { DataType } from './enums.js';
 import { DeleteQuery } from './query/delete-query.js';
 import { InsertQuery } from './query/insert-query.js';
+import { Query } from './query/query.js';
 import { SelectQuery } from './query/select-query.js';
+import { UnionQuery } from './query/union-query.js';
 import { UpdateQuery } from './query/update-query.js';
 import { Serializable } from './serializable.js';
 import { CaseStatement } from './sql-objects/case-statement.js';
@@ -22,6 +24,8 @@ export declare function Select(...column: (string | string[] | Serializable)[]):
 export declare function Insert(tableName: string | RawStatement, input: any): InsertQuery;
 export declare function Update(tableName: string | RawStatement, input: any): UpdateQuery;
 export declare function Delete(tableName: string | RawStatement): DeleteQuery;
+export declare function Union(...queries: Query[]): UnionQuery;
+export declare function UnionAll(...queries: Query[]): UnionQuery;
 export declare function Join(table: string | SelectQuery | RawStatement): JoinStatement;
 export declare function InnerJoin(table: string | SelectQuery | RawStatement): JoinStatement;
 export declare function LeftJoin(table: string | SelectQuery | RawStatement): JoinStatement;