pqb 0.39.4 → 0.40.1

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { ExpressionTypeMethod, Expression, RawSQLBase, emptyObject, isTemplateLiteralArgs, ColumnTypeBase, setColumnData, pushColumnData, quoteObjectKey, toArray, singleQuote, addCode, singleQuoteArray, objectHasValues, toSnakeCase, columnDefaultArgumentToCode, columnErrorMessagesToCode, getValueKey, emptyArray, addValue, isExpression, joinTruthy, numberDataToCode, stringDataToCode, getDefaultLanguage, dateDataToCode, pushOrNewArrayToObject, returnArg as returnArg$1, noop, arrayDataToCode, logColors, applyTransforms, callWithThis, setParserToQuery, isRawSQL, pushOrNewArray, setDefaultNowFn, setDefaultLanguage, makeTimestampsHelpers, setCurrentColumnName, setAdapterConnectRetry, isObjectEmpty, ValExpression, applyMixins, snakeCaseKey } from 'orchid-core';
+import { ExpressionTypeMethod, Expression, RawSQLBase, emptyObject, isTemplateLiteralArgs, ColumnTypeBase, setColumnData, pushColumnData, quoteObjectKey, toArray, singleQuote, addCode, singleQuoteArray, objectHasValues, toSnakeCase, columnDefaultArgumentToCode, columnErrorMessagesToCode, getValueKey, emptyArray, addValue, isExpression, joinTruthy, stringDataToCode, getDefaultLanguage, dateDataToCode, pushOrNewArrayToObject, returnArg as returnArg$1, noop, arrayDataToCode, numberDataToCode, logColors, applyTransforms, callWithThis, setParserToQuery, isRawSQL, pushOrNewArray, setDefaultNowFn, setDefaultLanguage, makeTimestampsHelpers, setCurrentColumnName, setAdapterConnectRetry, isObjectEmpty, ValExpression, applyMixins, snakeCaseKey } from 'orchid-core';
 import pg from 'pg';
 import { inspect } from 'node:util';
 import { AsyncLocalStorage } from 'node:async_hooks';
@@ -1077,193 +1077,6 @@ const Operators = {
   array: base
 };
 
-class NumberBaseColumn extends ColumnType {
-  constructor() {
-    super(...arguments);
-    this.operators = Operators.number;
-  }
-}
-class IntegerBaseColumn extends NumberBaseColumn {
-  constructor(schema) {
-    super(schema, schema.int());
-    this.data.int = true;
-  }
-}
-class NumberAsStringBaseColumn extends ColumnType {
-  constructor(schema) {
-    super(schema, schema.stringSchema());
-    this.operators = Operators.number;
-  }
-}
-class DecimalColumn extends NumberAsStringBaseColumn {
-  constructor(schema, numericPrecision, numericScale) {
-    super(schema);
-    this.operators = Operators.number;
-    this.dataType = "numeric";
-    this.data.numericPrecision = numericPrecision;
-    this.data.numericScale = numericScale;
-    this.data.alias = "decimal";
-  }
-  toCode(ctx, key) {
-    const { numericPrecision, numericScale } = this.data;
-    return columnCode(
-      this,
-      ctx,
-      key,
-      `decimal(${numericPrecision || ""}${numericScale ? `, ${numericScale}` : ""})`
-    );
-  }
-  toSQL() {
-    const { numericPrecision, numericScale } = this.data;
-    return joinTruthy(
-      this.dataType,
-      numericPrecision ? numericScale ? `(${numericPrecision}, ${numericScale})` : `(${numericPrecision})` : void 0
-    );
-  }
-}
-const skipNumberMethods = { int: true };
-const intToCode = (column, ctx, key, alias) => {
-  let code;
-  if (column.data.identity) {
-    code = identityToCode(column.data.identity, alias);
-  } else {
-    code = [`${alias}()`];
-  }
-  addCode(
-    code,
-    numberDataToCode(column.data, ctx.migration, skipNumberMethods)
-  );
-  return columnCode(column, ctx, key, code);
-};
-class SmallIntColumn extends IntegerBaseColumn {
-  constructor(schema) {
-    super(schema);
-    this.dataType = "int2";
-    this.parseItem = parseInt;
-    this.data.alias = "smallint";
-  }
-  toCode(ctx, key) {
-    return intToCode(this, ctx, key, "smallint");
-  }
-  identity(options = {}) {
-    return setColumnData(this, "identity", options);
-  }
-}
-class IntegerColumn extends IntegerBaseColumn {
-  constructor(schema) {
-    super(schema);
-    this.dataType = "int4";
-    this.parseItem = parseInt;
-    this.data.alias = "integer";
-  }
-  toCode(ctx, key) {
-    return intToCode(this, ctx, key, "integer");
-  }
-  identity(options = {}) {
-    return setColumnData(this, "identity", options);
-  }
-}
-class BigIntColumn extends NumberAsStringBaseColumn {
-  constructor(schema) {
-    super(schema);
-    this.dataType = "int8";
-    this.data.alias = "bigint";
-  }
-  toCode(ctx, key) {
-    return intToCode(this, ctx, key, "bigint");
-  }
-  identity(options = {}) {
-    return setColumnData(this, "identity", options);
-  }
-}
-class RealColumn extends NumberBaseColumn {
-  constructor(schema) {
-    super(schema, schema.number());
-    this.dataType = "float4";
-    this.parseItem = parseFloat;
-    this.data.alias = "real";
-  }
-  toCode(ctx, key) {
-    return columnCode(
-      this,
-      ctx,
-      key,
-      `real()${numberDataToCode(this.data, ctx.migration)}`
-    );
-  }
-}
-class DoublePrecisionColumn extends NumberAsStringBaseColumn {
-  constructor(schema) {
-    super(schema);
-    this.dataType = "float8";
-    this.data.alias = "doublePrecision";
-  }
-  toCode(ctx, key) {
-    return columnCode(this, ctx, key, `doublePrecision()`);
-  }
-}
-class SmallSerialColumn extends IntegerBaseColumn {
-  constructor(schema) {
-    super(schema);
-    this.dataType = "int2";
-    this.parseItem = parseInt;
-    this.data.int = true;
-    this.data.alias = "smallSerial";
-  }
-  toSQL() {
-    return "smallserial";
-  }
-  toCode(ctx, key) {
-    return columnCode(
-      this,
-      ctx,
-      key,
-      `smallSerial()${numberDataToCode(
-        this.data,
-        ctx.migration,
-        skipNumberMethods
-      )}`
-    );
-  }
-}
-class SerialColumn extends IntegerBaseColumn {
-  constructor(schema) {
-    super(schema);
-    this.dataType = "int4";
-    this.parseItem = parseInt;
-    this.data.int = true;
-    this.data.alias = "serial";
-  }
-  toSQL() {
-    return "serial";
-  }
-  toCode(ctx, key) {
-    return columnCode(
-      this,
-      ctx,
-      key,
-      `serial()${numberDataToCode(
-        this.data,
-        ctx.migration,
-        skipNumberMethods
-      )}`
-    );
-  }
-}
-class BigSerialColumn extends NumberAsStringBaseColumn {
-  constructor(schema) {
-    super(schema);
-    this.dataType = "int8";
-    this.data.alias = "bigint";
-  }
-  toSQL() {
-    return "bigserial";
-  }
-  toCode(ctx, key) {
-    return columnCode(this, ctx, key, `bigSerial()`);
-  }
-}
-
 var __defProp$j = Object.defineProperty;
 var __defProps$a = Object.defineProperties;
 var __getOwnPropDescs$a = Object.getOwnPropertyDescriptors;
@@ -1447,13 +1260,14 @@ class CircleColumn extends ColumnType {
     return columnCode(this, ctx, key, `circle()`);
   }
 }
-class MoneyColumn extends NumberBaseColumn {
+class MoneyColumn extends ColumnType {
   constructor(schema) {
     super(schema, schema.stringSchema());
     this.dataType = "money";
+    this.operators = Operators.number;
     this.parseFn = Object.assign(
       function(input) {
-        return parseFloat(input.replace(/,/g, "").replace(/\$/g, ""));
+        return input === null ? input : parseFloat(input.replace(/,/g, "").replace(/\$/g, ""));
       },
       {
         hideFromCode: true
@@ -3019,6 +2833,8 @@ class ArrayColumn extends ColumnType {
     this.operators = Operators.array;
     this.parseFn = Object.assign(
       (source) => {
+        if (!source)
+          return source;
         const entries = [];
         parsePostgresArray(source, entries, this.data.item.parseItem);
         return entries;
@@ -3107,6 +2923,193 @@ const parsePostgresArray = (source, entries, transform) => {
   return pos;
 };
 
+class NumberBaseColumn extends ColumnType {
+  constructor() {
+    super(...arguments);
+    this.operators = Operators.number;
+  }
+}
+class IntegerBaseColumn extends NumberBaseColumn {
+  constructor(schema) {
+    super(schema, schema.int());
+    this.data.int = true;
+  }
+}
+class NumberAsStringBaseColumn extends ColumnType {
+  constructor(schema) {
+    super(schema, schema.stringSchema());
+    this.operators = Operators.number;
+  }
+}
+class DecimalColumn extends NumberAsStringBaseColumn {
+  constructor(schema, numericPrecision, numericScale) {
+    super(schema);
+    this.operators = Operators.number;
+    this.dataType = "numeric";
+    this.data.numericPrecision = numericPrecision;
+    this.data.numericScale = numericScale;
+    this.data.alias = "decimal";
+  }
+  toCode(ctx, key) {
+    const { numericPrecision, numericScale } = this.data;
+    return columnCode(
+      this,
+      ctx,
+      key,
+      `decimal(${numericPrecision || ""}${numericScale ? `, ${numericScale}` : ""})`
+    );
+  }
+  toSQL() {
+    const { numericPrecision, numericScale } = this.data;
+    return joinTruthy(
+      this.dataType,
+      numericPrecision ? numericScale ? `(${numericPrecision}, ${numericScale})` : `(${numericPrecision})` : void 0
+    );
+  }
+}
+const skipNumberMethods = { int: true };
+const intToCode = (column, ctx, key, alias) => {
+  let code;
+  if (column.data.identity) {
+    code = identityToCode(column.data.identity, alias);
+  } else {
+    code = [`${alias}()`];
+  }
+  addCode(
+    code,
+    numberDataToCode(column.data, ctx.migration, skipNumberMethods)
+  );
+  return columnCode(column, ctx, key, code);
+};
+class SmallIntColumn extends IntegerBaseColumn {
+  constructor(schema) {
+    super(schema);
+    this.dataType = "int2";
+    this.parseItem = parseInt;
+    this.data.alias = "smallint";
+  }
+  toCode(ctx, key) {
+    return intToCode(this, ctx, key, "smallint");
+  }
+  identity(options = {}) {
+    return setColumnData(this, "identity", options);
+  }
+}
+class IntegerColumn extends IntegerBaseColumn {
+  constructor(schema) {
+    super(schema);
+    this.dataType = "int4";
+    this.parseItem = parseInt;
+    this.data.alias = "integer";
+  }
+  toCode(ctx, key) {
+    return intToCode(this, ctx, key, "integer");
+  }
+  identity(options = {}) {
+    return setColumnData(this, "identity", options);
+  }
+}
+class BigIntColumn extends NumberAsStringBaseColumn {
+  constructor(schema) {
+    super(schema);
+    this.dataType = "int8";
+    this.data.alias = "bigint";
+  }
+  toCode(ctx, key) {
+    return intToCode(this, ctx, key, "bigint");
+  }
+  identity(options = {}) {
+    return setColumnData(this, "identity", options);
+  }
+}
+class RealColumn extends NumberBaseColumn {
+  constructor(schema) {
+    super(schema, schema.number());
+    this.dataType = "float4";
+    this.parseItem = parseFloat;
+    this.data.alias = "real";
+  }
+  toCode(ctx, key) {
+    return columnCode(
+      this,
+      ctx,
+      key,
+      `real()${numberDataToCode(this.data, ctx.migration)}`
+    );
+  }
+}
+class DoublePrecisionColumn extends NumberAsStringBaseColumn {
+  constructor(schema) {
+    super(schema);
+    this.dataType = "float8";
+    this.data.alias = "doublePrecision";
+  }
+  toCode(ctx, key) {
+    return columnCode(this, ctx, key, `doublePrecision()`);
+  }
+}
+class SmallSerialColumn extends IntegerBaseColumn {
+  constructor(schema) {
+    super(schema);
+    this.dataType = "int2";
+    this.parseItem = parseInt;
+    this.data.int = true;
+    this.data.alias = "smallSerial";
+  }
+  toSQL() {
+    return "smallserial";
+  }
+  toCode(ctx, key) {
+    return columnCode(
+      this,
+      ctx,
+      key,
+      `smallSerial()${numberDataToCode(
+        this.data,
+        ctx.migration,
+        skipNumberMethods
+      )}`
+    );
+  }
+}
+class SerialColumn extends IntegerBaseColumn {
+  constructor(schema) {
+    super(schema);
+    this.dataType = "int4";
+    this.parseItem = parseInt;
+    this.data.int = true;
+    this.data.alias = "serial";
+  }
+  toSQL() {
+    return "serial";
+  }
+  toCode(ctx, key) {
+    return columnCode(
+      this,
+      ctx,
+      key,
+      `serial()${numberDataToCode(
+        this.data,
+        ctx.migration,
+        skipNumberMethods
+      )}`
+    );
+  }
+}
+class BigSerialColumn extends NumberAsStringBaseColumn {
+  constructor(schema) {
+    super(schema);
+    this.dataType = "int8";
+    this.data.alias = "bigint";
+  }
+  toSQL() {
+    return "bigserial";
+  }
+  toCode(ctx, key) {
+    return columnCode(this, ctx, key, `bigSerial()`);
+  }
+}
+
 const parseDateToNumber = (value) => value ? Date.parse(value) : value;
 const parseDateToDate = (value) => value ? new Date(value) : value;
 parseDateToNumber.hideFromCode = parseDateToDate.hideFromCode = true;
@@ -3177,30 +3180,10 @@ const defaultSchemaConfig = {
   timestamp: (precision) => new TimestampTZColumn(defaultSchemaConfig, precision)
 };
 
-const singleQuoteRegex = /'/g;
-const doubleQuoteRegex = /"/g;
-const quoteValue = (value) => {
+const quoteValue = (value, nested = false) => {
   const type = typeof value;
-  if (type === "number")
+  if (type === "number" || type === "bigint")
     return String(value);
-  else if (type === "string")
-    return `"${value.replace(doubleQuoteRegex, '\\"').replace(singleQuoteRegex, "''")}"`;
-  else if (type === "boolean")
-    return value ? "true" : "false";
-  else if (value instanceof Date)
-    return `"${value.toISOString()}"`;
-  else if (Array.isArray(value))
-    return quoteArray(value);
-  else if (value === null || value === void 0)
-    return "NULL";
-  else
-    return `"${JSON.stringify(value).replace(doubleQuoteRegex, '\\"').replace(singleQuoteRegex, "''")}"`;
-};
-const quoteArray = (array) => `'{${array.map(quoteValue).join(",")}}'`;
-const quote = (value) => {
-  const type = typeof value;
-  if (type === "number")
-    return `${value}`;
   else if (type === "string")
     return quoteString(value);
   else if (type === "boolean")
@@ -3208,15 +3191,14 @@ const quote = (value) => {
   else if (value instanceof Date)
     return `'${value.toISOString()}'`;
   else if (Array.isArray(value))
-    return quoteArray(value);
+    return `${nested ? "" : "ARRAY"}[${value.map((el) => quoteValue(el, true)).join(",")}]`;
   else if (value === null || value === void 0)
     return "NULL";
   else
-    return `'${JSON.stringify(value).replace(singleQuoteRegex, "''")}'`;
-};
-const quoteString = (value) => {
-  return `'${value.replace(singleQuoteRegex, "''")}'`;
+    return quoteString(JSON.stringify(value));
 };
+const quote = (value) => quoteValue(value);
+const quoteString = (value) => `'${value.replaceAll("'", "''")}'`;
 
 const makeMessage = (colors, timeColor, time, sqlColor, sql, valuesColor, values) => {
   const elapsed = process.hrtime(time);