pqb 0.18.0 → 0.18.2

package/dist/index.d.ts

@@ -4865,7 +4865,7 @@ declare const raw: <T = unknown>(...args: RawSQLArgs) => RawSQL<ColumnTypeBase<T
     decimal<Precision_1 extends number | undefined = undefined, Scale_1 extends number | undefined = undefined>(precision?: Precision_1 | undefined, scale?: Scale_1 | undefined): DecimalColumn<Precision_1, Scale_1>;
     real(): RealColumn;
     doublePrecision(): DoublePrecisionColumn;
-    identity(options?: TableData.Identity | undefined): IdentityColumn<IntegerColumn>;
+    identity(options?: TableData.Identity | undefined): orchid_core.ColumnWithDefault<IntegerColumn, orchid_core.Expression<ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>>>;
     smallSerial(): SmallSerialColumn;
     serial(): SerialColumn;
     bigSerial(): BigSerialColumn;
@@ -6487,7 +6487,7 @@ declare const columnTypes: {
     decimal<Precision_1 extends number | undefined = undefined, Scale_1 extends number | undefined = undefined>(precision?: Precision_1 | undefined, scale?: Scale_1 | undefined): DecimalColumn<Precision_1, Scale_1>;
     real(): RealColumn;
     doublePrecision(): DoublePrecisionColumn;
-    identity(options?: TableData.Identity): IdentityColumn<IntegerColumn>;
+    identity(options?: TableData.Identity): orchid_core.ColumnWithDefault<IntegerColumn, orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>>>;
     smallSerial(): SmallSerialColumn;
     serial(): SerialColumn;
     bigSerial(): BigSerialColumn;
@@ -6868,7 +6868,7 @@ declare const simplifyColumnDefault: (value?: string) => RawSQL<ColumnTypeBase<u
     decimal<Precision_1 extends number | undefined = undefined, Scale_1 extends number | undefined = undefined>(precision?: Precision_1 | undefined, scale?: Scale_1 | undefined): DecimalColumn<Precision_1, Scale_1>;
     real(): RealColumn;
     doublePrecision(): DoublePrecisionColumn;
-    identity(options?: TableData.Identity | undefined): IdentityColumn<IntegerColumn>;
+    identity(options?: TableData.Identity | undefined): orchid_core.ColumnWithDefault<IntegerColumn, orchid_core.Expression<ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, ColumnDataBase>>>;
     smallSerial(): SmallSerialColumn;
     serial(): SerialColumn;
     bigSerial(): BigSerialColumn;

package/dist/index.js

@@ -806,7 +806,7 @@ const columnCode = (type, t, code, data = type.data, skip) => {
     orchidCore.addCode(code, `.parse(${type.parseFn.toString()})`);
   if (data.as)
     orchidCore.addCode(code, `.as(${data.as.toCode(t)})`);
-  if (data.default !== void 0 && data.default !== null) {
+  if (data.default !== void 0) {
     orchidCore.addCode(code, `.default(${orchidCore.columnDefaultArgumentToCode(t, data.default)})`);
   }
   if (data.indexes) {
@@ -1362,6 +1362,7 @@ class UUIDColumn extends ColumnType {
       this,
       t,
       `uuid()`,
+      // don't output the default default
       data.default instanceof orchidCore.RawSQLBase && data.default._sql === uuidDefaultSQL ? __spreadProps$7(__spreadValues$c({}, data), { default: void 0 }) : data
     );
   }
@@ -1559,7 +1560,9 @@ class JSONColumn extends ColumnType {
   }
   toCode(t) {
     const { schema } = this.data;
-    return columnCode(this, t, `json((t) => ${schema.toCode("t")})`);
+    const schemaCode = orchidCore.toArray(schema.toCode(t));
+    orchidCore.addCode(schemaCode, ",");
+    return columnCode(this, t, [`json((${t}) =>`, schemaCode, ")"]);
   }
 }
 class JSONTextColumn extends ColumnType {