@h-ai/reldb 0.1.0-alpha.10 → 0.1.0-alpha.12

package/dist/index.js

@@ -1886,6 +1886,7 @@ function createMysqlProvider() {
   };
 }
 var logger3 = core.logger.child({ module: "reldb", scope: "postgres" });
+var PG_DOLLAR_TAG_REGEX = /^\$([A-Z_]\w*)?\$/i;
 function createPostgresProvider() {
   let pool = null;
   const ctx = {
@@ -1893,8 +1894,94 @@ function createPostgresProvider() {
     logger: logger3
   };
   function convertPlaceholders(sql) {
+    let out = "";
     let index = 0;
-    return sql.replace(/\?/g, () => `$${++index}`);
+    let i = 0;
+    const len = sql.length;
+    while (i < len) {
+      const ch = sql[i];
+      if (ch === "'") {
+        out += ch;
+        i++;
+        while (i < len) {
+          const c = sql[i];
+          out += c;
+          i++;
+          if (c === "'") {
+            if (sql[i] === "'") {
+              out += sql[i];
+              i++;
+              continue;
+            }
+            break;
+          }
+        }
+        continue;
+      }
+      if (ch === '"') {
+        out += ch;
+        i++;
+        while (i < len) {
+          const c = sql[i];
+          out += c;
+          i++;
+          if (c === '"') {
+            if (sql[i] === '"') {
+              out += sql[i];
+              i++;
+              continue;
+            }
+            break;
+          }
+        }
+        continue;
+      }
+      if (ch === "$") {
+        const tagMatch = sql.slice(i).match(PG_DOLLAR_TAG_REGEX);
+        if (tagMatch) {
+          const tag = tagMatch[0];
+          const end = sql.indexOf(tag, i + tag.length);
+          if (end === -1) {
+            out += sql.slice(i);
+            i = len;
+          } else {
+            out += sql.slice(i, end + tag.length);
+            i = end + tag.length;
+          }
+          continue;
+        }
+      }
+      if (ch === "-" && sql[i + 1] === "-") {
+        const nl = sql.indexOf("\n", i);
+        if (nl === -1) {
+          out += sql.slice(i);
+          i = len;
+        } else {
+          out += sql.slice(i, nl + 1);
+          i = nl + 1;
+        }
+        continue;
+      }
+      if (ch === "/" && sql[i + 1] === "*") {
+        const endIdx = sql.indexOf("*/", i + 2);
+        if (endIdx === -1) {
+          out += sql.slice(i);
+          i = len;
+        } else {
+          out += sql.slice(i, endIdx + 2);
+          i = endIdx + 2;
+        }
+        continue;
+      }
+      if (ch === "?") {
+        out += `$${++index}`;
+        i++;
+        continue;
+      }
+      out += ch;
+      i++;
+    }
+    return out;
   }
   function pgTxErrorMessage(detail) {
     return reldbM("reldb_postgresTxFailed", { params: { error: detail } });
@@ -2379,6 +2466,10 @@ function createSqliteProvider() {
     async close() {
       if (database) {
         try {
+          try {
+            await txChain;
+          } catch {
+          }
           database.close();
         } catch (error) {
           database = null;