pqb 0.40.11 → 0.41.0

package/dist/index.js

@@ -119,25 +119,25 @@ const sqlFn = (...args) => {
   return (...args2) => new RawSQL(args2, arg);
 };
 
-var __defProp$m = Object.defineProperty;
-var __defProps$d = Object.defineProperties;
-var __getOwnPropDescs$d = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$n = Object.getOwnPropertySymbols;
-var __hasOwnProp$n = Object.prototype.hasOwnProperty;
-var __propIsEnum$n = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$m = (obj, key, value) => key in obj ? __defProp$m(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$m = (a, b) => {
+var __defProp$o = Object.defineProperty;
+var __defProps$e = Object.defineProperties;
+var __getOwnPropDescs$e = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$p = Object.getOwnPropertySymbols;
+var __hasOwnProp$p = Object.prototype.hasOwnProperty;
+var __propIsEnum$p = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$o = (obj, key, value) => key in obj ? __defProp$o(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$o = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$n.call(b, prop))
-      __defNormalProp$m(a, prop, b[prop]);
-  if (__getOwnPropSymbols$n)
-    for (var prop of __getOwnPropSymbols$n(b)) {
-      if (__propIsEnum$n.call(b, prop))
-        __defNormalProp$m(a, prop, b[prop]);
+    if (__hasOwnProp$p.call(b, prop))
+      __defNormalProp$o(a, prop, b[prop]);
+  if (__getOwnPropSymbols$p)
+    for (var prop of __getOwnPropSymbols$p(b)) {
+      if (__propIsEnum$p.call(b, prop))
+        __defNormalProp$o(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$d = (a, b) => __defProps$d(a, __getOwnPropDescs$d(b));
+var __spreadProps$e = (a, b) => __defProps$e(a, __getOwnPropDescs$e(b));
 class ColumnType extends orchidCore.ColumnTypeBase {
   /**
    * Mark the column as a primary key.
@@ -336,13 +336,13 @@ class ColumnType extends orchidCore.ColumnTypeBase {
    */
   searchIndex(...args) {
     return orchidCore.pushColumnData(this, "indexes", {
-      options: __spreadValues$m(__spreadValues$m({}, typeof args[0] === "string" ? args[1] : args[0]), this.dataType === "tsvector" ? { using: "GIN" } : { tsVector: true }),
+      options: __spreadValues$o(__spreadValues$o({}, typeof args[0] === "string" ? args[1] : args[0]), this.dataType === "tsvector" ? { using: "GIN" } : { tsVector: true }),
       name: typeof args[0] === "string" ? args[0] : void 0
     });
   }
   unique(...args) {
     return orchidCore.pushColumnData(this, "indexes", {
-      options: __spreadProps$d(__spreadValues$m({}, typeof args[0] === "string" ? args[1] : args[0]), {
+      options: __spreadProps$e(__spreadValues$o({}, typeof args[0] === "string" ? args[1] : args[0]), {
         unique: true
       }),
       name: typeof args[0] === "string" ? args[0] : void 0
@@ -385,25 +385,25 @@ class ColumnType extends orchidCore.ColumnTypeBase {
   }
 }
 
-var __defProp$l = Object.defineProperty;
-var __defProps$c = Object.defineProperties;
-var __getOwnPropDescs$c = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$m = Object.getOwnPropertySymbols;
-var __hasOwnProp$m = Object.prototype.hasOwnProperty;
-var __propIsEnum$m = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$l = (obj, key, value) => key in obj ? __defProp$l(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$l = (a, b) => {
+var __defProp$n = Object.defineProperty;
+var __defProps$d = Object.defineProperties;
+var __getOwnPropDescs$d = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$o = Object.getOwnPropertySymbols;
+var __hasOwnProp$o = Object.prototype.hasOwnProperty;
+var __propIsEnum$o = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$n = (obj, key, value) => key in obj ? __defProp$n(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$n = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$m.call(b, prop))
-      __defNormalProp$l(a, prop, b[prop]);
-  if (__getOwnPropSymbols$m)
-    for (var prop of __getOwnPropSymbols$m(b)) {
-      if (__propIsEnum$m.call(b, prop))
-        __defNormalProp$l(a, prop, b[prop]);
+    if (__hasOwnProp$o.call(b, prop))
+      __defNormalProp$n(a, prop, b[prop]);
+  if (__getOwnPropSymbols$o)
+    for (var prop of __getOwnPropSymbols$o(b)) {
+      if (__propIsEnum$o.call(b, prop))
+        __defNormalProp$n(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$c = (a, b) => __defProps$c(a, __getOwnPropDescs$c(b));
+var __spreadProps$d = (a, b) => __defProps$d(a, __getOwnPropDescs$d(b));
 const knownDefaults = {
   current_timestamp: "now()",
   "transaction_timestamp()": "now()"
@@ -419,7 +419,7 @@ const simplifyColumnDefault = (value) => {
 const instantiateColumn = (typeFn, params) => {
   const column = typeFn();
   const { dateTimePrecision } = params;
-  Object.assign(column.data, __spreadProps$c(__spreadValues$l({}, params), {
+  Object.assign(column.data, __spreadProps$d(__spreadValues$n({}, params), {
     dateTimePrecision: (
       // 0 is default for date, 6 is default for timestamp
       dateTimePrecision && dateTimePrecision !== 6 ? dateTimePrecision : void 0
@@ -777,8 +777,9 @@ const identityToCode = (identity, dataType) => {
   orchidCore.addCode(code, ")");
   return code;
 };
-const columnCode = (type, ctx, key, code, data = type.data, skip) => {
+const columnCode = (type, ctx, key, code) => {
   var _a;
+  const { data } = type;
   code = orchidCore.toArray(code);
   let prepend = `${ctx.t}.`;
   const keyName = ctx.snakeCase ? orchidCore.toSnakeCase(key) : key;
@@ -809,13 +810,15 @@ const columnCode = (type, ctx, key, code, data = type.data, skip) => {
     orchidCore.addCode(code, ".select(false)");
   if (data.isNullable)
     orchidCore.addCode(code, ".nullable()");
-  if (type.encodeFn && type.encodeFn !== (skip == null ? void 0 : skip.encodeFn))
-    orchidCore.addCode(code, `.encode(${type.encodeFn.toString()})`);
-  if (type.parseFn && type.parseFn !== (skip == null ? void 0 : skip.parseFn) && !("hideFromCode" in type.parseFn))
-    orchidCore.addCode(code, `.parse(${type.parseFn.toString()})`);
+  if (data.encode && data.encode !== data.defaultEncode)
+    orchidCore.addCode(code, `.encode(${data.encode.toString()})`);
+  if (data.parse && data.parse !== data.defaultParse)
+    orchidCore.addCode(code, `.parse(${data.parse.toString()})`);
+  if (type.data.parseNull)
+    orchidCore.addCode(code, `.parseNull(${type.data.parseNull.toString()})`);
   if (data.as)
     orchidCore.addCode(code, `.as(${data.as.toCode(ctx, key)})`);
-  if (data.default !== void 0 && (!ctx.migration || typeof data.default !== "function")) {
+  if (data.default !== void 0 && data.default !== data.defaultDefault && (!ctx.migration || typeof data.default !== "function")) {
     orchidCore.addCode(
       code,
       `.default(${orchidCore.columnDefaultArgumentToCode(ctx.t, data.default)})`
@@ -858,21 +861,73 @@ const getSqlText = (sql) => {
   throw new Error(`Batch SQL is not supported in this query`);
 };
 
-var __defProp$k = Object.defineProperty;
+var __defProp$m = Object.defineProperty;
+var __defProps$c = Object.defineProperties;
+var __getOwnPropDescs$c = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$n = Object.getOwnPropertySymbols;
+var __hasOwnProp$n = Object.prototype.hasOwnProperty;
+var __propIsEnum$n = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$m = (obj, key, value) => key in obj ? __defProp$m(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$m = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp$n.call(b, prop))
+      __defNormalProp$m(a, prop, b[prop]);
+  if (__getOwnPropSymbols$n)
+    for (var prop of __getOwnPropSymbols$n(b)) {
+      if (__propIsEnum$n.call(b, prop))
+        __defNormalProp$m(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps$c = (a, b) => __defProps$c(a, __getOwnPropDescs$c(b));
+const addColumnParserToQuery = (q, key, column) => {
+  var _a;
+  if (column._parse) {
+    ((_a = q.parsers) != null ? _a : q.parsers = {})[key] = column._parse;
+  }
+};
+const setColumnDefaultParse = (column, parse) => {
+  column.data.parse = column.data.defaultParse = parse;
+  column._parse = (input) => input === null ? null : parse(input);
+};
+const setColumnParse = (column, fn, outputSchema) => {
+  const c = Object.create(column);
+  c.outputSchema = outputSchema;
+  c.data = __spreadProps$c(__spreadValues$m({}, column.data), { parse: fn });
+  const { parseNull } = column.data;
+  c._parse = parseNull ? (input) => input === null ? parseNull() : fn(input) : (input) => input === null ? null : fn(input);
+  return c;
+};
+const setColumnParseNull = (column, fn, nullSchema) => {
+  const c = Object.create(column);
+  c.nullSchema = nullSchema;
+  c.data = __spreadProps$c(__spreadValues$m({}, column.data), { parseNull: fn });
+  const { parse } = column.data;
+  c._parse = parse ? (input) => input === null ? fn() : parse(input) : (input) => input === null ? fn() : input;
+  return c;
+};
+const setColumnEncode = (column, fn, inputSchema) => {
+  const c = Object.create(column);
+  c.inputSchema = inputSchema;
+  c.data = __spreadProps$c(__spreadValues$m({}, column.data), { encode: fn });
+  return c;
+};
+
+var __defProp$l = Object.defineProperty;
 var __defProps$b = Object.defineProperties;
 var __getOwnPropDescs$b = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$l = Object.getOwnPropertySymbols;
-var __hasOwnProp$l = Object.prototype.hasOwnProperty;
-var __propIsEnum$l = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$k = (obj, key, value) => key in obj ? __defProp$k(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$k = (a, b) => {
+var __getOwnPropSymbols$m = Object.getOwnPropertySymbols;
+var __hasOwnProp$m = Object.prototype.hasOwnProperty;
+var __propIsEnum$m = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$l = (obj, key, value) => key in obj ? __defProp$l(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$l = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$l.call(b, prop))
-      __defNormalProp$k(a, prop, b[prop]);
-  if (__getOwnPropSymbols$l)
-    for (var prop of __getOwnPropSymbols$l(b)) {
-      if (__propIsEnum$l.call(b, prop))
-        __defNormalProp$k(a, prop, b[prop]);
+    if (__hasOwnProp$m.call(b, prop))
+      __defNormalProp$l(a, prop, b[prop]);
+  if (__getOwnPropSymbols$m)
+    for (var prop of __getOwnPropSymbols$m(b)) {
+      if (__propIsEnum$m.call(b, prop))
+        __defNormalProp$l(a, prop, b[prop]);
     }
   return a;
 };
@@ -965,7 +1020,7 @@ const base = {
     (key, value, ctx, quotedAs) => `NOT ${key} IN ${quoteValue(value, ctx, quotedAs)}`
   )
 };
-const boolean = __spreadProps$b(__spreadValues$k({}, base), {
+const boolean = __spreadProps$b(__spreadValues$l({}, base), {
   and: make(
     (key, value, ctx, quotedAs) => `${key} AND ${value.q.expr.toSQL(ctx, quotedAs)}`
   ),
@@ -973,7 +1028,7 @@ const boolean = __spreadProps$b(__spreadValues$k({}, base), {
     (key, value, ctx, quotedAs) => `(${key}) OR (${value.q.expr.toSQL(ctx, quotedAs)})`
   )
 });
-const numeric = __spreadProps$b(__spreadValues$k({}, base), {
+const numeric = __spreadProps$b(__spreadValues$l({}, base), {
   lt: make(
     (key, value, ctx, quotedAs) => `${key} < ${quoteValue(value, ctx, quotedAs)}`
   ),
@@ -994,7 +1049,7 @@ const numeric = __spreadProps$b(__spreadValues$k({}, base), {
     )}`
   )
 });
-const text = __spreadProps$b(__spreadValues$k({}, base), {
+const text = __spreadProps$b(__spreadValues$l({}, base), {
   contains: make(
     (key, value, ctx, quotedAs) => `${key} ILIKE '%' || ${quoteLikeValue(value, ctx, quotedAs)} || '%'`
   ),
@@ -1016,10 +1071,10 @@ const text = __spreadProps$b(__spreadValues$k({}, base), {
 });
 const encodeJsonPath = (ctx, path) => orchidCore.addValue(ctx.values, `{${Array.isArray(path) ? path.join(", ") : path}}`);
 const jsonPathQueryOp = (key, [path, options], ctx) => `jsonb_path_query_first(${key}, ${orchidCore.addValue(ctx.values, path)}${(options == null ? void 0 : options.vars) ? `, ${orchidCore.addValue(ctx.values, JSON.stringify(options.vars))}${options.silent ? ", true" : ""}` : (options == null ? void 0 : options.silent) ? ", NULL, true" : ""})`;
-const json = __spreadProps$b(__spreadValues$k({}, base), {
+const json = __spreadProps$b(__spreadValues$l({}, base), {
   jsonPathQueryFirst: Object.assign(
     function(path, options) {
-      var _a, _b, _c, _d, _e;
+      var _a, _b, _c;
       const chain = (_b = (_a = this.q).chain) != null ? _b : _a.chain = [];
       chain.push(jsonPathQueryOp, [path, options]);
       if ((_c = this.q.parsers) == null ? void 0 : _c[orchidCore.getValueKey]) {
@@ -1027,8 +1082,7 @@ const json = __spreadProps$b(__spreadValues$k({}, base), {
       }
       if (options == null ? void 0 : options.type) {
         const type = options.type(this.columnTypes);
-        if (type.parseFn)
-          ((_e = (_d = this.q).parsers) != null ? _e : _d.parsers = {})[orchidCore.getValueKey] = type.parseFn;
+        addColumnParserToQuery(this.q, orchidCore.getValueKey, type);
         chain.push = (...args) => {
           chain.push = Array.prototype.push;
           chain.push((s) => `${s}::${type.dataType}`, orchidCore.emptyArray);
@@ -1079,25 +1133,22 @@ const Operators = {
   array: base
 };
 
-var __defProp$j = Object.defineProperty;
-var __defProps$a = Object.defineProperties;
-var __getOwnPropDescs$a = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$k = Object.getOwnPropertySymbols;
-var __hasOwnProp$k = Object.prototype.hasOwnProperty;
-var __propIsEnum$k = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$j = (obj, key, value) => key in obj ? __defProp$j(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$j = (a, b) => {
+var __defProp$k = Object.defineProperty;
+var __getOwnPropSymbols$l = Object.getOwnPropertySymbols;
+var __hasOwnProp$l = Object.prototype.hasOwnProperty;
+var __propIsEnum$l = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$k = (obj, key, value) => key in obj ? __defProp$k(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$k = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$k.call(b, prop))
-      __defNormalProp$j(a, prop, b[prop]);
-  if (__getOwnPropSymbols$k)
-    for (var prop of __getOwnPropSymbols$k(b)) {
-      if (__propIsEnum$k.call(b, prop))
-        __defNormalProp$j(a, prop, b[prop]);
+    if (__hasOwnProp$l.call(b, prop))
+      __defNormalProp$k(a, prop, b[prop]);
+  if (__getOwnPropSymbols$l)
+    for (var prop of __getOwnPropSymbols$l(b)) {
+      if (__propIsEnum$l.call(b, prop))
+        __defNormalProp$k(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$a = (a, b) => __defProps$a(a, __getOwnPropDescs$a(b));
 class TextBaseColumn extends ColumnType {
   constructor(schema, schemaType = schema.stringSchema()) {
     super(schema, schemaType);
@@ -1151,7 +1202,7 @@ class StringColumn extends VarCharColumn {
   }
 }
 const textColumnToCode = (column, ctx, key) => {
-  const data = __spreadValues$j({}, column.data);
+  const data = __spreadValues$k({}, column.data);
   let args = "";
   const hasMax = data.maxArg !== void 0 && data.max === data.maxArg;
   if (data.minArg !== void 0 && data.min === data.minArg || hasMax) {
@@ -1267,19 +1318,20 @@ class MoneyColumn extends ColumnType {
     super(schema, schema.number());
     this.dataType = "money";
     this.operators = Operators.number;
-    this.parseFn = Object.assign(
-      function(input) {
-        return input === null ? input : parseFloat(input.replace(/,/g, "").replace(/\$/g, ""));
-      },
-      {
-        hideFromCode: true
-      }
-    );
+    setColumnDefaultParse(this, moneyParse);
   }
   toCode(ctx, key) {
     return columnCode(this, ctx, key, `money()`);
   }
 }
+const moneyParse = Object.assign(
+  function(input) {
+    return input === null ? input : parseFloat(input.replace(/,/g, "").replace(/\$/g, ""));
+  },
+  {
+    hideFromCode: true
+  }
+);
 class CidrColumn extends ColumnType {
   constructor(schema) {
     super(schema, schema.stringSchema());
@@ -1438,6 +1490,7 @@ class UUIDColumn extends ColumnType {
     super(schema, schema.uuid());
     this.dataType = "uuid";
     this.operators = Operators.text;
+    this.data.defaultDefault = uuidDefault;
   }
   /**
    * see {@link ColumnType.primaryKey}
@@ -1449,15 +1502,7 @@ class UUIDColumn extends ColumnType {
     return column;
   }
   toCode(ctx, key) {
-    const { data } = this;
-    return columnCode(
-      this,
-      ctx,
-      key,
-      `uuid()`,
-      // don't output the default default
-      data.default instanceof orchidCore.RawSQLBase && data.default._sql === uuidDefaultSQL ? __spreadProps$a(__spreadValues$j({}, data), { default: void 0 }) : data
-    );
+    return columnCode(this, ctx, key, `uuid()`);
   }
 }
 class XMLColumn extends ColumnType {
@@ -1484,7 +1529,6 @@ class CitextColumn extends TextBaseColumn {
 const dateTimeEncode = (input) => {
   return typeof input === "number" ? new Date(input) : input;
 };
-const skipDateMethodsFromToCode = { encodeFn: dateTimeEncode };
 class DateBaseColumn extends ColumnType {
   constructor(schema) {
     super(
@@ -1494,9 +1538,9 @@ class DateBaseColumn extends ColumnType {
       schema.stringNumberDate()
     );
     this.operators = Operators.date;
-    this.encodeFn = dateTimeEncode;
     this.asNumber = schema.dateAsNumber;
     this.asDate = schema.dateAsDate;
+    this.data.encode = this.data.defaultEncode = dateTimeEncode;
   }
 }
 class DateColumn extends DateBaseColumn {
@@ -1509,9 +1553,7 @@ class DateColumn extends DateBaseColumn {
       this,
       ctx,
       key,
-      `date()${orchidCore.dateDataToCode(this.data, ctx.migration)}`,
-      this.data,
-      skipDateMethodsFromToCode
+      `date()${orchidCore.dateDataToCode(this.data, ctx.migration)}`
     );
   }
 }
@@ -1549,9 +1591,7 @@ const timestampToCode = (self, ctx, key) => {
       self,
       ctx,
       key,
-      `timestamps${noTz}(${p && p !== 6 ? p : ""}).${defaultTimestamp}${orchidCore.dateDataToCode(self.data, ctx.migration)}`,
-      self.data,
-      skipDateMethodsFromToCode
+      `timestamps${noTz}(${p && p !== 6 ? p : ""}).${defaultTimestamp}${orchidCore.dateDataToCode(self.data, ctx.migration)}`
     );
     self.data.default = def;
     self.data.modifyQuery = modifyQuery;
@@ -1561,9 +1601,7 @@ const timestampToCode = (self, ctx, key) => {
       self,
       ctx,
       key,
-      `${self instanceof TimestampColumn ? "timestampNoTZ" : "timestamp"}(${p && p !== 6 ? p : ""})${orchidCore.dateDataToCode(self.data, ctx.migration)}`,
-      self.data,
-      skipDateMethodsFromToCode
+      `${self instanceof TimestampColumn ? "timestampNoTZ" : "timestamp"}(${p && p !== 6 ? p : ""})${orchidCore.dateDataToCode(self.data, ctx.migration)}`
     );
   }
 };
@@ -1602,9 +1640,7 @@ class TimeColumn extends ColumnType {
       `time(${dateTimePrecision || ""})${orchidCore.dateDataToCode(
         this.data,
         ctx.migration
-      )}`,
-      this.data,
-      skipDateMethodsFromToCode
+      )}`
     );
   }
 }
@@ -1622,9 +1658,7 @@ class IntervalColumn extends ColumnType {
       this,
       ctx,
       key,
-      `interval(${[fields && `'${fields}'`, precision && String(precision)].filter((part) => part).join(", ")})`,
-      this.data,
-      skipDateMethodsFromToCode
+      `interval(${[fields && `'${fields}'`, precision && String(precision)].filter((part) => part).join(", ")})`
     );
   }
   toSQL() {
@@ -1642,28 +1676,26 @@ class BooleanColumn extends ColumnType {
     this.dataType = "bool";
     this.operators = Operators.boolean;
     this.data.alias = "boolean";
+    this.data.parseItem = parseItem;
   }
   toCode(ctx, key) {
     return columnCode(this, ctx, key, "boolean()");
   }
-  parseItem(input) {
-    return input[0] === "t";
-  }
 }
+const parseItem = (input) => input[0] === "t";
 
-const encodeFn = (x) => x === null ? x : JSON.stringify(x);
-const toCodeSkip = { encodeFn };
+const encode = (x) => x === null ? x : JSON.stringify(x);
 class JSONColumn extends ColumnType {
-  constructor() {
-    super(...arguments);
+  constructor(schema, inputType) {
+    super(schema, inputType);
     this.dataType = "jsonb";
     this.operators = Operators.json;
+    this.data.encode = this.data.defaultEncode = encode;
   }
   toCode(ctx, key) {
-    return columnCode(this, ctx, key, `json()`, this.data, toCodeSkip);
+    return columnCode(this, ctx, key, `json()`);
   }
 }
-JSONColumn.prototype.encodeFn = encodeFn;
 class JSONTextColumn extends ColumnType {
   constructor(schema) {
     super(schema, schema.stringSchema());
@@ -1671,7 +1703,7 @@ class JSONTextColumn extends ColumnType {
     this.operators = Operators.text;
   }
   toCode(ctx, key) {
-    return columnCode(this, ctx, key, `jsonText()`, this.data, toCodeSkip);
+    return columnCode(this, ctx, key, `jsonText()`);
   }
 }
 
@@ -1684,10 +1716,7 @@ const queryTypeWithLimitOne = {
 const isQueryReturnsAll = (q) => !q.q.returnType || q.q.returnType === "all";
 
 const applySqlComputed = (ctx, q, computed, as, quotedAs) => {
-  var _a;
-  const parser = computed.result.value.parseFn;
-  if (parser)
-    ((_a = q.parsers) != null ? _a : q.parsers = {})[as] = parser;
+  addColumnParserToQuery(q, as, computed.result.value);
   return computed.toSQL(ctx, quotedAs);
 };
 function simpleColumnToSQL(ctx, q, key, column, quotedAs) {
@@ -1747,7 +1776,7 @@ const columnWithDotToSql = (ctx, data, shape, column, index, quotedAs, select) =
   if (key === "*") {
     return ((_a = data.joinedShapes) == null ? void 0 : _a[table]) ? select ? `row_to_json("${table}".*)` : `"${table}".*` : column;
   }
-  const tableName = ((_b = data.joinOverrides) == null ? void 0 : _b[table]) || table;
+  const tableName = ((_b = data.aliases) == null ? void 0 : _b[table]) || table;
   const quoted = `"${table}"`;
   const col = quoted === quotedAs ? shape[key] : (_d = (_c = data.joinedShapes) == null ? void 0 : _c[tableName]) == null ? void 0 : _d[key];
   if (col) {
@@ -1798,7 +1827,7 @@ const tableColumnToSqlWithAs = (ctx, data, column, table, key, as, quotedAs, sel
     }
     return column;
   }
-  const tableName = ((_b = data.joinOverrides) == null ? void 0 : _b[table]) || table;
+  const tableName = ((_b = data.aliases) == null ? void 0 : _b[table]) || table;
   const quoted = `"${table}"`;
   const col = quoted === quotedAs ? data.shape[key] : (_c = data.joinedShapes) == null ? void 0 : _c[tableName][key];
   if (col) {
@@ -2139,9 +2168,9 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
         const item = value;
         const joinAs = `"${getJoinItemSource(item.joinFrom)}"`;
         const { on } = item;
-        const q = item.useOuterJoinOverrides ? {
+        const q = item.useOuterAliases ? {
           joinedShapes: query.joinedShapes,
-          joinOverrides: query.outerJoinOverrides,
+          aliases: query.outerAliases,
           shape: query.shape
         } : query;
         ands.push(
@@ -2269,25 +2298,25 @@ const pushIn = (ctx, query, ands, quotedAs, arg) => {
   ands.push(`${multiple ? `(${columnsSql})` : columnsSql} IN ${value}`);
 };
 
-var __defProp$i = Object.defineProperty;
-var __defProps$9 = Object.defineProperties;
-var __getOwnPropDescs$9 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$j = Object.getOwnPropertySymbols;
-var __hasOwnProp$j = Object.prototype.hasOwnProperty;
-var __propIsEnum$j = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$i = (obj, key, value) => key in obj ? __defProp$i(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$i = (a, b) => {
+var __defProp$j = Object.defineProperty;
+var __defProps$a = Object.defineProperties;
+var __getOwnPropDescs$a = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$k = Object.getOwnPropertySymbols;
+var __hasOwnProp$k = Object.prototype.hasOwnProperty;
+var __propIsEnum$k = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$j = (obj, key, value) => key in obj ? __defProp$j(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$j = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$j.call(b, prop))
-      __defNormalProp$i(a, prop, b[prop]);
-  if (__getOwnPropSymbols$j)
-    for (var prop of __getOwnPropSymbols$j(b)) {
-      if (__propIsEnum$j.call(b, prop))
-        __defNormalProp$i(a, prop, b[prop]);
+    if (__hasOwnProp$k.call(b, prop))
+      __defNormalProp$j(a, prop, b[prop]);
+  if (__getOwnPropSymbols$k)
+    for (var prop of __getOwnPropSymbols$k(b)) {
+      if (__propIsEnum$k.call(b, prop))
+        __defNormalProp$j(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$9 = (a, b) => __defProps$9(a, __getOwnPropDescs$9(b));
+var __spreadProps$a = (a, b) => __defProps$a(a, __getOwnPropDescs$a(b));
 const processJoinItem = (ctx, table, query, args, quotedAs) => {
   let target;
   let on;
@@ -2349,8 +2378,8 @@ const processJoinItem = (ctx, table, query, args, quotedAs) => {
       const whereSql = whereToSql(
         ctx,
         q,
-        __spreadProps$9(__spreadValues$i({}, q.q), {
-          joinedShapes: __spreadProps$9(__spreadValues$i(__spreadValues$i({}, query.joinedShapes), q.q.joinedShapes), {
+        __spreadProps$a(__spreadValues$j({}, q.q), {
+          joinedShapes: __spreadProps$a(__spreadValues$j(__spreadValues$j({}, query.joinedShapes), q.q.joinedShapes), {
             [table.q.as || table.table]: table.q.shape
           })
         }),
@@ -2453,7 +2482,7 @@ const pushJoinSql = (ctx, table, query, quotedAs) => {
       const { aliasValue } = ctx;
       ctx.aliasValue = true;
       const as = item[2];
-      sql = `${item[0]} LATERAL (${getSqlText(q.toSQL(ctx))}) "${((_a = query.joinOverrides) == null ? void 0 : _a[as]) || as}" ON true`;
+      sql = `${item[0]} LATERAL (${getSqlText(q.toSQL(ctx))}) "${((_a = query.aliases) == null ? void 0 : _a[as]) || as}" ON true`;
       ctx.aliasValue = aliasValue;
     } else {
       const { target, on = "true" } = processJoinItem(
@@ -2482,7 +2511,8 @@ const skipQueryKeysForSubQuery = {
   or: true,
   returnType: true,
   joinedShapes: true,
-  returnsOne: true
+  returnsOne: true,
+  aliases: true
 };
 const getIsJoinSubQuery = (query) => {
   const {
@@ -2497,25 +2527,25 @@ const getIsJoinSubQuery = (query) => {
   return false;
 };
 
-var __defProp$h = Object.defineProperty;
-var __defProps$8 = Object.defineProperties;
-var __getOwnPropDescs$8 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$i = Object.getOwnPropertySymbols;
-var __hasOwnProp$i = Object.prototype.hasOwnProperty;
-var __propIsEnum$i = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$h = (obj, key, value) => key in obj ? __defProp$h(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$h = (a, b) => {
+var __defProp$i = Object.defineProperty;
+var __defProps$9 = Object.defineProperties;
+var __getOwnPropDescs$9 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$j = Object.getOwnPropertySymbols;
+var __hasOwnProp$j = Object.prototype.hasOwnProperty;
+var __propIsEnum$j = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$i = (obj, key, value) => key in obj ? __defProp$i(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$i = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$i.call(b, prop))
-      __defNormalProp$h(a, prop, b[prop]);
-  if (__getOwnPropSymbols$i)
-    for (var prop of __getOwnPropSymbols$i(b)) {
-      if (__propIsEnum$i.call(b, prop))
-        __defNormalProp$h(a, prop, b[prop]);
+    if (__hasOwnProp$j.call(b, prop))
+      __defNormalProp$i(a, prop, b[prop]);
+  if (__getOwnPropSymbols$j)
+    for (var prop of __getOwnPropSymbols$j(b)) {
+      if (__propIsEnum$j.call(b, prop))
+        __defNormalProp$i(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$8 = (a, b) => __defProps$8(a, __getOwnPropDescs$8(b));
+var __spreadProps$9 = (a, b) => __defProps$9(a, __getOwnPropDescs$9(b));
 const processJoinArgs = (joinTo, first, args, joinSubQuery, whereExists) => {
   var _a;
   if (typeof first === "string") {
@@ -2552,13 +2582,13 @@ const processJoinArgs = (joinTo, first, args, joinSubQuery, whereExists) => {
         logger: joinToQ.logger
       };
       j.baseQuery = j;
-      const joinedShapes = __spreadProps$8(__spreadValues$h({}, joinToQ.joinedShapes), {
+      const joinedShapes = __spreadProps$9(__spreadValues$i({}, joinToQ.joinedShapes), {
         [joinToQ.as || joinTo.table]: joinTo.shape
       });
       const r = args[0](
         makeJoinQueryBuilder(
           j,
-          j.q.joinedShapes ? __spreadValues$h(__spreadValues$h({}, j.q.joinedShapes), joinedShapes) : joinedShapes,
+          j.q.joinedShapes ? __spreadValues$i(__spreadValues$i({}, j.q.joinedShapes), joinedShapes) : joinedShapes,
           joinTo
         )
       );
@@ -2585,16 +2615,16 @@ const processJoinArgs = (joinTo, first, args, joinSubQuery, whereExists) => {
         pushQueryArray(q, "or", query.or);
       }
       if (query.scopes) {
-        q.q.scopes = __spreadValues$h(__spreadValues$h({}, q.q.scopes), query.scopes);
+        q.q.scopes = __spreadValues$i(__spreadValues$i({}, q.q.scopes), query.scopes);
       }
     }
-    const joinedShapes = __spreadProps$8(__spreadValues$h({}, joinTo.q.joinedShapes), {
+    const joinedShapes = __spreadProps$9(__spreadValues$i({}, joinTo.q.joinedShapes), {
       [joinTo.q.as || joinTo.table]: joinTo.shape
     });
     const r = args0(
       makeJoinQueryBuilder(
         q,
-        q.q.joinedShapes ? __spreadValues$h(__spreadValues$h({}, q.q.joinedShapes), joinedShapes) : joinedShapes,
+        q.q.joinedShapes ? __spreadValues$i(__spreadValues$i({}, q.q.joinedShapes), joinedShapes) : joinedShapes,
         joinTo
       )
     );
@@ -2649,25 +2679,25 @@ const _queryNone = (q) => {
 };
 const isQueryNone = (q) => q.then === noneMethods.then;
 
-var __defProp$g = Object.defineProperty;
-var __defProps$7 = Object.defineProperties;
-var __getOwnPropDescs$7 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$h = Object.getOwnPropertySymbols;
-var __hasOwnProp$h = Object.prototype.hasOwnProperty;
-var __propIsEnum$h = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$g = (obj, key, value) => key in obj ? __defProp$g(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$g = (a, b) => {
+var __defProp$h = Object.defineProperty;
+var __defProps$8 = Object.defineProperties;
+var __getOwnPropDescs$8 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$i = Object.getOwnPropertySymbols;
+var __hasOwnProp$i = Object.prototype.hasOwnProperty;
+var __propIsEnum$i = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$h = (obj, key, value) => key in obj ? __defProp$h(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$h = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$h.call(b, prop))
-      __defNormalProp$g(a, prop, b[prop]);
-  if (__getOwnPropSymbols$h)
-    for (var prop of __getOwnPropSymbols$h(b)) {
-      if (__propIsEnum$h.call(b, prop))
-        __defNormalProp$g(a, prop, b[prop]);
+    if (__hasOwnProp$i.call(b, prop))
+      __defNormalProp$h(a, prop, b[prop]);
+  if (__getOwnPropSymbols$i)
+    for (var prop of __getOwnPropSymbols$i(b)) {
+      if (__propIsEnum$i.call(b, prop))
+        __defNormalProp$h(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$7 = (a, b) => __defProps$7(a, __getOwnPropDescs$7(b));
+var __spreadProps$8 = (a, b) => __defProps$8(a, __getOwnPropDescs$8(b));
 const _join = (query, require2, type, first, args) => {
   var _a, _b, _c, _d;
   let joinKey;
@@ -2709,13 +2739,10 @@ const _join = (query, require2, type, first, args) => {
       computeds = w == null ? void 0 : w.computeds;
       if (shape) {
         if (!require2)
-          shape = __spreadValues$g({}, shape);
-        parsers = {};
+          shape = __spreadValues$h({}, shape);
+        const arg = { parsers: {} };
         for (const key in shape) {
-          const parser = shape[key].parseFn;
-          if (parser) {
-            parsers[key] = parser;
-          }
+          addColumnParserToQuery(arg, key, shape[key]);
         }
       }
     }
@@ -2813,7 +2840,7 @@ const _joinLateral = (self, type, arg, cb, as) => {
         t.table = arg;
         t.shape = w.shape;
         t.computeds = w.computeds;
-        t.q = __spreadProps$7(__spreadValues$g({}, t.q), {
+        t.q = __spreadProps$8(__spreadValues$h({}, t.q), {
           shape: w.shape
         });
         t.baseQuery = t;
@@ -2871,19 +2898,8 @@ class ArrayColumn extends ColumnType {
     super(schema, inputType, outputType, queryType);
     this.dataType = "array";
     this.operators = Operators.array;
-    this.parseFn = Object.assign(
-      (source) => {
-        if (!source)
-          return source;
-        const entries = [];
-        parsePostgresArray(source, entries, this.data.item.parseItem);
-        return entries;
-      },
-      {
-        hideFromCode: true
-      }
-    );
     item.data.isNullable = true;
+    setColumnDefaultParse(this, (input) => parse.call(this, input));
     this.data.item = item instanceof ArrayColumn ? item.data.item : item;
     this.data.name = item.data.name;
     this.data.arrayDims = item instanceof ArrayColumn ? item.data.arrayDims + 1 : 1;
@@ -2908,6 +2924,11 @@ class ArrayColumn extends ColumnType {
     return columnCode(this, ctx, key, code);
   }
 }
+const parse = function(source) {
+  const entries = [];
+  parsePostgresArray(source, entries, this.data.item.data.parseItem);
+  return entries;
+};
 const parsePostgresArray = (source, entries, transform) => {
   let pos = 0;
   if (source[0] === "[") {
@@ -3025,8 +3046,8 @@ class SmallIntColumn extends IntegerBaseColumn {
   constructor(schema) {
     super(schema);
     this.dataType = "int2";
-    this.parseItem = parseInt;
     this.data.alias = "smallint";
+    this.data.parseItem = parseInt;
   }
   toCode(ctx, key) {
     return intToCode(this, ctx, key, "smallint");
@@ -3039,8 +3060,8 @@ class IntegerColumn extends IntegerBaseColumn {
   constructor(schema) {
     super(schema);
     this.dataType = "int4";
-    this.parseItem = parseInt;
     this.data.alias = "integer";
+    this.data.parseItem = parseInt;
   }
   toCode(ctx, key) {
     return intToCode(this, ctx, key, "integer");
@@ -3066,8 +3087,8 @@ class RealColumn extends NumberBaseColumn {
   constructor(schema) {
     super(schema, schema.number());
     this.dataType = "float4";
-    this.parseItem = parseFloat;
     this.data.alias = "real";
+    this.data.parseItem = parseFloat;
   }
   toCode(ctx, key) {
     return columnCode(
@@ -3092,9 +3113,9 @@ class SmallSerialColumn extends IntegerBaseColumn {
   constructor(schema) {
     super(schema);
     this.dataType = "int2";
-    this.parseItem = parseInt;
     this.data.int = true;
     this.data.alias = "smallSerial";
+    this.data.parseItem = parseInt;
   }
   toSQL() {
     return "smallserial";
@@ -3116,9 +3137,9 @@ class SerialColumn extends IntegerBaseColumn {
   constructor(schema) {
     super(schema);
     this.dataType = "int4";
-    this.parseItem = parseInt;
     this.data.int = true;
     this.data.alias = "serial";
+    this.data.parseItem = parseInt;
   }
   toSQL() {
     return "serial";
@@ -3150,29 +3171,31 @@ class BigSerialColumn extends NumberAsStringBaseColumn {
   }
 }
 
-const parseDateToNumber = (value) => value ? Date.parse(value) : value;
-const parseDateToDate = (value) => value ? new Date(value) : value;
-parseDateToNumber.hideFromCode = parseDateToDate.hideFromCode = true;
+const parseDateToDate = (value) => new Date(value);
 const defaultSchemaConfig = {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   parse(fn) {
-    return Object.assign(Object.create(this), {
-      parseFn: fn,
-      parseItem: fn
-    });
+    return setColumnParse(this, fn);
+  },
+  parseNull(fn) {
+    return setColumnParseNull(this, fn);
   },
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   encode(fn) {
-    return Object.assign(Object.create(this), {
-      encodeFn: fn
-    });
+    return orchidCore.setColumnData(this, "encode", fn);
   },
   asType() {
     return this;
   },
   dateAsNumber() {
-    return this.parse(parseDateToNumber);
+    const c = this.parse(Date.parse);
+    c.data.defaultParse = Date.parse;
+    return c;
   },
   dateAsDate() {
-    return this.parse(parseDateToDate);
+    const c = this.parse(parseDateToDate);
+    c.data.defaultParse = parseDateToDate;
+    return c;
   },
   enum(dataType, type) {
     return new EnumColumn(defaultSchemaConfig, dataType, type, void 0);
@@ -3302,25 +3325,25 @@ class QueryLog {
   }
 }
 
-var __defProp$f = Object.defineProperty;
-var __defProps$6 = Object.defineProperties;
-var __getOwnPropDescs$6 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$g = Object.getOwnPropertySymbols;
-var __hasOwnProp$g = Object.prototype.hasOwnProperty;
-var __propIsEnum$g = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$f = (obj, key, value) => key in obj ? __defProp$f(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$f = (a, b) => {
+var __defProp$g = Object.defineProperty;
+var __defProps$7 = Object.defineProperties;
+var __getOwnPropDescs$7 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$h = Object.getOwnPropertySymbols;
+var __hasOwnProp$h = Object.prototype.hasOwnProperty;
+var __propIsEnum$h = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$g = (obj, key, value) => key in obj ? __defProp$g(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$g = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$g.call(b, prop))
-      __defNormalProp$f(a, prop, b[prop]);
-  if (__getOwnPropSymbols$g)
-    for (var prop of __getOwnPropSymbols$g(b)) {
-      if (__propIsEnum$g.call(b, prop))
-        __defNormalProp$f(a, prop, b[prop]);
+    if (__hasOwnProp$h.call(b, prop))
+      __defNormalProp$g(a, prop, b[prop]);
+  if (__getOwnPropSymbols$h)
+    for (var prop of __getOwnPropSymbols$h(b)) {
+      if (__propIsEnum$h.call(b, prop))
+        __defNormalProp$g(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$6 = (a, b) => __defProps$6(a, __getOwnPropDescs$6(b));
+var __spreadProps$7 = (a, b) => __defProps$7(a, __getOwnPropDescs$7(b));
 const commitSql$1 = {
   text: "COMMIT"
 };
@@ -3485,7 +3508,7 @@ const runAfterCommit = async (afterCommit, result) => {
       let r = 0;
       for (let i = 0, len = afterCommit.length; i < len; i += 3) {
         for (const fn of afterCommit[i + 2]) {
-          resultsWithNames.push(__spreadProps$6(__spreadValues$f({}, hookResults[r++]), {
+          resultsWithNames.push(__spreadProps$7(__spreadValues$g({}, hookResults[r++]), {
             name: fn.name
           }));
         }
@@ -3547,25 +3570,25 @@ const finalizeNestedHookSelect = (batches, returnType, tempColumns, renames, key
   }
 };
 
-var __defProp$e = Object.defineProperty;
-var __defProps$5 = Object.defineProperties;
-var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$f = Object.getOwnPropertySymbols;
-var __hasOwnProp$f = Object.prototype.hasOwnProperty;
-var __propIsEnum$f = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$e = (obj, key, value) => key in obj ? __defProp$e(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$e = (a, b) => {
+var __defProp$f = Object.defineProperty;
+var __defProps$6 = Object.defineProperties;
+var __getOwnPropDescs$6 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$g = Object.getOwnPropertySymbols;
+var __hasOwnProp$g = Object.prototype.hasOwnProperty;
+var __propIsEnum$g = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$f = (obj, key, value) => key in obj ? __defProp$f(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$f = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$f.call(b, prop))
-      __defNormalProp$e(a, prop, b[prop]);
-  if (__getOwnPropSymbols$f)
-    for (var prop of __getOwnPropSymbols$f(b)) {
-      if (__propIsEnum$f.call(b, prop))
-        __defNormalProp$e(a, prop, b[prop]);
+    if (__hasOwnProp$g.call(b, prop))
+      __defNormalProp$f(a, prop, b[prop]);
+  if (__getOwnPropSymbols$g)
+    for (var prop of __getOwnPropSymbols$g(b)) {
+      if (__propIsEnum$g.call(b, prop))
+        __defNormalProp$f(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
+var __spreadProps$6 = (a, b) => __defProps$6(a, __getOwnPropDescs$6(b));
 class ComputedColumn {
   constructor(kind, deps, fn) {
     this.kind = kind;
@@ -3582,7 +3605,7 @@ const applyComputedColumns = (q, fn) => {
   for (const key in computed) {
     const item = computed[key];
     if (item instanceof ComputedColumn) {
-      q.q.computeds = __spreadProps$5(__spreadValues$e({}, q.q.computeds), { [key]: item });
+      q.q.computeds = __spreadProps$6(__spreadValues$f({}, q.q.computeds), { [key]: item });
     } else {
       const data = (q.shape[key] = item.result.value || UnknownColumn.instance).data;
       data.computed = item;
@@ -3692,25 +3715,25 @@ const saveBatchComputed = (key, result, res, blanks) => {
   }
 };
 
-var __defProp$d = Object.defineProperty;
-var __defProps$4 = Object.defineProperties;
-var __getOwnPropDescs$4 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$e = Object.getOwnPropertySymbols;
-var __hasOwnProp$e = Object.prototype.hasOwnProperty;
-var __propIsEnum$e = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$d = (obj, key, value) => key in obj ? __defProp$d(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$d = (a, b) => {
+var __defProp$e = Object.defineProperty;
+var __defProps$5 = Object.defineProperties;
+var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$f = Object.getOwnPropertySymbols;
+var __hasOwnProp$f = Object.prototype.hasOwnProperty;
+var __propIsEnum$f = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$e = (obj, key, value) => key in obj ? __defProp$e(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$e = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$e.call(b, prop))
-      __defNormalProp$d(a, prop, b[prop]);
-  if (__getOwnPropSymbols$e)
-    for (var prop of __getOwnPropSymbols$e(b)) {
-      if (__propIsEnum$e.call(b, prop))
-        __defNormalProp$d(a, prop, b[prop]);
+    if (__hasOwnProp$f.call(b, prop))
+      __defNormalProp$e(a, prop, b[prop]);
+  if (__getOwnPropSymbols$f)
+    for (var prop of __getOwnPropSymbols$f(b)) {
+      if (__propIsEnum$f.call(b, prop))
+        __defNormalProp$e(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
+var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
 const queryMethodByReturnType = {
   undefined: "query",
   all: "query",
@@ -3954,7 +3977,7 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
             if (hookResults.some((result2) => result2.status === "rejected")) {
               _afterCommitError(
                 result,
-                hookResults.map((result2, i) => __spreadProps$4(__spreadValues$d({}, result2), {
+                hookResults.map((result2, i) => __spreadProps$5(__spreadValues$e({}, result2), {
                   name: afterCommitHooks[i].name
                 })),
                 q.q.catchAfterCommitError
@@ -4196,7 +4219,7 @@ const filterResult = (q, returnType, queryResult, result, tempColumns, hasAfterH
       return row;
     } else {
       if (hasAfterHook)
-        row = __spreadValues$d({}, row);
+        row = __spreadValues$e({}, row);
       for (const column of tempColumns) {
         delete row[column];
       }
@@ -4239,7 +4262,7 @@ const filterAllResult = (result, tempColumns, hasAfterHook) => {
   if (tempColumns == null ? void 0 : tempColumns.size) {
     if (hasAfterHook) {
       return result.map((data) => {
-        const record = __spreadValues$d({}, data);
+        const record = __spreadValues$e({}, data);
         for (const key of tempColumns) {
           delete record[key];
         }
@@ -4256,29 +4279,28 @@ const filterAllResult = (result, tempColumns, hasAfterHook) => {
   return result;
 };
 
-var __defProp$c = Object.defineProperty;
-var __defProps$3 = Object.defineProperties;
-var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$d = Object.getOwnPropertySymbols;
-var __hasOwnProp$d = Object.prototype.hasOwnProperty;
-var __propIsEnum$d = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$c = (obj, key, value) => key in obj ? __defProp$c(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$c = (a, b) => {
+var __defProp$d = Object.defineProperty;
+var __defProps$4 = Object.defineProperties;
+var __getOwnPropDescs$4 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$e = Object.getOwnPropertySymbols;
+var __hasOwnProp$e = Object.prototype.hasOwnProperty;
+var __propIsEnum$e = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$d = (obj, key, value) => key in obj ? __defProp$d(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$d = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$d.call(b, prop))
-      __defNormalProp$c(a, prop, b[prop]);
-  if (__getOwnPropSymbols$d)
-    for (var prop of __getOwnPropSymbols$d(b)) {
-      if (__propIsEnum$d.call(b, prop))
-        __defNormalProp$c(a, prop, b[prop]);
+    if (__hasOwnProp$e.call(b, prop))
+      __defNormalProp$d(a, prop, b[prop]);
+  if (__getOwnPropSymbols$e)
+    for (var prop of __getOwnPropSymbols$e(b)) {
+      if (__propIsEnum$e.call(b, prop))
+        __defNormalProp$d(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$3 = (a, b) => __defProps$3(a, __getOwnPropDescs$3(b));
+var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
 const addParserForRawExpression = (q, key, raw) => {
-  const type = raw.result.value;
-  if (type == null ? void 0 : type.parseFn)
-    orchidCore.setParserToQuery(q.q, key, type.parseFn);
+  if (raw.result.value)
+    addColumnParserToQuery(q.q, key, raw.result.value);
 };
 const addParsersForSelectJoined = (q, arg, as = arg) => {
   var _a, _b, _c, _d;
@@ -4496,11 +4518,12 @@ const collectNestedSelectBatches = (batches, rows, path, last) => {
 };
 const emptyArrSQL = new RawSQL("'[]'");
 const processSelectArg = (q, as, arg, columnAs) => {
-  var _a, _b, _c, _d;
+  var _a, _b;
   if (typeof arg === "string") {
     return setParserForSelectedString(q, arg, as, columnAs);
   }
   const selectAs = {};
+  let aliases;
   for (const key in arg) {
     let value = arg[key];
     if (typeof value === "function") {
@@ -4535,17 +4558,11 @@ const processSelectArg = (q, as, arg, columnAs) => {
             query = value;
           }
         }
-        let asOverride = key;
-        if ((_a = value.q.joinedShapes) == null ? void 0 : _a[key]) {
-          let suffix = 2;
-          const joinOverrides = (_c = (_b = q.q).joinOverrides) != null ? _c : _b.joinOverrides = {};
-          while (joinOverrides[asOverride = `${key}${suffix}`]) {
-            suffix++;
-          }
-          joinOverrides[asOverride] = asOverride;
-          joinOverrides[key] = asOverride;
-        }
+        const asOverride = (_a = value.q.aliases[key]) != null ? _a : key;
         value.q.joinedForSelect = asOverride;
+        if (asOverride !== key) {
+          aliases = __spreadProps$4(__spreadValues$d({}, q.q.aliases), { [key]: asOverride });
+        }
         _joinLateral(
           q,
           value.q.innerJoinLateral ? "JOIN" : "LEFT JOIN",
@@ -4553,10 +4570,12 @@ const processSelectArg = (q, as, arg, columnAs) => {
           (q2) => q2,
           key
         );
-      } else if (((_d = value.q) == null ? void 0 : _d.subQuery) && value.q.expr) {
+      } else if (((_b = value.q) == null ? void 0 : _b.subQuery) && value.q.expr) {
         value = value.q.expr;
       }
     }
+    if (aliases)
+      q.q.aliases = aliases;
     selectAs[key] = addParserForSelectItem(
       q,
       as,
@@ -4601,7 +4620,7 @@ const setParserForSelectedString = (q, arg, as, columnAs) => {
         for (const column2 of computed.deps) {
           map.set(column2, { select: `${table}.${column2}` });
         }
-        q.q.selectedComputeds = __spreadProps$3(__spreadValues$c({}, q.q.selectedComputeds), {
+        q.q.selectedComputeds = __spreadProps$4(__spreadValues$d({}, q.q.selectedComputeds), {
           [column]: computed
         });
         return;
@@ -4625,7 +4644,7 @@ const handleComputed = (q, computeds, column) => {
     for (const column2 of computed.deps) {
       map.set(column2, { select: column2 });
     }
-    q.q.selectedComputeds = __spreadProps$3(__spreadValues$c({}, q.q.selectedComputeds), { [column]: computed });
+    q.q.selectedComputeds = __spreadProps$4(__spreadValues$d({}, q.q.selectedComputeds), { [column]: computed });
     return;
   }
   return column;
@@ -4823,10 +4842,43 @@ function _queryGetOptional(self, arg) {
   return _get(self, "value", arg);
 }
 
+var __defProp$c = Object.defineProperty;
+var __defProps$3 = Object.defineProperties;
+var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$d = Object.getOwnPropertySymbols;
+var __hasOwnProp$d = Object.prototype.hasOwnProperty;
+var __propIsEnum$d = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$c = (obj, key, value) => key in obj ? __defProp$c(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$c = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp$d.call(b, prop))
+      __defNormalProp$c(a, prop, b[prop]);
+  if (__getOwnPropSymbols$d)
+    for (var prop of __getOwnPropSymbols$d(b)) {
+      if (__propIsEnum$d.call(b, prop))
+        __defNormalProp$c(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps$3 = (a, b) => __defProps$3(a, __getOwnPropDescs$3(b));
 const _queryAs = (self, as) => {
-  self.q.as = as;
+  const { q } = self;
+  q.as = as;
+  q.aliases = __spreadProps$3(__spreadValues$c({}, q.aliases), {
+    [as]: q.aliases ? _queryResolveAlias(q.aliases, as) : as
+  });
   return self;
 };
+const _queryResolveAlias = (aliases, as) => {
+  if (!aliases[as])
+    return as;
+  let suffix = 2;
+  let privateAs;
+  while (aliases[privateAs = as + suffix]) {
+    suffix++;
+  }
+  return privateAs;
+};
 class AsMethods {
   /**
    * Sets table alias:
@@ -4873,7 +4925,6 @@ function queryFrom(self, arg) {
     data.as || (data.as = "t");
   } else if (Array.isArray(arg)) {
     const { shape } = data;
-    const parsers = (_c = data.parsers) != null ? _c : data.parsers = {};
     for (const item of arg) {
       if (typeof item === "string") {
         const w = data.withShapes[item];
@@ -4881,13 +4932,15 @@ function queryFrom(self, arg) {
         if (w.computeds)
           data.computeds = __spreadValues$b(__spreadValues$b({}, data.computeds), w.computeds);
         for (const key in w.shape) {
-          if (w.shape[key].parseFn) {
-            parsers[key] = w.shape[key].parseFn;
-          }
+          addColumnParserToQuery(
+            self,
+            key,
+            w.shape[key]
+          );
         }
       } else if (!orchidCore.isExpression(item)) {
         Object.assign(shape, getShapeFromSelect(item, true));
-        Object.assign(parsers, item.q.parsers);
+        Object.assign((_c = data.parsers) != null ? _c : data.parsers = {}, item.q.parsers);
       }
     }
   } else {
@@ -6192,14 +6245,14 @@ const makeRegexToFindInSql = (value) => {
   return new RegExp(`${value}(?=(?:[^']*'[^']*')*[^']*$)`, "g");
 };
 const resolveSubQueryCallback = (q, cb) => {
-  const { subQuery, relChain, outerJoinOverrides } = q.q;
+  const { subQuery, relChain, outerAliases } = q.q;
   q.q.subQuery = 1;
   q.q.relChain = void 0;
-  q.q.outerJoinOverrides = q.q.joinOverrides;
+  q.q.outerAliases = q.q.aliases;
   const result = cb(q);
   q.q.subQuery = subQuery;
   q.q.relChain = relChain;
-  q.q.outerJoinOverrides = outerJoinOverrides;
+  q.q.outerAliases = outerAliases;
   return result;
 };
 const joinSubQuery = (q, sub) => {
@@ -6251,45 +6304,46 @@ class PostgisGeographyPointColumn extends ColumnType {
     super(schema, schema.geographyPointSchema());
     this.dataType = "geography(Point)";
     this.operators = Operators.any;
+    setColumnDefaultParse(this, defaultParse);
+    this.data.encode = this.data.defaultEncode = defaultEncode;
   }
   static isDefaultPoint(typmod) {
     return typmodType(typmod) === "Point" && typmodSrid(typmod) === defaultSrid;
   }
-  parseFn(input) {
-    if (!input)
-      return null;
-    const bytes = new Uint8Array(20);
-    for (let i = 0; i < 40; i += 2) {
-      bytes[i / 2] = parseInt(input.slice(10 + i, 12 + i), 16);
-    }
-    const view = new DataView(bytes.buffer);
-    const srid = view.getUint32(0, true);
-    const lon = view.getFloat64(4, true);
-    const lat = view.getFloat64(12, true);
-    return srid === defaultSrid ? { lon, lat } : {
-      lon,
-      lat,
-      srid
-    };
-  }
-  encodeFn({ srid = defaultSrid, lon, lat }) {
-    const arr = new Uint8Array(25);
-    const view = new DataView(arr.buffer);
-    view.setInt8(0, 1);
-    view.setInt8(1, 1);
-    view.setInt8(4, 32);
-    view.setUint32(5, srid, true);
-    view.setFloat64(9, lon, true);
-    view.setFloat64(17, lat, true);
-    return uint8ArrToHex(arr);
-  }
   toCode(ctx, key) {
-    return columnCode(this, ctx, key, `geography.point()`, this.data, {
-      encodeFn: PostgisGeographyPointColumn.prototype.encodeFn,
-      parseFn: PostgisGeographyPointColumn.prototype.parseFn
-    });
-  }
-}
+    return columnCode(this, ctx, key, `geography.point()`);
+  }
+}
+const defaultParse = (input) => {
+  const bytes = new Uint8Array(20);
+  for (let i = 0; i < 40; i += 2) {
+    bytes[i / 2] = parseInt(input.slice(10 + i, 12 + i), 16);
+  }
+  const view = new DataView(bytes.buffer);
+  const srid = view.getUint32(0, true);
+  const lon = view.getFloat64(4, true);
+  const lat = view.getFloat64(12, true);
+  return srid === defaultSrid ? { lon, lat } : {
+    lon,
+    lat,
+    srid
+  };
+};
+const defaultEncode = ({
+  srid = defaultSrid,
+  lon,
+  lat
+}) => {
+  const arr = new Uint8Array(25);
+  const view = new DataView(arr.buffer);
+  view.setInt8(0, 1);
+  view.setInt8(1, 1);
+  view.setInt8(4, 32);
+  view.setUint32(5, srid, true);
+  view.setFloat64(9, lon, true);
+  view.setFloat64(17, lat, true);
+  return uint8ArrToHex(arr);
+};
 const typmodGetType = (typmod) => (typmod & 252) >> 2;
 const lwtypeName = (type) => [
   "Unknown",
@@ -6766,10 +6820,7 @@ class FnExpression extends orchidCore.Expression {
     query.q.returnsOne = true;
     query.q.getColumn = value;
     query.q.select = [this];
-    const { parseFn } = value;
-    if (parseFn) {
-      orchidCore.setParserToQuery(query.q, orchidCore.getValueKey, parseFn);
-    }
+    addColumnParserToQuery(query.q, orchidCore.getValueKey, value);
   }
   // Builds function SQL.
   makeSQL(ctx, quotedAs) {
@@ -6859,18 +6910,14 @@ const isSelectingCount = (q) => {
   const { expr } = q.q;
   return expr instanceof FnExpression && expr.fn === "count" && expr.args[0] === "*";
 };
-const int = new IntegerColumn(defaultSchemaConfig);
-int.parseItem = int.parseFn = (input) => parseInt(input);
-const nullableInt = new IntegerColumn(defaultSchemaConfig);
-nullableInt.parseItem = nullableInt.parseFn = (input) => input === null ? null : parseInt(input);
-const nullableFloat = new RealColumn(defaultSchemaConfig);
-nullableFloat.parseItem = nullableFloat.parseFn = (input) => input === null ? null : parseFloat(input);
+const int = new IntegerColumn(defaultSchemaConfig).parse(parseInt);
+const float = new RealColumn(defaultSchemaConfig).parse(parseFloat);
 const stringAsNumber = new NumberAsStringBaseColumn(
   defaultSchemaConfig
 );
 const numericResultColumn = (q, arg) => {
   const type = typeof arg === "string" ? _getSelectableColumn(q, arg) : arg.result.value;
-  return type instanceof NumberBaseColumn ? nullableFloat : stringAsNumber;
+  return type instanceof NumberBaseColumn ? float : stringAsNumber;
 };
 class AggregateMethods {
   /**
@@ -7332,7 +7379,7 @@ class AggregateMethods {
    * @param over - OVER clause config
    */
   rowNumber(over) {
-    return makeFnExpression(this, nullableInt, "row_number", orchidCore.emptyArray, {
+    return makeFnExpression(this, int, "row_number", orchidCore.emptyArray, {
       over
     });
   }
@@ -7355,7 +7402,7 @@ class AggregateMethods {
    * @param over - OVER clause config
    */
   rank(over) {
-    return makeFnExpression(this, nullableInt, "rank", orchidCore.emptyArray, {
+    return makeFnExpression(this, int, "rank", orchidCore.emptyArray, {
       over
     });
   }
@@ -7378,7 +7425,7 @@ class AggregateMethods {
    * @param over - OVER clause config
    */
   denseRank(over) {
-    return makeFnExpression(this, nullableInt, "dense_rank", orchidCore.emptyArray, {
+    return makeFnExpression(this, int, "dense_rank", orchidCore.emptyArray, {
       over
     });
   }
@@ -7401,7 +7448,7 @@ class AggregateMethods {
    * @param over - OVER clause config
    */
   percentRank(over) {
-    return makeFnExpression(this, nullableInt, "percent_rank", orchidCore.emptyArray, {
+    return makeFnExpression(this, int, "percent_rank", orchidCore.emptyArray, {
       over
     });
   }
@@ -7424,7 +7471,7 @@ class AggregateMethods {
    * @param over - OVER clause config
    */
   cumeDist(over) {
-    return makeFnExpression(this, nullableFloat, "cume_dist", orchidCore.emptyArray, {
+    return makeFnExpression(this, float, "cume_dist", orchidCore.emptyArray, {
       over
     });
   }
@@ -7508,7 +7555,7 @@ const processCreateItem = (q, item, rowIndex, ctx, encoders) => {
       }
       if (!ctx.columns.has(key) && (shape[key] && !shape[key].data.computed || shape === anyShape) && item[key] !== void 0) {
         ctx.columns.set(key, ctx.columns.size);
-        encoders[key] = (_c = shape[key]) == null ? void 0 : _c.encodeFn;
+        encoders[key] = (_c = shape[key]) == null ? void 0 : _c.data.encode;
       }
     }
   }
@@ -9353,7 +9400,7 @@ const pushQueryOnForOuter = (q, joinFrom, joinTo, ...on) => {
     ON: {
       joinTo: joinFrom,
       joinFrom: joinTo,
-      useOuterJoinOverrides: true,
+      useOuterAliases: true,
       on
     }
   });
@@ -9762,7 +9809,7 @@ const resolveCallbacksInArgs = (q, args) => {
       qb.q = getClonedQueryData(q.q);
       qb.q.and = qb.q.or = qb.q.scopes = void 0;
       qb.q.subQuery = 1;
-      qb.q.outerJoinOverrides = qb.q.joinOverrides;
+      qb.q.outerAliases = qb.q.aliases;
       args[i] = resolveSubQueryCallback(qb, arg);
     }
   }
@@ -10656,7 +10703,7 @@ const _queryUpdate = (query, arg) => {
             set[key] = new RawSQL(`(SELECT * FROM "${as}")`);
           }
         } else {
-          const encode = shape[key].encodeFn;
+          const encode = shape[key].data.encode;
           if (encode)
             set[key] = encode(value);
         }
@@ -12749,9 +12796,9 @@ class Db {
     for (const key in shape) {
       const column = shape[key];
       column.data.key = key;
-      if (column.parseFn) {
+      if (column._parse) {
         hasParsers = true;
-        parsers[key] = column.parseFn;
+        parsers[key] = column._parse;
       }
       if (column.data.name) {
         prepareSelectAll = true;
@@ -12777,10 +12824,9 @@ class Db {
           arr.push(key);
         if (!column.data.runtimeDefault) {
           const {
-            data: { default: def },
-            encodeFn
+            data: { default: def, encode }
           } = column;
-          column.data.runtimeDefault = encodeFn ? () => encodeFn(def()) : def;
+          column.data.runtimeDefault = encode ? () => encode(def()) : def;
         }
       }
     }
@@ -13349,6 +13395,7 @@ exports._queryJoinOnJsonPathEquals = _queryJoinOnJsonPathEquals;
 exports._queryJoinOrOn = _queryJoinOrOn;
 exports._queryOr = _queryOr;
 exports._queryOrNot = _queryOrNot;
+exports._queryResolveAlias = _queryResolveAlias;
 exports._queryRows = _queryRows;
 exports._querySelect = _querySelect;
 exports._queryTake = _queryTake;
@@ -13365,6 +13412,7 @@ exports._queryWhereNotOneOf = _queryWhereNotOneOf;
 exports._queryWhereNotSql = _queryWhereNotSql;
 exports._queryWhereOneOf = _queryWhereOneOf;
 exports._queryWhereSql = _queryWhereSql;
+exports.addColumnParserToQuery = addColumnParserToQuery;
 exports.addParserForRawExpression = addParserForRawExpression;
 exports.addParserForSelectItem = addParserForSelectItem;
 exports.addQueryOn = addQueryOn;
@@ -13439,6 +13487,10 @@ exports.referencesArgsToCode = referencesArgsToCode;
 exports.resolveSubQueryCallback = resolveSubQueryCallback;
 exports.rollbackSql = rollbackSql$1;
 exports.saveSearchAlias = saveSearchAlias;
+exports.setColumnDefaultParse = setColumnDefaultParse;
+exports.setColumnEncode = setColumnEncode;
+exports.setColumnParse = setColumnParse;
+exports.setColumnParseNull = setColumnParseNull;
 exports.setParserForSelectedString = setParserForSelectedString;
 exports.setQueryObjectValue = setQueryObjectValue;
 exports.setQueryOperators = setQueryOperators;