pqb 0.11.17 → 0.11.19

package/dist/index.d.ts

@@ -837,6 +837,7 @@ type DbOptions<CT extends ColumnTypesBase> = ({
     autoPreparedStatements?: boolean;
     noPrimaryKey?: NoPrimaryKeyOption;
     snakeCase?: boolean;
+    nowSQL?: string;
 };
 type DbTableOptions = {
     schema?: string;
@@ -884,7 +885,7 @@ type DbResult<CT extends ColumnTypesBase> = Db<string, Record<string, never>, Qu
     adapter: Adapter;
     close: Adapter['close'];
 };
-declare const createDb: <CT extends Record<string, orchid_core.AnyColumnTypeCreator>>({ log, logger, columnTypes: ctOrFn, snakeCase, ...options }: DbOptions<CT>) => DbResult<CT>;
+declare const createDb: <CT extends Record<string, orchid_core.AnyColumnTypeCreator>>({ log, logger, columnTypes: ctOrFn, snakeCase, nowSQL, ...options }: DbOptions<CT>) => DbResult<CT>;
 
 type WithArgsOptions = Omit<WithOptions, 'columns'> & {
     columns?: boolean | string[];
@@ -3408,7 +3409,7 @@ declare const getConstraintKind: (it: TableData.Constraint) => 'constraint' | 'f
 declare const newTableData: () => TableData;
 declare const getTableData: () => TableData;
 declare const resetTableData: (data?: TableData) => void;
-declare const getColumnTypes: <CT extends Record<string, orchid_core.AnyColumnTypeCreator>, Shape extends ColumnsShape>(types: CT, fn: (t: CT) => Shape, data?: TableData) => Shape;
+declare const getColumnTypes: <CT extends Record<string, orchid_core.AnyColumnTypeCreator>, Shape extends ColumnsShape>(types: CT, fn: (t: CT) => Shape, nowSQL: string | undefined, data?: TableData) => Shape;
 declare function text(min: number, max: number): TextColumn;
 type DefaultColumnTypes = typeof columnTypes;
 declare const columnTypes: {

package/dist/index.js

@@ -377,7 +377,7 @@ const isDefaultTimeStamp = (item) => {
   if (item.dataType !== "timestamptz")
     return false;
   const def = item.data.default;
-  return def && orchidCore.isRaw(def) && def.__raw === "now()";
+  return def && orchidCore.isRaw(def) && def.__raw.startsWith("now()");
 };
 const combineCodeElements = (input) => {
   if (typeof input === "string")
@@ -3249,7 +3249,9 @@ const getTableData = () => tableData;
 const resetTableData = (data = newTableData()) => {
   tableData = data;
 };
-const getColumnTypes = (types, fn, data = newTableData()) => {
+const getColumnTypes = (types, fn, nowSQL, data = newTableData()) => {
+  if (nowSQL)
+    orchidCore.setDefaultNowFn(nowSQL);
   resetTableData(data);
   return fn(types);
 };
@@ -3465,9 +3467,9 @@ const columnTypes = __spreadValues$9({
   }
 }, orchidCore.makeTimestampsHelpers(
   makeRegexToFindInSql('\\bupdatedAt\\b"?\\s*='),
-  orchidCore.raw('"updatedAt" = now()'),
+  '"updatedAt"',
   makeRegexToFindInSql('\\bupdated_at\\b"?\\s*='),
-  orchidCore.raw('"updated_at" = now()')
+  '"updated_at"'
 ));
 
 class ColumnsObject extends ColumnType {
@@ -3982,6 +3984,13 @@ const processSelectArg = (q, as, arg, columnAs) => {
           query = value.wrap(value.baseQuery.clone())._jsonAgg(value.query.select[0]);
           value.query.coalesceValue = orchidCore.raw("'[]'");
         } else {
+          if ((returnType === "value" || returnType === "valueOrThrow") && value.query.select) {
+            if (typeof value.query.select[0] === "string") {
+              value.query.select[0] = {
+                selectAs: { r: value.query.select[0] }
+              };
+            }
+          }
           query = value;
         }
         _joinLateral(q, "LEFT JOIN", query, (q2) => q2, key);
@@ -6545,12 +6554,14 @@ const createDb = (_a) => {
     log,
     logger,
     columnTypes: ctOrFn = columnTypes,
-    snakeCase
+    snakeCase,
+    nowSQL
   } = _b, options = __objRest(_b, [
     "log",
     "logger",
     "columnTypes",
-    "snakeCase"
+    "snakeCase",
+    "nowSQL"
   ]);
   var _a2, _b2;
   const adapter = "adapter" in options ? options.adapter : new Adapter(options);
@@ -6582,7 +6593,7 @@ const createDb = (_a) => {
         adapter,
         qb,
         table,
-        typeof shape === "function" ? getColumnTypes(ct, shape) : shape,
+        typeof shape === "function" ? getColumnTypes(ct, shape, nowSQL) : shape,
         ct,
         transactionStorage,
         __spreadValues(__spreadValues({}, commonOptions), options2)