drizzle-orm 0.10.35 → 0.10.38

package/columns/column.d.ts

@@ -8,6 +8,11 @@ export declare enum Defaults {
 }
 declare type PgTimes = PgTimestamptz | PgTime | PgTimestamp;
 export declare type ExtractColumnType<T extends ColumnType> = T extends ColumnType<infer TCodeType> ? T extends PgTimes ? TCodeType | Defaults : TCodeType : never;
+export declare class RawValue {
+    value: string;
+    constructor(value: string);
+}
+export declare const rawValue: (value: string) => RawValue;
 export declare abstract class AbstractColumn<T extends ColumnType, TNullable extends boolean = true, TAutoIncrement extends boolean = false, TParent extends AbstractTable<any> = any> {
     isNullableFlag: boolean;
     primaryKeyName?: string;
@@ -34,7 +39,7 @@ export declare abstract class AbstractColumn<T extends ColumnType, TNullable ext
         onDelete?: 'CASCADE' | 'RESTRICT' | 'SET NULL' | 'SET DEFAULT';
         onUpdate?: 'CASCADE' | 'RESTRICT' | 'SET NULL' | 'SET DEFAULT';
     }): AbstractColumn<T, TNullable, TAutoIncrement, TParent>;
-    defaultValue: (value: ExtractColumnType<T>) => this;
+    defaultValue(value: ExtractColumnType<T> | RawValue): AbstractColumn<T, boolean, boolean, TParent>;
     abstract primaryKey(): AbstractColumn<T, boolean, boolean, TParent>;
     unique: () => this;
     abstract notNull(): AbstractColumn<T, boolean, boolean, TParent>;
@@ -45,6 +50,7 @@ export declare abstract class AbstractColumn<T extends ColumnType, TNullable ext
 }
 export declare class Column<T extends ColumnType, TNullable extends boolean = true, TAutoIncrement extends boolean = false, TParent extends AbstractTable<any> = any> extends AbstractColumn<T, TNullable, TAutoIncrement, TParent> {
     constructor(parent: TParent, columnName: string, columnType: T);
+    defaultValue: (value: ExtractColumnType<T> | RawValue) => Column<T, true, TAutoIncrement, TParent>;
     notNull(): Column<T, TAutoIncrement extends true ? true : TNullable extends true ? false : true, TAutoIncrement, TParent>;
     primaryKey(): Column<T, TAutoIncrement extends true ? true : false, TAutoIncrement, TParent>;
     foreignKey<ITable extends AbstractTable<ITable>>(table: new (db: DB) => ITable, callback: (table: ITable) => Column<any, boolean, boolean, ITable>, onConstraint?: {
@@ -58,6 +64,7 @@ export declare class Column<T extends ColumnType, TNullable extends boolean = tr
 }
 export declare class IndexedColumn<T extends ColumnType, TNullable extends boolean = true, TAutoIncrement extends boolean = false, TParent extends AbstractTable<any> = any> extends AbstractColumn<T, TNullable, TAutoIncrement, TParent> {
     constructor(parent: TParent, columnName: string, columnType: T, nullable: TNullable);
+    defaultValue: (value: ExtractColumnType<T> | RawValue) => IndexedColumn<T, true, TAutoIncrement, TParent>;
     notNull(): IndexedColumn<T, TAutoIncrement extends true ? true : TNullable extends true ? false : true, TAutoIncrement, TParent>;
     primaryKey(): IndexedColumn<T, TAutoIncrement extends true ? true : false, TAutoIncrement, TParent>;
     foreignKey<ITable extends AbstractTable<ITable>>(table: new (db: DB) => ITable, callback: (table: ITable) => Column<any, boolean, boolean, ITable>, onConstraint?: {

package/columns/column.js

@@ -1,10 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IndexedColumn = exports.Column = exports.AbstractColumn = exports.Defaults = void 0;
+exports.IndexedColumn = exports.Column = exports.AbstractColumn = exports.rawValue = exports.RawValue = exports.Defaults = void 0;
 var Defaults;
 (function (Defaults) {
     Defaults["CURRENT_TIMESTAMP"] = "CURRENT_TIMESTAMP";
 })(Defaults = exports.Defaults || (exports.Defaults = {}));
+class RawValue {
+    constructor(value) {
+        this.value = value;
+    }
+}
+exports.RawValue = RawValue;
+const rawValue = (value) => new RawValue(value);
+exports.rawValue = rawValue;
 // eslint-disable-next-line max-len
 class AbstractColumn {
     constructor(parent, columnName, columnType) {
@@ -15,18 +23,6 @@ class AbstractColumn {
         this.getAlias = () => `${this.parentTableName.replace('.', '_')}_${this.columnName}`;
         this.getParent = () => this.parent;
         this.getParentName = () => this.parentTableName;
-        this.defaultValue = (value) => {
-            if (Defaults[value] !== undefined) {
-                this.defaultParam = value;
-            }
-            else if (typeof value === 'boolean' || typeof value === 'number' || typeof value === 'bigint') {
-                this.defaultParam = value;
-            }
-            else {
-                this.defaultParam = `'${value}'`;
-            }
-            return this;
-        };
         this.unique = () => {
             this.uniqueKeyName = this.columnName;
             return this;
@@ -40,12 +36,31 @@ class AbstractColumn {
         this.parentTableName = parent.tableName();
         this.parent = parent;
     }
+    defaultValue(value) {
+        if (value instanceof RawValue) {
+            this.defaultParam = value.value;
+        }
+        else if (Defaults[value] !== undefined) {
+            this.defaultParam = value;
+        }
+        else if (typeof value === 'boolean' || typeof value === 'number' || typeof value === 'bigint') {
+            this.defaultParam = value;
+        }
+        else {
+            this.defaultParam = `'${value}'`;
+        }
+        return this;
+    }
 }
 exports.AbstractColumn = AbstractColumn;
 // eslint-disable-next-line max-len
 class Column extends AbstractColumn {
     constructor(parent, columnName, columnType) {
         super(parent, columnName, columnType);
+        this.defaultValue = (value) => {
+            super.defaultValue(value);
+            return this;
+        };
     }
     notNull() {
         this.isNullableFlag = false;
@@ -74,6 +89,10 @@ exports.Column = Column;
 class IndexedColumn extends AbstractColumn {
     constructor(parent, columnName, columnType, nullable) {
         super(parent, columnName, columnType);
+        this.defaultValue = (value) => {
+            super.defaultValue(value);
+            return this;
+        };
     }
     notNull() {
         this.isNullableFlag = false;

package/columns/index.d.ts

@@ -1,4 +1,4 @@
-export { Column, ExtractColumnType, Defaults } from './column';
+export { Column, ExtractColumnType, Defaults, rawValue, } from './column';
 export { default as PgBigDecimal } from './types/pgBigDecimal';
 export { default as PgBigInt } from './types/pgBigInt';
 export { default as PgBoolean } from './types/pgBoolean';

package/columns/index.js

@@ -3,10 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PgVarChar = exports.PgTimestamp = exports.PgTime = exports.PgText = exports.PgJsonb = exports.PgInteger = exports.PgBoolean = exports.PgBigInt = exports.PgBigDecimal = exports.Defaults = exports.Column = void 0;
+exports.PgVarChar = exports.PgTimestamp = exports.PgTime = exports.PgText = exports.PgJsonb = exports.PgInteger = exports.PgBoolean = exports.PgBigInt = exports.PgBigDecimal = exports.rawValue = exports.Defaults = exports.Column = void 0;
+/* eslint-disable import/no-cycle */
 var column_1 = require("./column");
 Object.defineProperty(exports, "Column", { enumerable: true, get: function () { return column_1.Column; } });
 Object.defineProperty(exports, "Defaults", { enumerable: true, get: function () { return column_1.Defaults; } });
+Object.defineProperty(exports, "rawValue", { enumerable: true, get: function () { return column_1.rawValue; } });
 var pgBigDecimal_1 = require("./types/pgBigDecimal");
 Object.defineProperty(exports, "PgBigDecimal", { enumerable: true, get: function () { return __importDefault(pgBigDecimal_1).default; } });
 var pgBigInt_1 = require("./types/pgBigInt");

package/migrator/migrator.js

@@ -37,6 +37,7 @@ class Migrator {
         this.db = db;
     }
     async migrate(configPath) {
+        var _a;
         let migrationFolderTo;
         if (typeof configPath === 'string') {
             const configAsString = fs.readFileSync(path.resolve('.', configPath), 'utf8');
@@ -64,8 +65,8 @@ class Migrator {
             .limit(1)
             .orderBy((table) => table.createdAt, order_1.default.DESC)
             .all();
-        const lastDbMigration = dbMigrations[0];
-        console.log('Last migration in database: ', lastDbMigration.hash);
+        const lastDbMigration = (_a = dbMigrations[0]) !== null && _a !== void 0 ? _a : undefined;
+        console.log('last migration: ', lastDbMigration === null || lastDbMigration === void 0 ? void 0 : lastDbMigration.hash);
         const files = fs.readdirSync(migrationFolderTo);
         const transaction = new transaction_1.default(this.db.session());
         await transaction.begin();
@@ -83,10 +84,9 @@ class Migrator {
                 const min = Number(migrationFolder.slice(10, 12));
                 const sec = Number(migrationFolder.slice(12, 14));
                 const folderAsMillis = Date.UTC(year, month, day, hour, min, sec);
-                console.log(`Check if migration ${migrationFolder} should be executed.`);
-                console.log(`Folder name to millis = ${folderAsMillis}`);
+                console.log(`check migration ${migrationFolder} {folderAsMillis}`);
                 if (!lastDbMigration || lastDbMigration.createdAt < folderAsMillis) {
-                    console.log(`Executing ${migrationFolder} migration`);
+                    console.log(`executing ${migrationFolder}`);
                     await this.db.session().execute(query);
                     await migrationTable.insert({
                         hash: this.generateHash(query),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-orm",
-  "version": "0.10.35",
+  "version": "0.10.38",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/test.js

@@ -4,48 +4,42 @@
 // import CitiesTable from './docs/tables/citiesTable';
 // import UsersTable from './docs/tables/usersTable';
 // import ConsoleLogger from './logger/consoleLogger';
+// import MigrationSerializer from './serializer/serializer';
+// import AbstractTable from './tables/abstractTable';
 // (async () => {
 //   try {
 //     const db = await new DbConnector()
 //       .connectionString('postgresql://postgres@127.0.0.1/migrator')
 //       .connect();
 //     db.useLogger(new ConsoleLogger());
-//     // const usersTable = new UsersTable(db);
-//     const citiesTable = new CitiesTable(db);
-//     const res = await citiesTable.update()
-//       // .groupBy((table, join1, join2, join3) => [table.id, join1.id, join1.phone])
-//       .where(eq(citiesTable.location, 'YR'))
-//       .set({
-//         metadata: [{
-//           fallback_image: true,
-//           team_image: 'https://files.slack.com/files-pri/T016CCC3FE3-F03461UR9M5/clinic_team_photo_1.jpg?pub_secret=560c098bfb',
-//           image_alt_text: 'Generic Physiotherapy Clinic image 1',
-//           logo: '',
-//           logo_alt_text: ''
-//         }],
-//       })
-//       // .leftJoin(CitiesTable, UsersTable, (table) => table.userId, (table) => table.id)
-//       // .leftJoin(UsersTable, UsersTable, (table) => table.id, (table) => table.id)
-//       .execute();
+//     const usersTable = new UsersTable(db);
+//     // const citiesTable = new CitiesTable(db);
+//     // const res = await citiesTable.update()
+//     //   // .groupBy((table, join1, join2, join3) => [table.id, join1.id, join1.phone])
+//     //   .where(eq(citiesTable.location, 'YR'))
+//     //   .set({
+//     //     metadata: [{
+//     //       fallback_image: true,
+//     //       team_image: 'https://files.slack.com/files-pri/T016CCC3FE3-F03461UR9M5/clinic_team_photo_1.jpg?pub_secret=560c098bfb',
+//     //       image_alt_text: 'Generic Physiotherapy Clinic image 1',
+//     //       logo: '',
+//     //       logo_alt_text: ''
+//     //     }],
+//     //   })
+//     //   // .leftJoin(CitiesTable, UsersTable, (table) => table.userId, (table) => table.id)
+//     //   // .leftJoin(UsersTable, UsersTable, (table) => table.id, (table) => table.id)
+//     //   .execute();
 //     // console.log(res);
-//     // const ser = new MigrationSerializer();
-//     // const res = ser.generate([usersTable as AbstractTable<UsersTable>], []);
-//     // console.log(JSON.stringify(res, null, 2));
+//     const ser = new MigrationSerializer();
+//     const res = ser.generate([usersTable as AbstractTable<UsersTable>], []);
+//     console.log(JSON.stringify(res, null, 2));
 //     // const f = {
 //     //   id: count(usersTable.id),
 //     // };
 //     // type d = ExtractModel<typeof f>;
-//     // const res = await usersTable.select({
-//     //   piska: count(),
-//     //   mongodibil: count(usersTable.phone),
-//     // })
-//     //   .where({
-//     //     piska: eq(),
-//     //     mongodibil: eq(usersTable.phone),
-//     //   }).leftJoin(UsersTable, (table) => table.id, (table) => table.id)
-//     //   .leftJoin(UsersTable, UsersTable, (table) => table.id, (table) => table.id)
-//     //   .groupBy((table, join1, join2, join3) => [table.id, join1.id, join1.phone])
-//     //   .orderBy((table, join1, join2, join3) => [{table.id}, join1.id, join1.phone])
+//     // const res = await usersTable.select()
+//     //   .leftJoin(UsersTable, (table) => table.id, (table) => table.id)
+//     //   .leftJoin(UsersTable, CitiesTable, (table) => table.id, (table) => table.id)
 //     //   .execute();
 //     // const res = await usersTable.select()
 //     //   // .groupBy((table, join1, join2, join3) => [table.id, join1.id, join1.phone])