@klapeks/micro-db-utils 0.0.13 → 0.0.14

package/dist/migrations/super.migrations.js

@@ -236,7 +236,6 @@ var SuperMigrations = /** @class */ (function () {
                                 .runSQL_One(tables_commands_1.SQLTablesCommands.tableInfo(options.database, SuperMigrations.migrationTableName))];
                     case 4:
                         _existsMigrationTable = _d.sent();
-                        logger.debug("Migrations table info:", _existsMigrationTable);
                         if (!!_existsMigrationTable) return [3 /*break*/, 6];
                         // creating migration table if not exists
                         logger.log("Creating migration table..");

package/dist/sql/column.type.parser.d.ts

@@ -6,6 +6,8 @@ export interface MicroColumnTypeObject {
     primary?: boolean;
     length?: number;
     nullable?: boolean;
+    default?: any;
+    generated?: true | "increment";
 }
 export declare namespace MicroColumnTypeObject {
     function toSQLQuery(dbType: DatabaseOptions['type'], options: MicroColumnTypeObject, queryType?: "create-table" | "alter-column"): string;

package/dist/sql/column.type.parser.js

@@ -38,10 +38,49 @@ var MicroColumnTypeObject;
         var columnLength = options.length || ((columnType === 'varchar'
             || columnType === 'nvarchar') ? 255 : undefined);
         var str = columnType + (columnLength ? "(".concat(columnLength, ")") : '');
+        // nullable
         if (options.nullable)
             str += ' NULL';
         else
             str += ' NOT NULL';
+        // auto increment
+        if (options.generated) {
+            if (dbType === 'mssql')
+                str += ' IDENTITY';
+            else if (dbType === 'mysql')
+                str += ' AUTO_INCREMENT';
+            else
+                throw "options.generated is not supported yet for " + dbType;
+        }
+        // default
+        if (options.default !== undefined) {
+            var value = options.default;
+            if (value === null || value === 'null' || value === 'NULL') {
+                value = "NULL";
+            }
+            else if (typeof value === 'number') {
+                value = value.toString(); // :)
+            }
+            else if (typeof value === 'boolean') {
+                if (dbType === 'mssql') {
+                    value = value ? '1' : '0';
+                }
+                else {
+                    value = value ? "true" : "false";
+                }
+            }
+            else if (typeof value === 'string') {
+                value = "'".concat(value.replace(/'/g, "''"), "'");
+            }
+            else if (typeof value === 'object') {
+                value = "'".concat(JSON.stringify(value), "'");
+            }
+            else {
+                value = "'".concat(value, "'");
+            }
+            str += " DEFAULT ".concat(value);
+        }
+        // primary key
         if (queryType === 'create-table') {
             if (options.primary) {
                 str += ' PRIMARY KEY';

package/dist/sql/commands/alter.commands.d.ts

@@ -3,6 +3,8 @@ import { ISQLCommandAdapter } from "./abstract.sql.command";
 export declare class SQLAlterCommand {
     private readonly table;
     constructor(table: string);
+    array(cb: (t: SQLAlterCommand) => ISQLCommandAdapter[]): ISQLCommandAdapter[];
     renameColumn(old_name: string, new_name: string): ISQLCommandAdapter;
     changeColumnType(column: string, type: MicroColumnTypeObject): ISQLCommandAdapter;
+    addColumn(column: string, type: MicroColumnTypeObject): ISQLCommandAdapter;
 }

package/dist/sql/commands/alter.commands.js

@@ -6,6 +6,9 @@ var SQLAlterCommand = /** @class */ (function () {
     function SQLAlterCommand(table) {
         this.table = table;
     }
+    SQLAlterCommand.prototype.array = function (cb) {
+        return cb(this);
+    };
     SQLAlterCommand.prototype.renameColumn = function (old_name, new_name) {
         var _this = this;
         return {
@@ -22,6 +25,15 @@ var SQLAlterCommand = /** @class */ (function () {
                 + column_type_parser_1.MicroColumnTypeObject.toSQLQuery('mssql', type, 'alter-column') + ';'; }
         };
     };
+    SQLAlterCommand.prototype.addColumn = function (column, type) {
+        var _this = this;
+        return {
+            toMySQL: function () { return "ALTER TABLE `".concat(_this.table, "` ADD COLUMN `").concat(column, "` ")
+                + column_type_parser_1.MicroColumnTypeObject.toSQLQuery('mysql', type, 'alter-column') + ';'; },
+            toMSSQL: function () { return "ALTER TABLE [".concat(_this.table, "] ADD [").concat(column, "] ")
+                + column_type_parser_1.MicroColumnTypeObject.toSQLQuery('mssql', type, 'alter-column') + ';'; }
+        };
+    };
     return SQLAlterCommand;
 }());
 exports.SQLAlterCommand = SQLAlterCommand;

package/dist/sql/commands/edit-data.commands.d.ts

@@ -2,5 +2,6 @@ import { ISQLCommandAdapter } from "./abstract.sql.command";
 export declare class SQLEditDataCommands {
     private readonly table;
     constructor(table: string);
+    update(data: any, where: any): ISQLCommandAdapter;
     upsert(data: any, idKeys: string[]): ISQLCommandAdapter;
 }

package/dist/sql/commands/edit-data.commands.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
         if (ar || !(i in from)) {
@@ -10,10 +21,31 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SQLEditDataCommands = void 0;
+var raw_where_utils_1 = require("../raw.where.utils");
 var SQLEditDataCommands = /** @class */ (function () {
     function SQLEditDataCommands(table) {
         this.table = table;
     }
+    SQLEditDataCommands.prototype.update = function (data, where) {
+        var _this = this;
+        return {
+            toMySQL: function () { return ({
+                query: "\n                    UPDATE `".concat(_this.table, "`\n                    SET ").concat(Object.keys(data).map(function (key) { return "`".concat(key, "` = ?"); }).join(','), "\n                    WHERE ").concat(Object.keys(where).map(function (key) { return (0, raw_where_utils_1.converWhereQuery)('mysql', key, data[key], '?'); }).join(' AND '), ";\n                "),
+                params: __spreadArray(__spreadArray([], Object.values(data), true), Object.values(where), true)
+            }); },
+            toMSSQL: function () { return ({
+                query: "\n                    UPDATE [".concat(_this.table, "] \n                    SET ").concat(Object.keys(data).map(function (key) { return "[".concat(key, "] = @").concat(key); }).join(','), "\n                    WHERE ").concat(Object.keys(where).map(function (key) { return (0, raw_where_utils_1.converWhereQuery)('mssql', key, data[key], 'where_' + key); }).join(' AND '), ";\n                "),
+                params: (function () {
+                    var params = __assign({}, data);
+                    for (var _i = 0, _a = Object.keys(where); _i < _a.length; _i++) {
+                        var key = _a[_i];
+                        params['where_' + key] = where[key];
+                    }
+                    return params;
+                })()
+            }); },
+        };
+    };
     SQLEditDataCommands.prototype.upsert = function (data, idKeys) {
         var _this = this;
         if (!data)
@@ -38,7 +70,7 @@ var SQLEditDataCommands = /** @class */ (function () {
                 params: __spreadArray(__spreadArray([], Object.values(data), true), Object.values(toUpdObj), true)
             }); },
             toMSSQL: function () { return ({
-                query: "\n                    UPDATE [".concat(_this.table, "] \n                    SET ").concat(Object.keys(toUpdObj).map(function (key) { return "[".concat(key, "] = @").concat(key); }).join(','), "\n                    WHERE ").concat(idKeys.map(function (key) { return "[".concat(key, "] = @").concat(key); }).join(' AND '), ";\n\n                    IF @@ROWCOUNT = 0 INSERT INTO [").concat(_this.table, "]\n                        (").concat(dataKeys.map(function (a) { return "[".concat(a, "]"); }).join(', '), ")\n                        VALUES (").concat(dataKeys.map(function (key) { return '@' + key; }).join(', '), ");\n                "),
+                query: "\n                    UPDATE [".concat(_this.table, "] \n                    SET ").concat(Object.keys(toUpdObj).map(function (key) { return "[".concat(key, "] = @").concat(key); }).join(','), "\n                    WHERE ").concat(idKeys.map(function (key) { return (0, raw_where_utils_1.converWhereQuery)('mssql', key, data[key], key); }).join(' AND '), ";\n\n                    IF @@ROWCOUNT = 0 INSERT INTO [").concat(_this.table, "]\n                        (").concat(dataKeys.map(function (a) { return "[".concat(a, "]"); }).join(', '), ")\n                        VALUES (").concat(dataKeys.map(function (key) { return '@' + key; }).join(', '), ");\n                "),
                 params: data
             }); },
         };

package/dist/sql/commands/tables.commands.js

@@ -51,7 +51,7 @@ var SQLTablesCommands = /** @class */ (function () {
     SQLTablesCommands.getTablesSizes = function (database) {
         return {
             toMySQL: function () { return "\n                SELECT \n                    TABLE_NAME as 'table_name', \n                    (DATA_LENGTH / 1024) as 'data_kb', \n                    (INDEX_LENGTH / 1024) as 'index_kb'\n                FROM information_schema.TABLES\n                WHERE table_schema = '".concat(database, "'\n                ORDER BY (data_kb + index_kb) DESC;\n            "); },
-            toMSSQL: function () { return "\n                SELECT\n                    t.name AS table_name,\n                    SUM(ps.in_row_data_page_count + ps.lob_used_page_count\n                        + ps.row_overflow_used_page_count\n                        ) * 8 AS data_kb,\n                    SUM(ps.used_page_count - ps.in_row_data_page_count\n                        - ps.lob_used_page_count - ps.row_overflow_used_page_count\n                        ) * 8 AS index_kb\n                FROM sys.tables t\n                JOIN sys.dm_db_partition_stats ps\n                    ON t.object_id = ps.object_id\n                GROUP BY t.name\n                ORDER BY (data_kb + index_kb) DESC;\n            "; },
+            toMSSQL: function () { return "\n                SELECT * FROM (\n                    SELECT\n                        t.name AS table_name,\n                        SUM(ps.in_row_data_page_count + ps.lob_used_page_count\n                            + ps.row_overflow_used_page_count\n                            ) * 8 AS data_kb,\n                        SUM(ps.used_page_count - ps.in_row_data_page_count\n                            - ps.lob_used_page_count - ps.row_overflow_used_page_count\n                            ) * 8 AS index_kb\n                    FROM sys.tables t\n                    JOIN sys.dm_db_partition_stats ps\n                        ON t.object_id = ps.object_id\n                    GROUP BY t.name\n                ) t ORDER BY (data_kb + index_kb) DESC;\n            "; },
             // postgress
             // SELECT
             //     relname AS table_name,

package/dist/sql/commands/time.commands.d.ts

@@ -4,4 +4,5 @@ export declare class SQLTimeCommandsExpressions {
     constructor(dbtype: DatabaseOptions['type']);
     time(expr: string): string;
     date(expr: string): string;
+    dateFromToWhere(dateAlias: string, from: Date, to?: Date): string;
 }

package/dist/sql/commands/time.commands.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SQLTimeCommandsExpressions = void 0;
+var iso_date_time_1 = require("../../utils/iso.date.time");
 var SQLTimeCommandsExpressions = /** @class */ (function () {
     function SQLTimeCommandsExpressions(dbtype) {
         this.dbtype = dbtype;
@@ -17,7 +18,13 @@ var SQLTimeCommandsExpressions = /** @class */ (function () {
             || this.dbtype == 'postgres') {
             return "CAST(".concat(expr, " AS DATE)");
         }
-        return "time(".concat(expr, ")");
+        return "date(".concat(expr, ")");
+    };
+    SQLTimeCommandsExpressions.prototype.dateFromToWhere = function (dateAlias, from, to) {
+        var sql = this.date(dateAlias) + " >= " + "'" + (0, iso_date_time_1.toISODate)(from, "yyyy-mm-dd") + "'";
+        if (to)
+            sql += ' AND ' + this.date(dateAlias) + " <= " + "'" + (0, iso_date_time_1.toISODate)(to, "yyyy-mm-dd") + "'";
+        return sql;
     };
     return SQLTimeCommandsExpressions;
 }());

package/dist/sql/index.d.ts

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

package/dist/sql/index.js

@@ -16,3 +16,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 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 { ColumnType, 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): {
@@ -16,93 +17,7 @@ export declare const MULTISQL_COLUMNS_TYPES: {
     float64: "float" | "double";
     json: "simple-json" | "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: 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" | "rowid" | "increment" | 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: 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" | "rowid" | "increment" | 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 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.13",
+    "version": "0.0.14",
     "type": "commonjs",
     "author": "Klapeks",
     "license": "ISC",
@@ -22,7 +22,7 @@
         "@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.5",
+        "@klapeks/utils": "^0.1.6",
         "@types/mssql": "^12.3.0",
         "@types/node": "^18.11.18",
         "axios": "^1.7.7",