drizzle-orm 0.10.37 → 0.10.40

package/builders/highLvlBuilders/selectRequestBuilder.js

@@ -72,6 +72,7 @@ class SelectTRB extends abstractRequestBuilder_1.default {
             }
             if (this._logger) {
                 this._logger.info(`Selecting from ${this._table.tableName()} using query:\n ${query}`);
+                this._logger.info(`Values for query:\n ${values}`);
             }
             const result = await this._session.execute(query, values);
             if (this.__partial) {

package/builders/highLvlBuilders/updateRequestBuilder.js

@@ -70,7 +70,7 @@ class UpdateTRB extends abstractRequestBuilder_1.default {
             }
             if (this._logger) {
                 this._logger.info(`Updating ${this._table.tableName()} using query:\n ${query}`);
-                console.log(values);
+                this._logger.info(`Values used for update:\n ${values}`);
             }
             const result = await this._session.execute(query, values);
             return responseMapper_1.default.map(this._mappedServiceToDb, result);

package/builders/joinBuilders/builders/abstractJoinBuilder.js

@@ -54,8 +54,6 @@ class AbstractJoined {
             catch (e) {
                 throw new builderError_1.default(builderError_1.BuilderType.JOINED_SELECT, this._table.tableName(), Object.values(this._table.mapServiceToDb()), e, this._filter);
             }
-            console.log(query);
-            console.log(values);
             const result = await this._session.execute(query, values);
             return this.mapResponse(result);
         };

package/columns/column.d.ts

@@ -3,16 +3,18 @@ import DB from '../db/db';
 import { AbstractTable } from '../tables';
 import ColumnType from './types/columnType';
 import PgTimestamptz from './types/pgTimestamptz';
-export declare enum Defaults {
-    CURRENT_TIMESTAMP = "CURRENT_TIMESTAMP"
-}
 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);
+declare class RawSqlValue {
+    readonly value: any;
+    readonly escape: boolean;
+    constructor(value: any, escape: boolean);
+    toJSON(): string;
 }
-export declare const rawValue: (value: string) => RawValue;
+export declare const Defaults: {
+    CURRENT_TIMESTAMP: RawSqlValue;
+};
+export declare type ExtractColumnType<T extends ColumnType<any>> = T extends ColumnType<infer TCodeType> ? T extends PgTimes ? TCodeType : TCodeType : never;
+export declare const rawValue: (value: string) => RawSqlValue;
 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;
@@ -23,7 +25,7 @@ export declare abstract class AbstractColumn<T extends ColumnType, TNullable ext
     protected parentTableName: string;
     protected columnType: T;
     protected columnName: string;
-    protected defaultParam: any;
+    protected defaultParam: RawSqlValue;
     protected referenced: AbstractColumn<T, boolean, boolean>;
     constructor(parent: TParent, columnName: string, columnType: T);
     getOnDelete: () => string | undefined;
@@ -39,18 +41,18 @@ 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> | RawValue): AbstractColumn<T, boolean, boolean, TParent>;
+    defaultValue(value: ExtractColumnType<T> | RawSqlValue): AbstractColumn<T, boolean, boolean, TParent>;
     abstract primaryKey(): AbstractColumn<T, boolean, boolean, TParent>;
     unique: () => this;
     abstract notNull(): AbstractColumn<T, boolean, boolean, TParent>;
     getColumnName: () => string;
     getReferenced: () => AbstractColumn<T, boolean, boolean, TParent>;
     getColumnType: () => T;
-    getDefaultValue: () => any;
+    getDefaultValue: () => RawSqlValue;
 }
 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>;
+    defaultValue: (value: ExtractColumnType<T> | RawSqlValue) => 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?: {
@@ -64,7 +66,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>;
+    defaultValue: (value: ExtractColumnType<T> | RawSqlValue) => 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,23 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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) {
+exports.IndexedColumn = exports.Column = exports.AbstractColumn = exports.rawValue = exports.Defaults = void 0;
+class RawSqlValue {
+    constructor(value, escape) {
         this.value = value;
+        this.escape = escape;
+    }
+    toJSON() {
+        return this.escape ? `'${this.value}'` : this.value;
     }
 }
-exports.RawValue = RawValue;
-const rawValue = (value) => new RawValue(value);
+exports.Defaults = {
+    CURRENT_TIMESTAMP: new RawSqlValue('CURRENT_TIMESTAMP', false),
+};
+const rawValue = (value) => new RawSqlValue(value, false);
 exports.rawValue = rawValue;
 // eslint-disable-next-line max-len
 class AbstractColumn {
     constructor(parent, columnName, columnType) {
         this.isNullableFlag = true;
-        this.defaultParam = null;
         this.getOnDelete = () => this.onDelete;
         this.getOnUpdate = () => this.onUpdate;
         this.getAlias = () => `${this.parentTableName.replace('.', '_')}_${this.columnName}`;
@@ -37,17 +38,14 @@ class AbstractColumn {
         this.parent = parent;
     }
     defaultValue(value) {
-        if (value instanceof RawValue) {
-            this.defaultParam = value.value;
-        }
-        else if (Defaults[value] !== undefined) {
+        if (value instanceof RawSqlValue) {
             this.defaultParam = value;
         }
         else if (typeof value === 'boolean' || typeof value === 'number' || typeof value === 'bigint') {
-            this.defaultParam = value;
+            this.defaultParam = new RawSqlValue(value, false);
         }
         else {
-            this.defaultParam = `'${value}'`;
+            this.defaultParam = new RawSqlValue(`${value}`, true);
         }
         return this;
     }

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/index.d.ts

@@ -5,6 +5,8 @@ export * from './db';
 export * from './builders';
 export * from './columns';
 export * from './tables';
+export * from './logger/consoleLogger';
+export * from './logger/abstractLogger';
 export declare const drizzle: {
     connect(config: ClientConfig): Promise<DB>;
     migrator(db: DB): Migrator;

package/index.js

@@ -20,6 +20,8 @@ __exportStar(require("./db"), exports);
 __exportStar(require("./builders"), exports);
 __exportStar(require("./columns"), exports);
 __exportStar(require("./tables"), exports);
+__exportStar(require("./logger/consoleLogger"), exports);
+__exportStar(require("./logger/abstractLogger"), exports);
 exports.drizzle = {
     async connect(config) {
         const dbConnector = new db_1.DbConnector().params(config);

package/package.json

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

package/serializer/serializer.js

@@ -10,9 +10,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const columns_1 = require("../columns");
 const tableIndex_1 = __importDefault(require("../indexes/tableIndex"));
-const serialiseForeignKey = (fkName, table, column, onDelete, onUpdate) => {
-    return `${fkName};${table};${column};${onDelete !== null && onDelete !== void 0 ? onDelete : ''};${onUpdate !== null && onUpdate !== void 0 ? onUpdate : ''}`;
-};
+// eslint-disable-next-line max-len
+const serialiseForeignKey = (fkName, table, column, onDelete, onUpdate) => `${fkName};${table};${column};${onDelete !== null && onDelete !== void 0 ? onDelete : ''};${onUpdate !== null && onUpdate !== void 0 ? onUpdate : ''}`;
 class MigrationSerializer {
     constructor() {
         this.generate = (tables, enums) => {
@@ -49,7 +48,7 @@ class MigrationSerializer {
                             notNull: !value.isNullableFlag,
                         };
                         if (value.getDefaultValue() !== undefined && value.getDefaultValue() !== null) {
-                            columnToReturn[value.getColumnName()].default = value.getDefaultValue();
+                            columnToReturn[value.getColumnName()].default = value.getDefaultValue().toJSON();
                         }
                         if (value.uniqueKeyName) {
                             const indexName = `${value.getParent().tableName()}_${value.getColumnName()}_index`;
@@ -66,11 +65,12 @@ class MigrationSerializer {
                         const referenced = value.getReferenced();
                         if (referenced) {
                             const fkName = `${value.getParent().tableName()}_${value.getColumnName()}_fkey`;
-                            const table = referenced.getParentName();
+                            const tableParentName = referenced.getParentName();
                             const column = referenced.getColumnName();
                             const onDelete = value.getOnDelete();
                             const onUpdate = value.getOnUpdate();
-                            const referenceString = serialiseForeignKey(fkName, table, column, onDelete, onUpdate);
+                            // eslint-disable-next-line max-len
+                            const referenceString = serialiseForeignKey(fkName, tableParentName, column, onDelete, onUpdate);
                             columnToReturn[value.getColumnName()].references = referenceString;
                         }
                     }
@@ -162,6 +162,7 @@ class MigrationSerializer {
                         const foreignKeyName = fk.constraint_name;
                         const onUpdate = fk.update_rule;
                         const onDelete = fk.delete_rule;
+                        // eslint-disable-next-line max-len
                         const references = serialiseForeignKey(foreignKeyName, tableTo, columnTo, onDelete, onUpdate);
                         mappedRefernces[columnFrom] = references;
                     }

package/test.js

@@ -1,11 +1,12 @@
 "use strict";
-// import { eq } from './builders/requestBuilders/where/static';
 // import DbConnector from './db/dbConnector';
-// 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';
+// import {
+//   ExtractColumnType, ExtractColumnType1,
+// } from './tables/inferTypes';
 // (async () => {
 //   try {
 //     const db = await new DbConnector()
@@ -13,7 +14,12 @@
 //       .connect();
 //     db.useLogger(new ConsoleLogger());
 //     const usersTable = new UsersTable(db);
+//     type g = ReturnType<typeof usersTable.updatedAt.getColumnType>['codeType'];
+//     type f = ExtractColumnType<typeof usersTable.updatedAt>;
+//     type f1 = ExtractColumnType1<f>;
 //     // const citiesTable = new CitiesTable(db);
+//     // await usersTable.insert({
+//     // });
 //     // const res = await citiesTable.update()
 //     //   // .groupBy((table, join1, join2, join3) => [table.id, join1.id, join1.phone])
 //     //   .where(eq(citiesTable.location, 'YR'))