@klapeks/micro-db-utils 0.0.11 → 0.0.12

package/dist/migrations/mysql.migrations.js

@@ -88,6 +88,8 @@ var MySQLMigrations = /** @class */ (function () {
                     case 0:
                         _b.trys.push([0, 11, , 12]);
                         options_1 = (0, utils_1.dataSourceOptions)();
+                        if (options_1.type != 'mysql')
+                            return [2 /*return*/];
                         mysqlInstance_1 = new mysql_connection_1.RawMySQLConnection(options_1);
                         return [4 /*yield*/, mysqlInstance_1.takePool()];
                     case 1:

package/dist/selectors/abstract.select.handler.d.ts

@@ -1,4 +1,5 @@
-import { SelectOptions, SelectResult, TimedStatisticInfo } from '@klapeks/api-creation-tools';
+import type { SelectOptions, SelectResult, TimedStatisticInfo } from '@klapeks/api-creation-tools';
+import { DatabaseOptions } from '@klapeks/utils';
 export interface SelectEntityHandlerOptions<T extends object, K extends string> {
     name: K;
     orderBy?: keyof T | (keyof T)[];
@@ -12,6 +13,7 @@ export declare abstract class AbstractSelectHandler<T extends object, K extends
     readonly options: O;
     constructor(options: O);
     abstract getTableName(): string;
+    abstract getDatabaseType(): DatabaseOptions['type'];
     abstract runSQL(query: string, params?: any[]): Promise<any[]>;
     runSQL_One(query: string, params?: any[]): Promise<any>;
     abstract getTotal(): Promise<number>;

package/dist/selectors/abstract.select.handler.js

@@ -77,12 +77,20 @@ var AbstractSelectHandler = /** @class */ (function () {
         });
     };
     AbstractSelectHandler.prototype.sqlCount = function (field) {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0: return [4 /*yield*/, this.runSQL_One("\n            SELECT count(".concat(field, ") as 'count'\n            FROM ").concat(this.getTableName(), ";\n        "))];
-                    case 1: return [2 /*return*/, (_a = (_b.sent())) === null || _a === void 0 ? void 0 : _a.count];
+            var _c, _d;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
+                    case 0:
+                        if (!(this.getDatabaseType() === 'mssql')) return [3 /*break*/, 2];
+                        _c = Number;
+                        return [4 /*yield*/, this.runSQL_One("\n                SELECT count(".concat(field, ") as [count]\n                FROM ").concat(this.getTableName(), ";\n            "))];
+                    case 1: return [2 /*return*/, _c.apply(void 0, [(_a = (_e.sent())) === null || _a === void 0 ? void 0 : _a.count])];
+                    case 2:
+                        _d = Number;
+                        return [4 /*yield*/, this.runSQL_One("\n            SELECT count(".concat(field, ") as 'count'\n            FROM ").concat(this.getTableName(), ";\n        "))];
+                    case 3: return [2 /*return*/, _d.apply(void 0, [(_b = (_e.sent())) === null || _b === void 0 ? void 0 : _b.count])];
                 }
             });
         });

package/dist/selectors/raw-mysql.select.handler.d.ts

@@ -1,12 +1,14 @@
-import { SelectOptions } from "@klapeks/api-creation-tools";
+import { type SelectOptions } from "@klapeks/api-creation-tools";
 import { RawMySQLConnection } from "../connections";
 import { AbstractSelectHandler, SelectEntityHandlerOptions } from "./abstract.select.handler";
+import { DatabaseOptions } from "@klapeks/utils";
 export type MySQLSelectEntityHandlerOptions<T extends object, K extends string> = SelectEntityHandlerOptions<T, K> & {
     schemaTableName: string;
     mysql: RawMySQLConnection;
 };
 export declare class MySQLSelectEntityHandler<T extends object, K extends string> extends AbstractSelectHandler<T, K, MySQLSelectEntityHandlerOptions<T, K>> {
     constructor(options: MySQLSelectEntityHandlerOptions<T, K>);
+    getDatabaseType(): DatabaseOptions['type'];
     getTableName(): string;
     runSQL(sql: string, params?: any[]): Promise<any[]>;
     getTotal(): Promise<number>;

package/dist/selectors/raw-mysql.select.handler.js

@@ -58,6 +58,9 @@ var MySQLSelectEntityHandler = /** @class */ (function (_super) {
     function MySQLSelectEntityHandler(options) {
         return _super.call(this, options) || this;
     }
+    MySQLSelectEntityHandler.prototype.getDatabaseType = function () {
+        return 'mysql';
+    };
     MySQLSelectEntityHandler.prototype.getTableName = function () {
         return this.options.schemaTableName;
     };

package/dist/selectors/typeorm.select.handler.d.ts

@@ -1,6 +1,7 @@
 import { DataSource, EntitySchema, ObjectLiteral, SelectQueryBuilder } from 'typeorm';
 import { AbstractSelectHandler, SelectEntityHandlerOptions } from './abstract.select.handler';
-import { SelectOptions } from '@klapeks/api-creation-tools';
+import { type SelectOptions } from '@klapeks/api-creation-tools';
+import { DatabaseOptions } from '@klapeks/utils';
 export type TypeormSelectEntityHandlerOptions<T extends ObjectLiteral, K extends string> = SelectEntityHandlerOptions<T, K> & {
     schema: EntitySchema<T>;
     dataSource: DataSource;
@@ -11,6 +12,7 @@ export declare class SelectEntityHandler<T extends ObjectLiteral, K extends stri
     get dataSource(): DataSource;
     get schema(): EntitySchema<T>;
     get repo(): import("typeorm").Repository<T>;
+    getDatabaseType(): DatabaseOptions['type'];
     getTableName(): string;
     runSQL(sql: string, params?: any[]): Promise<any[]>;
     getTotal(): Promise<number>;

package/dist/selectors/typeorm.select.handler.js

@@ -74,6 +74,9 @@ var SelectEntityHandler = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    SelectEntityHandler.prototype.getDatabaseType = function () {
+        return this.dataSource.options.type;
+    };
     SelectEntityHandler.prototype.getTableName = function () {
         return this.schema.options.name;
     };
@@ -139,12 +142,12 @@ var SelectEntityHandler = /** @class */ (function (_super) {
                                             if (typeof where[key] === 'undefined')
                                                 continue;
                                             if (where[key] == null) {
-                                                qb2 = qb2.andWhere('key is NULL');
+                                                qb2 = qb2.andWhere(key + ' IS NULL');
                                                 continue;
                                             }
                                             if (typeof where[key] == 'string' && where[key].startsWith('{like}=')) {
                                                 var strVal = where[key].substring(7).toLowerCase();
-                                                qb2 = qb2.andWhere('lower(' + key + ') like :' + placeholderKey, (_a = {}, _a[placeholderKey] = strVal, _a));
+                                                qb2 = qb2.andWhere('LOWER(' + key + ') LIKE :' + placeholderKey, (_a = {}, _a[placeholderKey] = strVal, _a));
                                                 continue;
                                             }
                                             qb2 = qb2.andWhere(key + ' = :' + placeholderKey, (_b = {}, _b[placeholderKey] = where[key], _b));

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

@@ -8,6 +8,14 @@ export declare function createRelation(target: string, type: "one-to-many" | "on
     cascade: boolean;
     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;

package/dist/utils/columns.types.js

@@ -11,19 +11,21 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NullableFloat64Column = exports.Float64Column = exports.NullableFloatingColumn = exports.FloatingColumn = exports.createRelation = void 0;
+exports.NullableFloat64Column = exports.Float64Column = exports.NullableFloatingColumn = exports.FloatingColumn = exports.MULTISQL_COLUMNS_TYPES = exports.createRelation = void 0;
+var utils_1 = require("@klapeks/utils");
 function createRelation(target, type, inverseSide, cascade) {
     if (cascade === void 0) { cascade = true; }
     return { target: target, type: type, cascade: cascade, inverseSide: inverseSide };
 }
 exports.createRelation = createRelation;
+exports.MULTISQL_COLUMNS_TYPES = (0, utils_1.getDatabaseColumnTypes)();
 exports.FloatingColumn = {
-    type: "float", default: 0
+    type: exports.MULTISQL_COLUMNS_TYPES.float32, default: 0
     // type: "decimal", precision: 10, scale: 6, default: 0
 };
 exports.NullableFloatingColumn = __assign(__assign({}, exports.FloatingColumn), { default: null, nullable: true });
 exports.Float64Column = {
-    type: "double", default: 0
+    type: exports.MULTISQL_COLUMNS_TYPES.float64, default: 0
     // type: "decimal", precision: 10, scale: 6, default: 0
 };
 exports.NullableFloat64Column = __assign(__assign({}, exports.Float64Column), { default: null, nullable: true });

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@klapeks/micro-db-utils",
     "description": "klapeks utils for db and other storages",
-    "version": "0.0.11",
+    "version": "0.0.12",
     "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.1",
+        "@klapeks/utils": "^0.1.4",
         "@types/node": "^18.11.18",
         "axios": "^1.7.7",
         "ioredis": "^5.6.1",