@klapeks/micro-db-utils 0.0.22 → 0.0.24

package/dist/migrations/super.migrations.d.ts

@@ -5,8 +5,8 @@ type SuperMigrationsSQLParam = string | ISQLCommandAdapter | SQLCommandData | (s
 export declare class SuperMigrations {
     private static _migrations;
     static get migrationTableName(): string;
-    static addRawMigration(dbtype: DatabaseOptions['type'] | 'all', entity: EntitySchema, date: Date | string, sql: SuperMigrationsSQLParam): void;
-    static addMigration(entity: EntitySchema, date: Date | string, sql: ISQLCommandAdapter | ISQLCommandAdapter[]): void;
+    static addRawMigration(dbtype: DatabaseOptions['type'] | 'all', entity: EntitySchema | string, date: Date | string, sql: SuperMigrationsSQLParam): void;
+    static addMigration(entity: EntitySchema | string, date: Date | string, sql: ISQLCommandAdapter | ISQLCommandAdapter[]): void;
     private static runMigrationForTable;
     static runMigrations(dataSource: DataSource): Promise<void>;
 }

package/dist/migrations/super.migrations.js

@@ -68,7 +68,7 @@ var SuperMigrations = /** @class */ (function () {
             date = new Date(date);
         SuperMigrations._migrations.push({
             dbtype: dbtype == 'all' ? undefined : dbtype,
-            table: entity.options.tableName || entity.options.name,
+            table: typeof entity === 'string' ? entity : (entity.options.tableName || entity.options.name),
             date: date,
             sql: sql
         });

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

@@ -5,6 +5,7 @@ import { DatabaseOptions } from '@klapeks/utils';
 export type TypeormSelectEntityHandlerOptions<T extends ObjectLiteral, K extends string> = SelectEntityHandlerOptions<T, K> & {
     schema: EntitySchema<T>;
     dataSource: DataSource;
+    typeormHydrateValue?: boolean;
     beforeGetMany?: (builder: SelectQueryBuilder<T>, options: SelectOptions<T>) => Promise<void> | void;
 };
 export declare class SelectEntityHandler<T extends ObjectLiteral, K extends string> extends AbstractSelectHandler<T, K, TypeormSelectEntityHandlerOptions<T, K>> {

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

@@ -95,12 +95,13 @@ var SelectEntityHandler = /** @class */ (function (_super) {
         });
     };
     SelectEntityHandler.prototype.rawSelect = function (options) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            var builder, addOrderBy, i, multipleWheres_1, result;
-            var _a;
+            var builder, addOrderBy, i, multipleWheres_1, result, $columns, _i, result_1, row, _c, $columns_1, column;
+            var _d;
             var _this = this;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            return __generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
                         builder = this.repo.createQueryBuilder(this.schema.options.name);
                         builder.select(this.schema.options.name + '.*');
@@ -163,24 +164,36 @@ var SelectEntityHandler = /** @class */ (function (_super) {
                         if (!this.options.beforeGetMany) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.options.beforeGetMany(builder, options)];
                     case 1:
-                        _b.sent();
-                        _b.label = 2;
+                        _e.sent();
+                        _e.label = 2;
                     case 2:
                         builder.limit(options.limit);
                         if (options.offset)
                             builder.offset(options.offset);
                         return [4 /*yield*/, builder.getRawMany()];
                     case 3:
-                        result = _b.sent();
+                        result = _e.sent();
+                        if (this.options.typeormHydrateValue) {
+                            $columns = (_b = (_a = builder.expressionMap.mainAlias) === null || _a === void 0 ? void 0 : _a.metadata) === null || _b === void 0 ? void 0 : _b.columns;
+                            if ($columns)
+                                for (_i = 0, result_1 = result; _i < result_1.length; _i++) {
+                                    row = result_1[_i];
+                                    for (_c = 0, $columns_1 = $columns; _c < $columns_1.length; _c++) {
+                                        column = $columns_1[_c];
+                                        row[column.databaseName] = this.dataSource
+                                            .driver.prepareHydratedValue(row[column.databaseName], column);
+                                    }
+                                }
+                        }
                         if (!this.options.afterSelect) return [3 /*break*/, 5];
                         return [4 /*yield*/, this.options.afterSelect(result, options)];
                     case 4:
-                        result = _b.sent();
-                        _b.label = 5;
+                        result = _e.sent();
+                        _e.label = 5;
                     case 5:
-                        _a = { objects: result };
+                        _d = { objects: result };
                         return [4 /*yield*/, builder.getCount()];
-                    case 6: return [2 /*return*/, (_a.total = _b.sent(), _a)];
+                    case 6: return [2 /*return*/, (_d.total = _e.sent(), _d)];
                 }
             });
         });

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

@@ -7,4 +7,7 @@ export declare class SQLAlterCommand {
     renameColumn(old_name: string, new_name: string): ISQLCommandAdapter;
     addColumn(column: string, type: MicroColumnTypeObject): ISQLCommandAdapter;
     changeColumnType(column: string, type: MicroColumnTypeObject): ISQLCommandAdapter;
+    dropPrimaryKey(): ISQLCommandAdapter & {
+        toPostgreSQL(): string | Promise<string>;
+    };
 }

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

@@ -140,6 +140,15 @@ var SQLAlterCommand = /** @class */ (function () {
             }); },
         };
     };
+    SQLAlterCommand.prototype.dropPrimaryKey = function () {
+        var _this = this;
+        return {
+            toSQLite: function () { return "SELECT 1;"; },
+            toMySQL: function () { return "ALTER TABLE `".concat(_this.table, "` DROP PRIMARY KEY;"); },
+            toMSSQL: function () { return "\n                BEGIN TRANSACTION;\n                DECLARE @pkName NVARCHAR(128);\n                DECLARE @sql NVARCHAR(MAX);\n\n                SELECT @pkName = kc.name\n                FROM sys.key_constraints kc\n                WHERE kc.parent_object_id = OBJECT_ID('dbo.".concat(_this.table, "')\n                AND kc.type = 'PK';\n\n                IF @pkName IS NOT NULL\n                BEGIN\n                    SET @sql = N'ALTER TABLE dbo.").concat(_this.table, " DROP CONSTRAINT '\n                            + QUOTENAME(@pkName);\n\n                    EXEC sp_executesql @sql;\n                END;\n                COMMIT TRANSACTION;\n            "); },
+            toPostgreSQL: function () { return "\n                BEGIN;\n                DO $$\n                DECLARE\n                    pk_name TEXT;\n                BEGIN\n                    SELECT conname\n                    INTO pk_name\n                    FROM pg_constraint\n                    WHERE conrelid = '".concat(_this.table, "'::regclass\n                    AND contype = 'p';\n\n                    IF pk_name IS NOT NULL THEN\n                        EXECUTE format(\n                            'ALTER TABLE ").concat(_this.table, " DROP CONSTRAINT %I',\n                            pk_name\n                        );\n                    END IF;\n                END $$;\n                COMMIT;\n            "); }
+        };
+    };
     return SQLAlterCommand;
 }());
 exports.SQLAlterCommand = SQLAlterCommand;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@klapeks/micro-db-utils",
     "description": "klapeks utils for db and other storages",
-    "version": "0.0.22",
+    "version": "0.0.24",
     "type": "commonjs",
     "author": "Klapeks",
     "license": "ISC",