drizzle-orm 0.9.7 → 0.9.11

package/columns/column.d.ts

@@ -51,7 +51,7 @@ export declare class Column<T extends ColumnType, TNullable extends boolean = tr
     constructor(parent: AbstractTable<any>, columnName: string, columnType: T, nullable: TNullable);
     serial(): Column<T, false, true>;
     primaryKey(): Column<T, TAutoIncrement extends true ? true : false, TAutoIncrement>;
-    foreignKey<ITable extends AbstractTable<ITable>>(table: new (db: DB) => ITable, callback: (table: ITable) => Column<T, boolean, boolean>, onConstraint: {
+    foreignKey<ITable extends AbstractTable<ITable>>(table: new (db: DB) => ITable, callback: (table: ITable) => Column<T, boolean, boolean>, onConstraint?: {
         onDelete?: 'CASCADE' | 'RESTRICT';
         onUpdate?: 'CASCADE' | 'RESTRICT';
     }): Column<T, TNullable, TAutoIncrement>;
@@ -61,7 +61,7 @@ export declare class IndexedColumn<T extends ColumnType, TNullable extends boole
     constructor(parent: AbstractTable<any>, columnName: string, columnType: T, nullable: TNullable);
     serial(): IndexedColumn<T, false, true>;
     primaryKey(): IndexedColumn<T, TAutoIncrement extends true ? true : false, TAutoIncrement>;
-    foreignKey<ITable extends AbstractTable<ITable>>(table: new (db: DB) => ITable, callback: (table: ITable) => IndexedColumn<T, boolean, boolean>, onConstraint: {
+    foreignKey<ITable extends AbstractTable<ITable>>(table: new (db: DB) => ITable, callback: (table: ITable) => IndexedColumn<T, boolean, boolean>, onConstraint?: {
         onDelete?: 'CASCADE' | 'RESTRICT';
         onUpdate?: 'CASCADE' | 'RESTRICT';
     }): IndexedColumn<T, TNullable, TAutoIncrement>;

package/columns/column.js

@@ -59,8 +59,8 @@ class Column extends AbstractColumn {
     foreignKey(table, callback, onConstraint) {
         const tableInstance = this.getParent().db.create(table);
         this.referenced = callback(tableInstance);
-        this.onDelete = onConstraint.onDelete ? `ON DELETE ${onConstraint.onDelete}` : undefined;
-        this.onUpdate = onConstraint.onUpdate ? `ON UPDATE ${onConstraint.onUpdate}` : undefined;
+        this.onDelete = (onConstraint === null || onConstraint === void 0 ? void 0 : onConstraint.onDelete) ? `ON DELETE ${onConstraint.onDelete}` : undefined;
+        this.onUpdate = (onConstraint === null || onConstraint === void 0 ? void 0 : onConstraint.onUpdate) ? `ON UPDATE ${onConstraint.onUpdate}` : undefined;
         return this;
     }
     autoIncrement() {
@@ -86,8 +86,8 @@ class IndexedColumn extends AbstractColumn {
     foreignKey(table, callback, onConstraint) {
         // eslint-disable-next-line new-cap
         this.referenced = callback(this.getParent().db.create(table));
-        this.onDelete = onConstraint.onDelete ? `ON DELETE ${onConstraint.onDelete}` : undefined;
-        this.onUpdate = onConstraint.onUpdate ? `ON UPDATE ${onConstraint.onUpdate}` : undefined;
+        this.onDelete = (onConstraint === null || onConstraint === void 0 ? void 0 : onConstraint.onDelete) ? `ON DELETE ${onConstraint.onDelete}` : undefined;
+        this.onUpdate = (onConstraint === null || onConstraint === void 0 ? void 0 : onConstraint.onUpdate) ? `ON UPDATE ${onConstraint.onUpdate}` : undefined;
         return this;
     }
     autoIncrement() {

package/columns/types/columnType.d.ts

@@ -3,5 +3,5 @@ export default abstract class ColumnType<TCodeType = {}> {
     protected abstract dbName: string;
     abstract getDbName(): string;
     abstract insertStrategy(value: TCodeType): string;
-    abstract selectStrategy(value: any): TCodeType;
+    abstract selectStrategy(value: any): TCodeType | undefined;
 }

package/columns/types/pgBigDecimal.d.ts

@@ -6,5 +6,5 @@ export default class PgBigDecimal extends ColumnType<number> {
     constructor(precision?: number, scale?: number);
     getDbName: () => string;
     insertStrategy: (value: number) => string;
-    selectStrategy(value: string): number;
+    selectStrategy(value: string): number | undefined;
 }

package/columns/types/pgBigDecimal.js

@@ -22,7 +22,7 @@ class PgBigDecimal extends columnType_1.default {
         }
     }
     selectStrategy(value) {
-        return parseFloat(value);
+        return value ? parseFloat(value) : undefined;
     }
 }
 exports.default = PgBigDecimal;

package/columns/types/pgBigInt.d.ts

@@ -4,5 +4,5 @@ export default class PgBigInt extends ColumnType<number> {
     constructor();
     getDbName(): string;
     insertStrategy: (value: number) => string;
-    selectStrategy(value: string): number;
+    selectStrategy(value: string): number | undefined;
 }

package/columns/types/pgBigInt.js

@@ -11,7 +11,7 @@ class PgBigInt extends columnType_1.default {
         return this.dbName;
     }
     selectStrategy(value) {
-        return parseInt(value, 10);
+        return value ? parseInt(value, 10) : undefined;
     }
 }
 exports.default = PgBigInt;

package/columns/types/pgInteger.d.ts

@@ -4,5 +4,5 @@ export default class PgInteger extends ColumnType<number> {
     constructor();
     getDbName: () => string;
     insertStrategy: (value: number) => string;
-    selectStrategy(value: string): number;
+    selectStrategy(value: string): number | undefined;
 }

package/columns/types/pgInteger.js

@@ -9,7 +9,7 @@ class PgInteger extends columnType_1.default {
         this.dbName = 'INT';
     }
     selectStrategy(value) {
-        return parseInt(value, 10);
+        return value ? parseInt(value, 10) : undefined;
     }
 }
 exports.default = PgInteger;

package/columns/types/pgSmallInt.d.ts

@@ -0,0 +1,8 @@
+import ColumnType from './columnType';
+export default class PgSmallInt extends ColumnType<number> {
+    dbName: string;
+    constructor();
+    getDbName: () => string;
+    insertStrategy: (value: number) => string;
+    selectStrategy(value: string): number | undefined;
+}

package/columns/types/pgSmallInt.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const columnType_1 = require("./columnType");
+class PgSmallInt extends columnType_1.default {
+    constructor() {
+        super();
+        this.getDbName = () => this.dbName;
+        this.insertStrategy = (value) => `${value}`;
+        this.dbName = 'SMALLINT';
+    }
+    selectStrategy(value) {
+        return value ? parseInt(value, 10) : undefined;
+    }
+}
+exports.default = PgSmallInt;

package/package.json

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

package/serializer/serializer.js

@@ -15,7 +15,6 @@ class MigrationSerializer {
                 const columnToReturn = {};
                 const indexToReturn = {};
                 for (const properties of tableEntries) {
-                    const key = properties[0];
                     const value = properties[1];
                     if (value instanceof tableIndex_1.default) {
                         const columns = value.getColumns();
@@ -33,7 +32,7 @@ class MigrationSerializer {
                         };
                     }
                     if (value instanceof columns_1.Column) {
-                        columnToReturn[key] = {
+                        columnToReturn[value.getColumnName()] = {
                             name: value.getColumnName(),
                             type: value.isAutoIncrement() ? 'serial' : value.getColumnType().getDbName(),
                             primaryKey: !!value.primaryKeyName,
@@ -43,7 +42,7 @@ class MigrationSerializer {
                         };
                         const referenced = value.getReferenced();
                         if (referenced) {
-                            columnToReturn[key].references = {
+                            columnToReturn[value.getColumnName()].references = {
                                 foreignKeyName: `${value.getParent().tableName()}_${value.getColumnName()}_fk`,
                                 table: referenced.getParentName(),
                                 column: referenced.getColumnName(),

package/tables/abstractTable.d.ts

@@ -63,6 +63,12 @@ export default abstract class AbstractTable<TTable extends AbstractTable<TTable>
     protected int(name: string, params: {
         notNull: true;
     }): Column<PgInteger, false>;
+    protected smallInt(name: string, params?: {
+        notNull: false;
+    }): Column<PgInteger, true>;
+    protected smallInt(name: string, params: {
+        notNull: true;
+    }): Column<PgInteger, false>;
     protected timestamp(name: string, params?: {
         notNull: false;
     }): Column<PgTimestamp, true>;

package/tables/abstractTable.js

@@ -16,6 +16,7 @@ const pgBigInt_1 = require("../columns/types/pgBigInt");
 const pgEnum_1 = require("../columns/types/pgEnum");
 const column_1 = require("../columns/column");
 const tableIndex_1 = require("../indexes/tableIndex");
+const pgSmallInt_1 = require("../columns/types/pgSmallInt");
 class AbstractTable {
     constructor(db) {
         this.withLogger = (logger) => {
@@ -79,6 +80,10 @@ class AbstractTable {
         var _a;
         return new column_1.Column(this, name, new pgInteger_1.default(), (_a = !(params === null || params === void 0 ? void 0 : params.notNull)) !== null && _a !== void 0 ? _a : false);
     }
+    smallInt(name, params = {}) {
+        var _a;
+        return new column_1.Column(this, name, new pgSmallInt_1.default(), (_a = !(params === null || params === void 0 ? void 0 : params.notNull)) !== null && _a !== void 0 ? _a : false);
+    }
     timestamp(name, params = {}) {
         var _a;
         return new column_1.Column(this, name, new pgTimestamp_1.default(), (_a = !(params === null || params === void 0 ? void 0 : params.notNull)) !== null && _a !== void 0 ? _a : false);

package/test.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const _1 = require(".");
 const usersTable_1 = require("./docs/tables/usersTable");
-const serializer_1 = require("./serializer/serializer");
 // import { Pool } from 'pg';
 // import { DB } from '.';
 // import { DB, DbConnector } from '.';
@@ -20,12 +19,14 @@ const fromTypeFile = (filepath) => {
 (async () => {
     try {
         const db = await new _1.DbConnector()
-            .connectionString('postgresql://postgres@127.0.0.1/drizzle')
+            .connectionString('postgresql://postgres@127.0.0.1/migrator')
             .connect();
-        const ser = new serializer_1.default();
-        const d = db.create(usersTable_1.default);
-        const f = ser.generate([d], []);
-        console.log(JSON.stringify(f, null, 2));
+        // const ser = new MigrationSerializer();
+        // const d = db.create(UsersTable) as unknown as AbstractTable<any>;
+        // const f = ser.generate([d], []);
+        // console.log(JSON.stringify(f, null, 2));
+        // await drizzle.migrator(db).migrate('src/drizzle.config.yaml');
+        // drizzle.migrator(db).migrate({ migrationFolder: '' });
         // const typesFileNames = fs.readdirSync('/Users/andrewsherman/IdeaProjects/datalayer-orm/src/examples/types');
         // typesFileNames.forEach((filename) => {
         //   const types = fromTypeFile(`./examples/types/${filename.split('.')[0]}`);
@@ -38,9 +39,10 @@ const fromTypeFile = (filepath) => {
         // const db = await new DbConnector()
         //   .connectionString('postgresql://postgres@127.0.0.1/drizzle')
         //   .connect();
-        // const res = await db.session().execute(
-        //   Create.table(db.create(UsersTable)).build(),
-        // );
+        const usersTable = new usersTable_1.default(db);
+        const res = await db.session().execute(_1.Create.table(db.create(usersTable_1.default)).build());
+        // await usersTable.insert({
+        // }).execute();
         // if (res.isLeft()) {
         //   console.log(res.value.reason);
         // } else {