imodel-pg 0.19.0 → 0.19.2

package/index.d.mts

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

package/index.mjs

@@ -1,5 +1,5 @@
 /*!
- * imodel v0.19.0
+ * imodel v0.19.2
  * (c) 2019-2026 undefined
  * @license undefined
  */
@@ -80,6 +80,7 @@ function getBaseType(s, {
     case 'json':
       return 'json';
   }
+  return s;
 }
 /**
  *
@@ -522,14 +523,17 @@ function buildSelect(env, selectList) {
     offset,
     limit,
     group,
-    having
+    having,
+    lock
   } 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`, distinct ? Sql`DISTINCT` : undefined, Sql`${selectSql}`, Sql`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')));
+    list.push(Sql(Sql`SELECT`, distinct ? Sql`DISTINCT` : undefined, Sql`${selectSql}`, Sql`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'),
+    // eslint-disable-next-line no-nested-ternary
+    lock === 'X' ? Sql`FOR UPDATE` : lock === 'S' ? Sql`FOR SHARE` : undefined));
   }
   if (!list.length) {
     return null;
@@ -600,6 +604,17 @@ function buildWhere(env, wheres) {
       }
       return Sql`(${Sql` OR `.glue(...orList)})`;
     }
+    if (where.exists) {
+      const {
+        subquery,
+        not
+      } = where;
+      const select = buildSelect(env, subquery);
+      if (!select) {
+        return null;
+      }
+      return not ? Sql`NOT EXISTS(${select})` : Sql`EXISTS(${select})`;
+    }
     const {
       field: k,
       operator: o,
@@ -650,6 +665,11 @@ function buildWhere(env, wheres) {
         not = !not;
         operator = 'IN';
         break;
+      case 'NOTANY':
+        not = !not;
+      case 'ANY':
+        operator = 'ANY';
+        break;
       case 'NOTLIKE':
         not = !not;
         operator = 'LIKE';
@@ -716,6 +736,12 @@ function buildWhere(env, wheres) {
     if (!subquery?.length && Array.isArray(v) && (operator === 'IN' || operator === 'NOT IN') && v.length) {
       values = Sql(['(', ...Array(v.length - 1).fill(','), ')'], ...v.map(v => v ?? null));
     }
+    if (operator === 'ANY') {
+      if (!not) {
+        return Sql`${values} = ANY(${toField(k)})`;
+      }
+      return Sql`not(${values} = ANY(${toField(k)}))`;
+    }
     if (!not) {
       return Sql`${toField(k)} ${Sql(operator)} ${values}`;
     }
@@ -1294,6 +1320,35 @@ async function loadTables(env, query, tables, schema) {
   return dbTables;
 }
 
+/**
+ * 生成 PostgreSQL ALTER TABLE 语句中强制类型转换的 USING 子句
+ * @param {Sql} COLUMN - 列名
+ * @param {boolean?} [array]
+ * @param {boolean?} [nullable]
+ * @param {boolean?} [oldArray]
+ * @param {Sql?} [def]
+ * @returns {Sql}
+ */
+function generateUsingClause(COLUMN, array, nullable, oldArray, def) {
+  if (array && !oldArray) {
+    if (nullable) {
+      return Sql`(CASE
+			WHEN ${COLUMN} IS NULL THEN NULL
+			ELSE ARRAY[${COLUMN}]
+			END)`;
+    }
+    return Sql`(CASE
+			WHEN ${COLUMN} IS NULL THEN ARRAY[]
+			ELSE ARRAY[${COLUMN}]
+		END)`;
+  }
+  const val = oldArray && !array ? Sql`${COLUMN}[1]` : Sql`${COLUMN}`;
+  if (nullable || !def) {
+    return val;
+  }
+  return Sql`COALESCE(${val}, ${def})`;
+}
+
 /** @import { Environment, IConnection } from 'imodel' */
 /** @import { PgEnvTrans } from '../index.mjs' */
 /** @import { DBIndex, DBTable, DBColumn } from 'imodel' */
@@ -1617,15 +1672,18 @@ WHERE table_name = ${table} AND constraint_type = 'PRIMARY KEY'
       size
     }, array);
     const oldType = getType(old.type, old, old.array);
-    if (newType !== oldType) {
-      COLUMNs.push(Sql`${COLUMN} TYPE ${Sql(newType)}`);
+    const def = getDefault(env, defaultValue, type, array);
+    if (newType !== oldType || !nullable && old.nullable) {
+      console.log(newType, oldType);
+      const usingClause = generateUsingClause(Sql.Field(fieldName), array, nullable, old.array, def);
+      const type = Sql(newType);
+      COLUMNs.push(Sql`${COLUMN} TYPE ${type} USING ${usingClause}::${type}`);
       // TODO: USING "description"::int2
     }
     if (Boolean(nullable) !== Boolean(old.nullable)) {
       COLUMNs.push(nullable ? Sql`${COLUMN} DROP NOT NULL` : Sql`${COLUMN} SET NOT NULL`);
     }
     if (!defaultIsQe(defaultValue, old.default)) {
-      const def = getDefault(env, defaultValue, type, array);
       COLUMNs.push(def ? Sql`${COLUMN} SET DEFAULT ${def}` : Sql`${COLUMN} DROP DEFAULT`);
     }
   }

package/package.json

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