pqb 0.9.1 → 0.9.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pqb",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "description": "Postgres query builder",
   "homepage": "https://orchid-orm.netlify.app/guide/query-builder-setup.html",
   "repository": {

package/src/columnSchema/code.ts

@@ -187,6 +187,8 @@ export const indexToCode = (index: TableData.Index, t: string): Code[] => {
     const options: string[] = [];
     for (const key of optionsKeys) {
       const value = index.options[key as keyof typeof index.options];
+      if (value === null || value === undefined) continue;
+
       options.push(
         `${key}: ${
           typeof value === 'object'
@@ -350,7 +352,6 @@ export const columnIndexesToCode = (
       if (index.opclass) arr.push(`opclass: ${singleQuote(index.opclass)},`);
       if (index.order) arr.push(`order: ${singleQuote(index.order)},`);
       if (index.name) arr.push(`name: ${singleQuote(index.name)},`);
-      if (index.unique) arr.push(`unique: true,`);
       if (index.using) arr.push(`using: ${singleQuote(index.using)},`);
       if (index.include)
         arr.push(

package/src/columnSchema/columnType.ts

@@ -1,7 +1,7 @@
 import { Operator, Operators } from '../columnsOperators';
 import { JSONTypeAny } from './json';
 import { ColumnsShape } from './columnsSchema';
-import { RawExpression, StringKey } from '../common';
+import { raw, RawExpression, StringKey } from '../common';
 import { MaybeArray } from '../utils';
 import { Query } from '../query';
 import { Code } from './code';
@@ -164,7 +164,15 @@ export const instantiateColumn = (
   params: ColumnFromDbParams,
 ): ColumnType => {
   const column = new (klass as unknown as new () => ColumnType)();
-  Object.assign(column.data, params);
+
+  let data;
+  if (params.default !== null && params.default !== undefined) {
+    data = { ...params, default: raw(params.default) };
+  } else {
+    data = params;
+  }
+
+  Object.assign(column.data, data);
   return column as unknown as ColumnType;
 };
 

package/src/columnSchema/dateTime.test.ts

@@ -51,10 +51,13 @@ describe('date time columns', () => {
       assertType<typeof result, string>();
     });
 
-    it('should have toCode', () => {
+    it('should have toCode, ignore default precision', () => {
       expect(new TimestampColumn().toCode('t')).toBe('t.timestamp()');
+
       expect(new TimestampColumn(10).toCode('t')).toBe('t.timestamp(10)');
 
+      expect(new TimestampColumn(6).toCode('t')).toBe('t.timestamp()');
+
       const now = new Date();
       const s = now.toISOString();
       expect(new TimestampColumn().min(now).max(now).toCode('t')).toBe(
@@ -76,10 +79,15 @@ describe('date time columns', () => {
       assertType<typeof result, string>();
     });
 
-    it('should have toCode', () => {
+    it('should have toCode, ignore default precision', () => {
       expect(new TimestampWithTimeZoneColumn().toCode('t')).toBe(
         't.timestampWithTimeZone()',
       );
+
+      expect(new TimestampWithTimeZoneColumn(6).toCode('t')).toBe(
+        't.timestampWithTimeZone()',
+      );
+
       expect(new TimestampWithTimeZoneColumn(10).toCode('t')).toBe(
         't.timestampWithTimeZone(10)',
       );

package/src/columnSchema/dateTime.ts

@@ -92,18 +92,27 @@ export abstract class DateTimeWithTimeZoneBaseClass<
   }
 }
 
+const timestampToCode = <P extends number | undefined>(
+  self: TimestampColumn<P> | TimestampWithTimeZoneColumn<P>,
+  t: string,
+) => {
+  const { dateTimePrecision: p } = self.data;
+  return columnCode(
+    self,
+    t,
+    `${t}.${
+      self instanceof TimestampColumn ? 'timestamp' : 'timestampWithTimeZone'
+    }(${p && p !== 6 ? p : ''})${dateDataToCode(self.data)}`,
+  );
+};
+
 // timestamp [ (p) ] [ without time zone ]	8 bytes	both date and time (no time zone)	4713 BC	294276 AD	1 microsecond
 export class TimestampColumn<
   Precision extends number | undefined = undefined,
 > extends DateTimeBaseClass<Precision> {
   dataType = 'timestamp' as const;
   toCode(t: string): Code {
-    const { dateTimePrecision } = this.data;
-    return columnCode(
-      this,
-      t,
-      `${t}.timestamp(${dateTimePrecision || ''})${dateDataToCode(this.data)}`,
-    );
+    return timestampToCode(this, t);
   }
 }
 
@@ -114,14 +123,7 @@ export class TimestampWithTimeZoneColumn<
   dataType = 'timestamp with time zone' as const;
   baseDataType = 'timestamp' as const;
   toCode(t: string): Code {
-    const { dateTimePrecision } = this.data;
-    return columnCode(
-      this,
-      t,
-      `${t}.timestampWithTimeZone(${dateTimePrecision || ''})${dateDataToCode(
-        this.data,
-      )}`,
-    );
+    return timestampToCode(this, t);
   }
 }