@klapeks/micro-db-utils 0.0.12 → 0.0.14

package/dist/{connections → sql/connections}/mysql.connection.js

@@ -1,4 +1,19 @@
 "use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -39,13 +54,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RawMySQLConnection = void 0;
+exports.MySQLConnection = void 0;
 var mysql2_1 = __importDefault(require("mysql2"));
 var utils_1 = require("@klapeks/utils");
+var abstract_connection_1 = require("./abstract.connection");
 var logger = new utils_1.Logger('MySQL');
-var RawMySQLConnection = /** @class */ (function () {
-    function RawMySQLConnection(options) {
-        this.poolOptions = {
+var MySQLConnection = /** @class */ (function (_super) {
+    __extends(MySQLConnection, _super);
+    function MySQLConnection(options) {
+        var _this = _super.call(this, options, 'toMySQL') || this;
+        _this.poolOptions = {
             user: options.username,
             password: options.password,
             host: options.host,
@@ -53,15 +71,28 @@ var RawMySQLConnection = /** @class */ (function () {
             database: options.database,
             charset: options.charset,
         };
+        return _this;
     }
-    Object.defineProperty(RawMySQLConnection.prototype, "pool", {
+    MySQLConnection.prototype.initConnection = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.takePool()];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    Object.defineProperty(MySQLConnection.prototype, "pool", {
         get: function () {
             return this._pool;
         },
         enumerable: false,
         configurable: true
     });
-    RawMySQLConnection.prototype.takePool = function () {
+    MySQLConnection.prototype.takePool = function () {
         return __awaiter(this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
@@ -82,7 +113,7 @@ var RawMySQLConnection = /** @class */ (function () {
             });
         });
     };
-    RawMySQLConnection.prototype.destroyConnection = function () {
+    MySQLConnection.prototype.destroyConnection = function () {
         return __awaiter(this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
@@ -100,7 +131,7 @@ var RawMySQLConnection = /** @class */ (function () {
             });
         });
     };
-    RawMySQLConnection.prototype.getConnection = function () {
+    MySQLConnection.prototype.getPoolConnection = function () {
         return __awaiter(this, void 0, void 0, function () {
             var _a;
             var _this = this;
@@ -126,16 +157,17 @@ var RawMySQLConnection = /** @class */ (function () {
             });
         });
     };
-    RawMySQLConnection.prototype.runSQL = function (query, params) {
+    MySQLConnection.prototype.sendSQL = function (query, params) {
         return __awaiter(this, void 0, void 0, function () {
             var connection;
+            var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.getConnection()];
+                    case 0: return [4 /*yield*/, this.getPoolConnection()];
                     case 1:
                         connection = _a.sent();
                         return [2 /*return*/, new Promise(function (resolve, reject) {
-                                // logger.debug("SQL query: ", query, '| params:', params||[])
+                                _this.debugQuery(query, params);
                                 connection.query(query, params || [], function (err, result) {
                                     connection.release();
                                     if (err)
@@ -147,19 +179,6 @@ var RawMySQLConnection = /** @class */ (function () {
             });
         });
     };
-    RawMySQLConnection.prototype.runSQL_One = function (query, params) {
-        return __awaiter(this, void 0, void 0, function () {
-            var res;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.runSQL(query, params)];
-                    case 1:
-                        res = _a.sent();
-                        return [2 /*return*/, res.length ? (res[0] || res) : null];
-                }
-            });
-        });
-    };
-    return RawMySQLConnection;
-}());
-exports.RawMySQLConnection = RawMySQLConnection;
+    return MySQLConnection;
+}(abstract_connection_1.AbstractSQLConnection));
+exports.MySQLConnection = MySQLConnection;

package/dist/sql/index.d.ts

@@ -0,0 +1,4 @@
+export * from './commands';
+export * from './connections';
+export * from './raw.where.utils';
+export * from './column.type.parser';

package/dist/sql/index.js

@@ -0,0 +1,20 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./commands"), exports);
+__exportStar(require("./connections"), exports);
+__exportStar(require("./raw.where.utils"), exports);
+__exportStar(require("./column.type.parser"), exports);

package/dist/sql/raw.where.utils.d.ts

@@ -0,0 +1,2 @@
+import { DatabaseOptions } from "@klapeks/utils";
+export declare function converWhereQuery(dbType: DatabaseOptions['type'], key: string, value: any, keyAlias?: string): string;

package/dist/sql/raw.where.utils.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.converWhereQuery = void 0;
+var typeorm_1 = require("typeorm");
+function sqlQuoteKey(dbType, str) {
+    if (dbType === 'mysql')
+        return "`".concat(str, "`");
+    if (dbType === 'mssql')
+        return "[".concat(str, "]");
+    return str;
+}
+function converWhereQuery(dbType, key, value, keyAlias) {
+    var _a;
+    if (value instanceof typeorm_1.FindOperator) {
+        if (value.type === 'isNull') {
+            return sqlQuoteKey(dbType, key) + ' IS NULL';
+        }
+        if (value.type === 'not') {
+            if (((_a = value.child) === null || _a === void 0 ? void 0 : _a.type) === 'isNull') {
+                return sqlQuoteKey(dbType, key) + ' IS NOT NULL';
+            }
+        }
+    }
+    if (value === null) {
+        return sqlQuoteKey(dbType, key) + ' IS NULL';
+    }
+    if (keyAlias === '?' || dbType === 'mysql') {
+        return sqlQuoteKey(dbType, key) + " = ?";
+    }
+    if (dbType === 'mssql') {
+        return "[".concat(key, "] = @").concat(keyAlias || key);
+    }
+    return sqlQuoteKey(dbType, key) + " = :".concat(keyAlias || key);
+}
+exports.converWhereQuery = converWhereQuery;

package/dist/utils/columns.types.d.ts

@@ -1,5 +1,6 @@
 import mongoose from "mongoose";
-import { EntitySchemaColumnOptions, EntitySchemaOptions } from "typeorm";
+import { EntitySchemaOptions } from "typeorm";
+import { MicroColumnTypeObject } from "../sql/column.type.parser";
 export type RequiredColumns<T> = Required<EntitySchemaOptions<T>['columns']>;
 export type RequiredMongoColumns<T> = Required<mongoose.Schema<T>>;
 export declare function createRelation(target: string, type: "one-to-many" | "one-to-one", inverseSide: string, cascade?: boolean): {
@@ -9,100 +10,14 @@ export declare function createRelation(target: string, type: "one-to-many" | "on
     inverseSide: string;
 };
 export declare const MULTISQL_COLUMNS_TYPES: {
-    dbtype: "mysql" | "sqlite" | "postgres" | "mssql";
-    enum: "enum" | "simple-enum";
-    datetime: "timestamp" | "datetime" | "datetime2";
-    float32: "double" | "float";
-    float64: "double" | "float";
-    json: "json" | "simple-json";
-};
-export declare const FloatingColumn: EntitySchemaColumnOptions;
-export declare const NullableFloatingColumn: {
-    default: null;
-    nullable: boolean;
-    primary?: boolean | undefined;
-    objectId?: boolean | undefined;
-    createDate?: boolean | undefined;
-    updateDate?: boolean | undefined;
-    deleteDate?: boolean | undefined;
-    version?: boolean | undefined;
-    treeChildrenCount?: boolean | undefined;
-    treeLevel?: boolean | undefined;
-    virtualProperty?: boolean | undefined;
-    type: import("typeorm").ColumnType;
-    name?: string | undefined;
-    length?: string | number | undefined;
-    width?: number | undefined;
-    readonly?: boolean | undefined;
-    update?: boolean | undefined;
-    select?: boolean | undefined;
-    insert?: boolean | undefined;
-    generated?: true | "uuid" | "increment" | "rowid" | undefined;
-    unique?: boolean | undefined;
-    columnDefinition?: string | undefined;
-    comment?: string | undefined;
-    onUpdate?: string | undefined;
-    precision?: number | undefined;
-    scale?: number | undefined;
-    zerofill?: boolean | undefined;
-    unsigned?: boolean | undefined;
-    charset?: string | undefined;
-    collation?: string | undefined;
-    enum?: Object | any[] | undefined;
-    enumName?: string | undefined;
-    asExpression?: string | undefined;
-    generatedType?: "VIRTUAL" | "STORED" | undefined;
-    hstoreType?: "string" | "object" | undefined;
-    array?: boolean | undefined;
-    transformer?: import("typeorm").ValueTransformer | import("typeorm").ValueTransformer[] | undefined;
-    primaryKeyConstraintName?: string | undefined;
-    foreignKey?: import("typeorm/entity-schema/EntitySchemaColumnForeignKeyOptions").EntitySchemaColumnForeignKeyOptions | undefined;
-    query?: ((alias: string) => string) | undefined;
-    spatialFeatureType?: "Point" | "LineString" | "Polygon" | "MultiPoint" | "MultiLineString" | "MultiPolygon" | "GeometryCollection" | undefined;
-    srid?: number | undefined;
-};
-export declare const Float64Column: EntitySchemaColumnOptions;
-export declare const NullableFloat64Column: {
-    default: null;
-    nullable: boolean;
-    primary?: boolean | undefined;
-    objectId?: boolean | undefined;
-    createDate?: boolean | undefined;
-    updateDate?: boolean | undefined;
-    deleteDate?: boolean | undefined;
-    version?: boolean | undefined;
-    treeChildrenCount?: boolean | undefined;
-    treeLevel?: boolean | undefined;
-    virtualProperty?: boolean | undefined;
-    type: import("typeorm").ColumnType;
-    name?: string | undefined;
-    length?: string | number | undefined;
-    width?: number | undefined;
-    readonly?: boolean | undefined;
-    update?: boolean | undefined;
-    select?: boolean | undefined;
-    insert?: boolean | undefined;
-    generated?: true | "uuid" | "increment" | "rowid" | undefined;
-    unique?: boolean | undefined;
-    columnDefinition?: string | undefined;
-    comment?: string | undefined;
-    onUpdate?: string | undefined;
-    precision?: number | undefined;
-    scale?: number | undefined;
-    zerofill?: boolean | undefined;
-    unsigned?: boolean | undefined;
-    charset?: string | undefined;
-    collation?: string | undefined;
-    enum?: Object | any[] | undefined;
-    enumName?: string | undefined;
-    asExpression?: string | undefined;
-    generatedType?: "VIRTUAL" | "STORED" | undefined;
-    hstoreType?: "string" | "object" | undefined;
-    array?: boolean | undefined;
-    transformer?: import("typeorm").ValueTransformer | import("typeorm").ValueTransformer[] | undefined;
-    primaryKeyConstraintName?: string | undefined;
-    foreignKey?: import("typeorm/entity-schema/EntitySchemaColumnForeignKeyOptions").EntitySchemaColumnForeignKeyOptions | undefined;
-    query?: ((alias: string) => string) | undefined;
-    spatialFeatureType?: "Point" | "LineString" | "Polygon" | "MultiPoint" | "MultiLineString" | "MultiPolygon" | "GeometryCollection" | undefined;
-    srid?: number | undefined;
+    dbtype: "sqlite" | "mysql" | "postgres" | "mssql";
+    enum: "simple-enum" | "enum";
+    datetime: "datetime" | "datetime2" | "timestamp";
+    float32: "float" | "double";
+    float64: "float" | "double";
+    json: "simple-json" | "json";
 };
+export declare const FloatingColumn: MicroColumnTypeObject;
+export declare const NullableFloatingColumn: MicroColumnTypeObject;
+export declare const Float64Column: MicroColumnTypeObject;
+export declare const NullableFloat64Column: MicroColumnTypeObject;

package/dist/utils/where.utils.d.ts

@@ -1,3 +1,4 @@
 import { ObjectLiteral, SelectQueryBuilder } from "typeorm";
 export declare function addTimedWhere<T extends ObjectLiteral>(builder: SelectQueryBuilder<T>, dateAlias: string, from: Date, to?: Date): SelectQueryBuilder<T>;
+/** @deprecated use MicroSQL.timeExpressions(dbType).dateFromToWhere(...) */
 export declare function rawTimedWhere(dateAlias: string, from: Date, to?: Date): string;

package/dist/utils/where.utils.js

@@ -2,21 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rawTimedWhere = exports.addTimedWhere = void 0;
 var iso_date_time_1 = require("./iso.date.time");
+var micro_sql_1 = require("../micro.sql");
 function addTimedWhere(builder, dateAlias, from, to) {
-    builder.where("date(" + dateAlias + ") >= date(:from)", {
+    var expr = micro_sql_1.MicroSQL.timeExpressions(builder.connection.options.type);
+    builder.andWhere(expr.date(dateAlias) + ' >= ' + expr.date(':from'), {
         from: (0, iso_date_time_1.toISODate)(from, "yyyy-mm-dd")
     });
     if (to)
-        builder.andWhere("date(" + dateAlias + ") <= date(:to)", {
+        builder.andWhere(expr.date(dateAlias) + ' <= ' + expr.date(':to'), {
             to: (0, iso_date_time_1.toISODate)(to, "yyyy-mm-dd")
         });
     return builder;
 }
 exports.addTimedWhere = addTimedWhere;
+/** @deprecated use MicroSQL.timeExpressions(dbType).dateFromToWhere(...) */
 function rawTimedWhere(dateAlias, from, to) {
-    var sql = "date(" + dateAlias + ") >= date('" + (0, iso_date_time_1.toISODate)(from, "yyyy-mm-dd") + "') ";
-    if (to)
-        sql += "AND date(" + dateAlias + ") <= date('" + (0, iso_date_time_1.toISODate)(to, "yyyy-mm-dd") + "')";
-    return sql;
+    return micro_sql_1.MicroSQL.timeExpressions('mysql').dateFromToWhere(dateAlias, from, to);
 }
 exports.rawTimedWhere = rawTimedWhere;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@klapeks/micro-db-utils",
     "description": "klapeks utils for db and other storages",
-    "version": "0.0.12",
+    "version": "0.0.14",
     "type": "commonjs",
     "author": "Klapeks",
     "license": "ISC",
@@ -22,12 +22,14 @@
         "@aws-sdk/client-s3": "^3.842.0",
         "@aws-sdk/s3-request-presigner": "^3.844.0",
         "@klapeks/api-creation-tools": "^0.0.7",
-        "@klapeks/utils": "^0.1.4",
+        "@klapeks/utils": "^0.1.6",
+        "@types/mssql": "^12.3.0",
         "@types/node": "^18.11.18",
         "axios": "^1.7.7",
         "ioredis": "^5.6.1",
         "kafkajs": "^2.2.4",
         "mongoose": "^8.16.1",
+        "mssql": "^11.0.1",
         "mysql2": "^3.11.3",
         "redis": "^4.7.0",
         "sqlite3": "^5.1.7",