imodel-pg 0.15.0 → 0.16.0

package/index.d.mts

@@ -1,5 +1,5 @@
 /*!
- * imodel v0.15.0
+ * imodel v0.16.0
  * (c) 2019-2026 undefined
  * @license undefined
  */

package/index.mjs

@@ -1,5 +1,5 @@
 /*!
- * imodel v0.15.0
+ * imodel v0.16.0
  * (c) 2019-2026 undefined
  * @license undefined
  */
@@ -687,12 +687,12 @@ function getWhere2(env, wheres) {
  * @param {WhereValue[]?} [where]
  * @returns {Sql | undefined}
  */
-function getWhere(env, where) {
+function getWhere(env, where, key = 'WHERE') {
   const andList = getWhere2(env, where);
   if (!andList) {
     return;
   }
-  return Sql`WHERE ${andList}`;
+  return Sql`${Sql(key)} ${andList}`;
 }
 
 /** @import { DBColumn, Environment, FindArg } from 'imodel' */
@@ -874,11 +874,13 @@ function insertSql(env, table, columns, list, keys, conflict, conflictSet) {
     const setList = conflictSet && typeof conflictSet === 'object' ? getSet(conflictSet, columns, env) : [];
     if (fields?.length) {
       conflictSql = Sql(['ON CONFLICT (', ...Array(fields.length - 1).fill(','), ')'], ...fields.map(f => Sql.Field(f)));
-      for (const f of key) {
-        if (fields.includes(f)) {
-          continue;
+      if (!setList.length) {
+        for (const f of key) {
+          if (fields.includes(f)) {
+            continue;
+          }
+          setList.push(Sql`${Sql.Field(f)} = EXCLUDED.${Sql.Field(f)}`);
         }
-        setList.push(Sql`${Sql.Field(f)} = EXCLUDED.${Sql.Field(f)}`);
       }
     } else {
       conflictSql = Sql`ON CONFLICT`;
@@ -1650,6 +1652,37 @@ async function syncTables(env, query, tables, schema) {
   }
 }
 
+/** @import { DBColumn, Environment, FindArg, SelectItem } from 'imodel' */
+/**
+ *
+ * @param {Environment} env
+ * @param {SelectItem[]} selectList
+ * @returns {Sql}
+ */
+function buildSelect(env, selectList) {
+  /** @type {Sql[]} */
+  const list = [];
+  for (const {
+    table,
+    columns,
+    select,
+    where,
+    sort,
+    offset,
+    limit,
+    group,
+    having
+  } of selectList) {
+    const Table = Sql.Table(table);
+    const selectSql = getSelect(Table, select);
+    const orderSql = getOrder(sort);
+    const limitSql = limit && limit > 0 ? Sql('LIMIT', limit) : undefined;
+    const offsetSql = offset && offset > 0 ? Sql('OFFSET', offset) : undefined;
+    list.push(Sql(Sql`SELECT ${selectSql} FROM ${Table}`, getWhere(env, where), orderSql, limitSql, offsetSql, group?.length ? Sql`GROUP BY ${Sql`,`.glue(group.map(v => Sql.Field(v)))}` : undefined, getWhere(env, having, 'HAVING')));
+  }
+  return list.length === 1 && list[0] || Sql`UNION`.glue(list);
+}
+
 /** @import { Environment, IConnection } from 'imodel' */
 const {
   types
@@ -1819,8 +1852,8 @@ function index (pool, version) {
           return '';
       }
     },
-    insert(env, table, columns, data, keys) {
-      return query(env, insertSql(env, table, columns, data, keys));
+    insert(env, table, columns, data, keys, ignore) {
+      return query(env, insertSql(env, table, columns, data, keys, ignore));
     },
     upsert(env, table, columns, data, keys, conflict, conflictSet) {
       return query(env, insertSql(env, table, columns, data, keys, conflict, conflictSet));
@@ -1828,6 +1861,9 @@ function index (pool, version) {
     find(env, table, columns, argv) {
       return query(env, selectSql(env, table, columns, argv));
     },
+    select(env, select) {
+      return query(env, buildSelect(env, select));
+    },
     count(env, table, columns, where) {
       return query(env, countSql(env, table, columns, where)).then(r => r[0]?.count || 0);
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imodel-pg",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "dependencies": {
     "pg": "^8.13.3",
     "tagged-sql": "^0.9.0"