drizzle-orm 0.10.3 → 0.10.4

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 | undefined;
+    selectStrategy(value: number): number | undefined;
 }

package/columns/types/pgInteger.js

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

package/columns/types/pgSerial.d.ts

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

package/columns/types/pgSerial.js

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

package/columns/types/pgSmallInt.d.ts

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

package/columns/types/pgSmallInt.js

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

package/package.json

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

package/tables/abstractTable.d.ts

@@ -19,6 +19,7 @@ import { AbstractColumn, Column } from '../columns/column';
 import TableIndex from '../indexes/tableIndex';
 import { ExtractModel } from './inferTypes';
 import Enum, { ExtractEnumValues } from '../types/type';
+import PgSmallInt from '../columns/types/pgSmallInt';
 import PgSerial from '../columns/types/pgSerial';
 import PgTimestamptz from '../columns/types/pgTimestamptz';
 import PgBigSerial53, { PgBigSerial64 } from '../columns/types/pgBigSerial';
@@ -47,7 +48,7 @@ export default abstract class AbstractTable<TTable extends AbstractTable<TTable>
         size?: number;
     }): Column<PgVarChar, true, false, this>;
     protected int(name: string): Column<PgInteger, true, false, this>;
-    protected smallInt(name: string): Column<PgInteger, true, false, this>;
+    protected smallInt(name: string): Column<PgSmallInt, true, false, this>;
     protected serial(name: string): Column<PgSerial, true, true, this>;
     protected bigSerial(name: string, maxBytes: 'max_bytes_53'): Column<PgBigSerial53, true, true, this>;
     protected bigSerial(name: string, maxBytes: 'max_bytes_64'): Column<PgBigSerial64, true, true, this>;

package/test.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const _1 = require(".");
+const builders_1 = require("./builders");
+const citiesTable_1 = require("./docs/tables/citiesTable");
+const usersTable_1 = require("./docs/tables/usersTable");
 const consoleLogger_1 = require("./logger/consoleLogger");
 // import { Pool } from 'pg';
 // import { DB } from '.';
@@ -19,10 +22,49 @@ const fromTypeFile = (filepath) => {
 (async () => {
     try {
         const db = await new _1.DbConnector()
-            .connectionString('postgresql://postgres@127.0.0.1/migrator')
+            .connectionString('postgresql://postgres@127.0.0.1/drizzle-docs')
             .connect();
         db.useLogger(new consoleLogger_1.default());
-        // const table = new UsersTable(db);
+        const table = new usersTable_1.default(db);
+        const citiesTable = new citiesTable_1.default(db);
+        const res = await table.select().where(builders_1.eq(table.id, 1)).all();
+        console.log(res);
+        // const res1 = await citiesTable.select().leftJoin(
+        //   UsersTable,
+        //   (cities) => cities.userId,
+        //   (users) => users.id,
+        // ).execute();
+        // // eslint-disable-next-line array-callback-return
+        // res1.map((city, user) => {
+        //   console.log(city);
+        //   console.log(user);
+        // });
+        // await table.insertMany([{
+        //   decimalField: 12.4,
+        //   createdAt: new Date(),
+        //   role: 'foo',
+        // },
+        // {
+        //   decimalField: 13.4,
+        //   createdAt: new Date(),
+        //   role: 'foo',
+        // }]).all();
+        // const d = await table.update().where(and([
+        //   or([
+        //     notEq(table.id, 1),
+        //     eq(table.bigIntField, 1)]),
+        //   or([notEq(table.id, 2),
+        //     eq(table.bigIntField, 1),
+        //     and([notEq(table.id, 1),
+        //       eq(table.isArchived, true),
+        //     ]),
+        //   ])])).set({
+        //   // phone: 'updated',
+        //   bigIntField: 1,
+        //   decimalField: 1.2,
+        // }).all();
+        // console.log(d);
+        // await table.delete().where(eq(table.id, 4)).all();
         // const cities = new CitiesTable(db);
         // const d = new UsersToUserGroupsTable(db);
         // SELECT * FROM users WHERE id = $1 and name = $2
@@ -56,7 +98,7 @@ const fromTypeFile = (filepath) => {
         // const d = db.create(UsersTable) as unknown as AbstractTable<any>;
         // const f = ser.generate([d], []);
         // console.log(JSON.stringify(f, null, 2));
-        await _1.drizzle.migrator(db).migrate('drizzle.config.yml');
+        // await drizzle.migrator(db).smigrate('drizzle.config.yml');
         // await drizzle.migrator(db).migrate({ migrationFolder: 'drizzle' });
         // const typesFileNames = fs.readdirSync('/Users/andrewsherman/IdeaProjects/datalayer-orm/src/examples/types');
         // typesFileNames.forEach((filename) => {