pqb 0.4.5 → 0.4.7

package/dist/index.js

@@ -119,33 +119,6 @@ class ColumnType {
   }
 }
 
-const raw = (...args) => {
-  if (typeof args[0] === "string") {
-    return {
-      __raw: args[0],
-      __values: args.slice(1)
-    };
-  } else {
-    return {
-      __column: args[0],
-      __raw: args[1],
-      __values: args.slice(2)
-    };
-  }
-};
-const isRaw = (obj) => "__raw" in obj;
-const getRaw = (raw2, values) => {
-  values.push(...raw2.__values);
-  return raw2.__raw;
-};
-const getRawSql = (raw2) => {
-  return raw2.__raw;
-};
-const EMPTY_OBJECT = {};
-const getQueryParsers = (q) => {
-  return q.query.parsers || q.columnsParsers;
-};
-
 const singleQuoteRegex = /'/g;
 const doubleQuoteRegex = /"/g;
 const quoteValue$1 = (value) => {
@@ -184,6 +157,23 @@ const quote = (value) => {
     return `'${JSON.stringify(value).replace(singleQuoteRegex, "''")}'`;
 };
 
+const raw = (sql, ...values) => ({
+  __raw: sql,
+  __values: values
+});
+const isRaw = (obj) => "__raw" in obj;
+const getRaw = (raw2, values) => {
+  values.push(...raw2.__values);
+  return raw2.__raw;
+};
+const getRawSql = (raw2) => {
+  return raw2.__raw;
+};
+const EMPTY_OBJECT = {};
+const getQueryParsers = (q) => {
+  return q.query.parsers || q.columnsParsers;
+};
+
 const q = (sql) => `"${sql}"`;
 const qc = (column, quotedAs) => quotedAs ? `${quotedAs}.${q(column)}` : column;
 const quoteFullColumn = (fullColumn, quotedAs) => {
@@ -4766,7 +4756,7 @@ class Json {
   _json() {
     const q = this._wrap(this.__model.clone());
     q._getOptional(
-      raw(
+      this.raw(
         queryTypeWithLimitOne[this.query.returnType] ? `row_to_json("t".*)` : `COALESCE(json_agg(row_to_json("t".*)), '[]')`
       )
     );
@@ -5381,6 +5371,23 @@ class QueryUpsert {
   }
 }
 
+class RawMethods {
+  raw(...args) {
+    if (typeof args[0] === "string") {
+      return {
+        __raw: args[0],
+        __values: args.slice(1)
+      };
+    } else {
+      return {
+        __column: args[0](this.columnTypes),
+        __raw: args[1],
+        __values: args.slice(2)
+      };
+    }
+  }
+}
+
 class QueryMethods {
   all() {
     return this.clone()._all();
@@ -5500,7 +5507,7 @@ class QueryMethods {
   _wrap(query, as) {
     const sql = this.toSql();
     return query.as(as != null ? as : "t")._from(
-      raw(`(${sql.text})`, ...sql.values)
+      this.raw(`(${sql.text})`, ...sql.values)
     );
   }
   order(...args) {
@@ -5527,7 +5534,7 @@ class QueryMethods {
     return this.clone()._exists();
   }
   _exists() {
-    const q = this._getOptional(raw("true"));
+    const q = this._getOptional(this.raw("true"));
     q.query.notFoundDefault = false;
     q.query.coalesceValue = false;
     return q;
@@ -5570,7 +5577,8 @@ applyMixins(QueryMethods, [
   QueryCallbacks,
   QueryUpsert,
   QueryGet,
-  MergeQueryMethods
+  MergeQueryMethods,
+  RawMethods
 ]);
 
 var __defProp = Object.defineProperty;
@@ -5602,11 +5610,12 @@ var __objRest = (source, exclude) => {
   return target;
 };
 class Db {
-  constructor(adapter, queryBuilder, table = void 0, shape = {}, options) {
+  constructor(adapter, queryBuilder, table = void 0, shape = {}, columnTypes, options) {
     this.adapter = adapter;
     this.queryBuilder = queryBuilder;
     this.table = table;
     this.shape = shape;
+    this.columnTypes = columnTypes;
     this.whereQueryBuilder = WhereQueryBuilder;
     this.onQueryBuilder = OnQueryBuilder;
     this.__model = this;
@@ -5681,6 +5690,7 @@ const createDb = (_a) => {
     void 0,
     void 0,
     {},
+    ct,
     commonOptions
   );
   qb.queryBuilder = qb;
@@ -5691,6 +5701,7 @@ const createDb = (_a) => {
         qb,
         table,
         typeof shape === "function" ? getColumnTypes(ct, shape) : shape,
+        ct,
         __spreadValues(__spreadValues({}, commonOptions), options2)
       );
     },
@@ -5770,6 +5781,7 @@ exports.QueryGet = QueryGet;
 exports.QueryLog = QueryLog;
 exports.QueryMethods = QueryMethods;
 exports.QueryUpsert = QueryUpsert;
+exports.RawMethods = RawMethods;
 exports.RealColumn = RealColumn;
 exports.Select = Select;
 exports.SerialColumn = SerialColumn;