imodel-pg 0.3.2 → 0.3.4

package/index.d.mts

@@ -1,5 +1,5 @@
 /*!
- * imodel v0.3.2
+ * imodel v0.3.4
  * (c) 2019-2025 undefined
  * @license undefined
  */

package/index.mjs

@@ -1,5 +1,5 @@
 /*!
- * imodel v0.3.2
+ * imodel v0.3.4
  * (c) 2019-2025 undefined
  * @license undefined
  */
@@ -128,18 +128,28 @@ function getType(s, {
 }
 
 /** @import { Environment, ColumnOptions } from 'imodel' */
+/**
+ *
+ * @param {string} t
+ */
+function toSqlString2(t) {
+  return `'${t.replace(/\\/g, '\\\\').replace(/'/g, '\\\'')}'`;
+}
 /**
  *
  * @param {any} v
  * @param {string} type
  * @returns
  */
-function toSqlString(v, type) {
+function toSql(v, type) {
+  if (type === 'json' || type === 'object') {
+    return `${toSqlString2(JSON.stringify(type))}::JSON`;
+  }
   if (typeof v === 'bigint' || typeof v === 'number') {
     return String(v);
   }
   if (typeof v === 'string') {
-    return `'${v.replace(/\\/g, '\\\\').replace(/'/g, '\\\'')}'`;
+    return toSqlString2(v);
   }
   if (v === true) {
     return 'TRUE';
@@ -148,8 +158,9 @@ function toSqlString(v, type) {
     return 'FALSE';
   }
   if (v instanceof Date) {
-    return `'${v.toISOString()}'`;
+    return v.toISOString();
   }
+  return null;
 }
 /**
  *
@@ -178,10 +189,10 @@ function getDefault(env, value, type, array) {
   }
   if (array) {
     const values = Array.isArray(v) ? v : [v];
-    const t = values.map(v => toSqlString(v)).filter(Boolean).join(',');
-    return Sql(`'{${t.replace(/\\/g, '\\\\').replace(/'/g, '\\\'')}}'`);
+    const t = values.map(v => toSql(v, type)).filter(Boolean);
+    return Sql(`{${t.join(',')}}`);
   }
-  const t = toSqlString(v);
+  const t = toSql(v, type);
   if (t) {
     return Sql(t);
   }
@@ -1066,7 +1077,7 @@ async function loadDefault(env, query, fields) {
     return fields;
   }
   const sql = Sql`
-SELECT ${Sql`,`.glue(data.map((v, k) => Sql`${v.default} as ${Sql(`a${k}`)}`))}
+SELECT ${Sql`,`.glue(data.map((v, k) => Sql(`${v.default} as a${k}`)))}
 `;
   const values = await query(env, sql);
   for (const [index, field] of data.entries()) {
@@ -1469,7 +1480,8 @@ WHERE table_name = ${table} AND constraint_type = 'PRIMARY KEY'
       COLUMNs.push(nullable ? Sql`${COLUMN} DROP NOT NULL` : Sql`${COLUMN} SET NOT NULL`);
     }
     if (defaultValue !== (old.default ?? null)) {
-      COLUMNs.push(defaultValue !== null ? Sql`${COLUMN} SET DEFAULT ${defaultValue}` : Sql`${COLUMN} DROP 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.3.2",
+  "version": "0.3.4",
   "dependencies": {
     "pg": "^8.13.3",
     "tagged-sql": "^0.9.0"