drizzle-orm 0.10.4 → 0.10.8

package/docs/cases/simple_insert.js

@@ -1,7 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-/* eslint-disable @typescript-eslint/no-unused-vars */
-const create_1 = require("../../builders/lowLvlBuilders/create");
 const dbConnector_1 = require("../../db/dbConnector");
 const consoleLogger_1 = require("../../logger/consoleLogger");
 const citiesTable_1 = require("../tables/citiesTable");
@@ -10,19 +8,19 @@ const usersTable_1 = require("../tables/usersTable");
 (async () => {
     try {
         const db = await new dbConnector_1.default()
-            .connectionString('postgresql://postgres@127.0.0.1/drizzle-docs')
+            .connectionString('postgresql://postgres@127.0.0.1/migrator')
             .connect();
         const usersTable = new usersTable_1.default(db);
         const citiesTable = new citiesTable_1.default(db);
         const userGroupsTable = new userGroupsTable_1.default(db);
-        await db.session().execute(create_1.default.table(usersTable).build());
-        await db.session().execute(create_1.default.table(citiesTable).build());
-        await db.session().execute(create_1.default.table(userGroupsTable).build());
+        // await db.session().execute(Create.table(usersTable).build());
+        // await db.session().execute(Create.table(citiesTable).build());
+        // await db.session().execute(Create.table(userGroupsTable).build());
         db.useLogger(new consoleLogger_1.default());
         await usersTable.insert({
             decimalField: 12.4,
             createdAt: new Date(),
-            // role: 'guest',
+            role: 'foo',
         }).execute();
         const insertedCities = await citiesTable.insert({
             foundationDate: new Date(),
@@ -41,11 +39,11 @@ const usersTable_1 = require("../tables/usersTable");
         const conflictInsertedUsers = await usersTable.insertMany([{
                 decimalField: 12.4,
                 createdAt: new Date(),
-                // role: 'guest',
+                role: 'foo',
             }, {
                 decimalField: 32.4,
                 createdAt: new Date(),
-                // role: 'admin',
+                role: 'foo',
                 phone: '+1808',
             }])
             .onConflict((table) => table.phoneIndex, { isArchived: true }).all();

package/docs/cases/simple_join.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint-disable @typescript-eslint/no-unused-vars */
 const __1 = require("../..");
 const builders_1 = require("../../builders");
+const consoleLogger_1 = require("../../logger/consoleLogger");
 const citiesTable_1 = require("../tables/citiesTable");
 const userGroupsTable_1 = require("../tables/userGroupsTable");
 const usersTable_1 = require("../tables/usersTable");
@@ -12,24 +13,25 @@ const usersToUserGroups_1 = require("../tables/usersToUserGroups");
     var _a, _b, _c, _d, _e, _f;
     try {
         const db = await new __1.DbConnector()
-            .connectionString('postgresql://postgres@127.0.0.1/drizzle-docs')
+            .connectionString('postgresql://postgres@127.0.0.1/migrator')
             .connect();
+        db.useLogger(new consoleLogger_1.default());
         const usersTable = new usersTable_1.default(db);
         const citiesTable = new citiesTable_1.default(db);
         const usersToUserGroupsTable = new usersToUserGroups_1.default(db);
         const userGroupsTable = new userGroupsTable_1.default(db);
-        await db.session().execute(__1.Create.table(usersTable).build());
-        await db.session().execute(__1.Create.table(citiesTable).build());
-        await db.session().execute(__1.Create.table(userGroupsTable).build());
-        await db.session().execute(__1.Create.table(usersToUserGroupsTable).build());
+        // await db.session().execute(Create.table(usersTable).build());
+        // await db.session().execute(Create.table(citiesTable).build());
+        // await db.session().execute(Create.table(userGroupsTable).build());
+        // await db.session().execute(Create.table(usersToUserGroupsTable).build());
         const userRes = await usersTable.insertMany([{
                 decimalField: 4.2,
                 createdAt: new Date(),
-                // role: 'guest',
+                role: 'foo',
             }, {
                 decimalField: 5.8,
                 createdAt: new Date(),
-                // role: 'user',
+                role: 'foo',
             }]).all();
         const citiesRes = await citiesTable.insertMany([{
                 foundationDate: new Date(),

package/docs/cases/simple_select.js

@@ -5,17 +5,19 @@ const __1 = require("../..");
 const builders_1 = require("../../builders");
 const order_1 = require("../../builders/highLvlBuilders/order");
 const static_1 = require("../../builders/requestBuilders/where/static");
+const consoleLogger_1 = require("../../logger/consoleLogger");
 const usersTable_1 = require("../tables/usersTable");
 (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 usersTable = new usersTable_1.default(db);
+        db.useLogger(new consoleLogger_1.default());
         // select all
         const allSelect = await usersTable.select().all();
         // select first
-        const firstSelect = await usersTable.select().findOne();
+        const firstSelect = await usersTable.select().all();
         // select using filters
         const eqSelect = await usersTable.select().where(builders_1.eq(usersTable.phone, 'hello')).all();
         const andSelect = await usersTable.select().where(builders_1.and([builders_1.eq(usersTable.phone, 'hello')])).all();

package/docs/cases/simple_update.js

@@ -3,14 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint-disable @typescript-eslint/no-unused-vars */
 const __1 = require("../..");
 const builders_1 = require("../../builders");
+const consoleLogger_1 = require("../../logger/consoleLogger");
 const citiesTable_1 = require("../tables/citiesTable");
 const userGroupsTable_1 = require("../tables/userGroupsTable");
 const usersTable_1 = require("../tables/usersTable");
 (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();
+        db.useLogger(new consoleLogger_1.default());
         const usersTable = new usersTable_1.default(db);
         const citiesTable = new citiesTable_1.default(db);
         const userGroupsTable = new userGroupsTable_1.default(db);
@@ -22,10 +24,11 @@ const usersTable_1 = require("../tables/usersTable");
             .where(builders_1.eq(citiesTable.location, 'USA'))
             .set({ metadata: { population: 1, connection: 'first' } })
             .all();
+        console.log(updatedCities);
         const updatedUserGroup = await userGroupsTable.update()
             .where(builders_1.eq(userGroupsTable.id, 1))
             .set({ description: 'updated description' })
-            .findOne();
+            .all();
     }
     catch (e) {
         console.log(e);

package/docs/tables/usersTable.d.ts

@@ -1,15 +1,16 @@
 import AbstractTable from '../../tables/abstractTable';
-export declare const rolesEnum: import("../../types/type").default<"user" | "guest" | "admin">;
+export declare const rolesEnum: import("../../types/type").default<"foo" | "bar" | "baz">;
 export default class UsersTable extends AbstractTable<UsersTable> {
-    id: import("../..").Column<import("../../columns/types/pgSerial").default, true, true, this>;
-    fullName: import("../..").Column<import("../..").PgText, true, false, this>;
-    phone: import("../..").Column<import("../..").PgVarChar, true, false, this>;
-    media: import("../..").Column<import("../..").PgJsonb<string[]>, true, false, this>;
-    decimalField: import("../..").Column<import("../..").PgBigDecimal, false, false, this>;
-    bigIntField: import("../..").Column<import("../..").PgBigInt, true, true, this>;
-    createdAt: import("../..").Column<import("../..").PgTimestamp, false, false, this>;
-    createdAtWithTimezone: import("../..").Column<import("../../columns/types/pgTimestamptz").default, true, false, this>;
-    isArchived: import("../..").Column<import("../..").PgBoolean, true, false, this>;
+    id: import("../../columns/column").Column<import("../../columns/types/pgSerial").default, true, true, this>;
+    fullName: import("../../columns/column").Column<import("../..").PgText, true, false, this>;
+    phone: import("../../columns/column").Column<import("../..").PgVarChar, true, false, this>;
+    media: import("../../columns/column").Column<import("../..").PgJsonb<string[]>, true, false, this>;
+    decimalField: import("../../columns/column").Column<import("../..").PgBigDecimal, false, false, this>;
+    bigIntField: import("../../columns/column").Column<import("../..").PgBigInt, true, true, this>;
+    role: import("../../columns/column").Column<import("../../columns/types/pgEnum").default<"foo" | "bar" | "baz">, false, false, this>;
+    createdAt: import("../../columns/column").Column<import("../..").PgTimestamp, false, false, this>;
+    updatedAt: import("../../columns/column").Column<import("../..").PgTimestamp, true, false, this>;
+    isArchived: import("../../columns/column").Column<import("../..").PgBoolean, true, false, this>;
     phoneFullNameIndex: import("../../indexes/tableIndex").default;
     phoneIndex: import("../../indexes/tableIndex").default;
     tableName(): string;

package/docs/tables/usersTable.js

@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.rolesEnum = void 0;
 /* eslint-disable max-classes-per-file */
 // import { Defaults } from '../../columns/column';
+const column_1 = require("../../columns/column");
 const abstractTable_1 = require("../../tables/abstractTable");
 const type_1 = require("../../types/type");
 // import { rolesEnum } from '../types/rolesType';
-exports.rolesEnum = type_1.createEnum({ alias: 'test-enum', values: ['user', 'guest', 'admin'] });
+exports.rolesEnum = type_1.createEnum({ alias: 'test-enum', values: ['foo', 'bar', 'baz'] });
 class UsersTable extends abstractTable_1.default {
     constructor() {
         super(...arguments);
@@ -16,10 +17,10 @@ class UsersTable extends abstractTable_1.default {
         this.media = this.jsonb('media');
         this.decimalField = this.decimal('test', { precision: 100, scale: 2 }).notNull();
         this.bigIntField = this.bigint('test1', 'max_bytes_53');
-        // public role = this.type(rolesEnum, 'name_in_table', { notNull: true });
+        this.role = this.type(exports.rolesEnum, 'name_in_table').notNull();
         this.createdAt = this.timestamp('created_at').notNull();
-        this.createdAtWithTimezone = this.timestamptz('created_at_time_zone');
-        // public updatedAt = this.timestamp('updated_at').defaultValue(Defaults.CURRENT_TIMESTAMP);
+        // public createdAtWithTimezone = this.timestamptz('created_at');
+        this.updatedAt = this.timestamp('updated_at').defaultValue(column_1.Defaults.CURRENT_TIMESTAMP);
         this.isArchived = this.bool('is_archived').defaultValue(false);
         this.phoneFullNameIndex = this.index([this.phone, this.fullName]);
         this.phoneIndex = this.uniqueIndex(this.phone);

package/mappers/responseMapper.js

@@ -13,7 +13,7 @@ QueryResponseMapper.map = (mappedServiceToDb, queryResult, joinId) => {
             const column = mappedServiceToDb[key];
             const alias = `${column.getAlias()}${joinId ? `_${joinId}` : ''}`;
             const value = column.getColumnType().selectStrategy(row[alias]);
-            mappedRow[key] = value;
+            mappedRow[key] = value === null ? undefined : value;
         });
         response.push(mappedRow);
     });
@@ -27,7 +27,7 @@ QueryResponseMapper.partialMap = (partial, queryResult, joinId) => {
             const column = partial[key];
             const alias = `${column.getAlias()}${joinId ? `_${joinId}` : ''}`;
             const value = column.getColumnType().selectStrategy(row[alias]);
-            mappedRow[key] = value;
+            mappedRow[key] = value === null ? undefined : value;
         });
         response.push(mappedRow);
     });

package/package.json

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

package/serializer/serializer.js

@@ -39,9 +39,12 @@ class MigrationSerializer {
                             type: value.getColumnType().getDbName(),
                             primaryKey: !!value.primaryKeyName,
                             // unique: !!value.uniqueKeyName,
-                            default: value.getDefaultValue() === null ? undefined : value.getDefaultValue(),
+                            // default: value.getDefaultValue() === null ? undefined : value.getDefaultValue(),
                             notNull: !value.isNullableFlag,
                         };
+                        if (value.getDefaultValue() !== undefined && value.getDefaultValue() !== null) {
+                            columnToReturn[value.getColumnName()].default = value.getDefaultValue();
+                        }
                         if (value.uniqueKeyName) {
                             const indexName = `${value.getParent().tableName()}_${value.getColumnName()}_index`;
                             const indexColumnToReturn = {};

package/test.js

@@ -1,7 +1,6 @@
 "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");
@@ -27,18 +26,53 @@ const fromTypeFile = (filepath) => {
         db.useLogger(new consoleLogger_1.default());
         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);
-        // });
+        // const res = await table.insert({
+        //   decimalField: 12.4,
+        //   createdAt: new Date(),
+        // }).all();
+        // console.log(res);
+        const res1 = await citiesTable.select().leftJoin(usersTable_1.default, (cities) => cities.userId, (users) => users.id).execute();
+        // const res: QueryResult<any> = await db.session().execute('SELECT * FROM users');
+        // eslint-disable-next-line array-callback-return
+        res1.map((city, user) => {
+            console.log(city);
+            console.log(user.decimalField);
+        });
+        // const res = await db.session().execute('SELECT * FROM users WHERE user.id = $1', [1]);
+        // await table.update()
+        // .where({
+        //   id: eq(1),
+        // })
+        // .set({
+        //   phone: 'hello'
+        // })
+        // .all();
+        // await table.select()
+        //   .where({
+        //     and: {
+        //       id: {
+        //         eq: 1,
+        //       },
+        //       phone: {
+        //         notEq: 'hello',
+        //       },
+        //     },
+        //   })
+        //   .all();
+        // await table.select()
+        //   .where({
+        //     and: {
+        //       id: eq(1),
+        //       phone: notEq('hello'),
+        //     },
+        //   })
+        //   .all();
+        // await table.select()
+        //   .where(and([
+        //     eq(table.id, 1),
+        //     notEq(table.phone, 'hello'),
+        //   ]))
+        //   .all();
         // await table.insertMany([{
         //   decimalField: 12.4,
         //   createdAt: new Date(),