@travetto/model-sql 5.0.17 → 5.0.18

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 ArcSine Technologies
+Copyright (c) 2020 ArcSine Technologies
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-sql",
-  "version": "5.0.17",
+  "version": "5.0.18",
   "description": "SQL backing for the travetto model module, with real-time modeling support for SQL schemas.",
   "keywords": [
     "sql",
@@ -27,14 +27,14 @@
     "directory": "module/model-sql"
   },
   "dependencies": {
-    "@travetto/cli": "^5.0.16",
-    "@travetto/config": "^5.0.13",
-    "@travetto/context": "^5.0.13",
-    "@travetto/model": "^5.0.14",
-    "@travetto/model-query": "^5.0.14"
+    "@travetto/cli": "^5.0.17",
+    "@travetto/config": "^5.0.14",
+    "@travetto/context": "^5.0.14",
+    "@travetto/model": "^5.0.15",
+    "@travetto/model-query": "^5.0.15"
   },
   "peerDependencies": {
-    "@travetto/test": "^5.0.15"
+    "@travetto/test": "^5.0.16"
   },
   "peerDependenciesMeta": {
     "@travetto/test": {

package/src/connection/base.ts

@@ -18,12 +18,12 @@ export abstract class Connection<C = unknown> {
 
   transactionDialect = {
     begin: 'BEGIN;',
-    beginNested: 'SAVEPOINT %;',
+    beginNested: 'SAVEPOINT $1;',
     isolate: 'SET TRANSACTION ISOLATION LEVEL READ COMMITTED;',
     rollback: 'ROLLBACK;',
-    rollbackNested: 'ROLLBACK TO %;',
+    rollbackNested: 'ROLLBACK TO $1;',
     commit: 'COMMIT;',
-    commitNested: 'RELEASE SAVEPOINT %;'
+    commitNested: 'RELEASE SAVEPOINT $1;'
   };
 
   constructor(public readonly context: AsyncContext) {
@@ -54,7 +54,7 @@ export abstract class Connection<C = unknown> {
    * @param rawConnection
    * @param query
    */
-  abstract execute<T = unknown>(rawConnection: C, query: string): Promise<{ records: T[], count: number }>;
+  abstract execute<T = unknown>(rawConnection: C, query: string, values?: unknown[]): Promise<{ records: T[], count: number }>;
 
   /**
    * Acquire new connection
@@ -146,7 +146,7 @@ export abstract class Connection<C = unknown> {
   async startTx(conn: C, transactionId?: string): Promise<void> {
     if (transactionId) {
       if (this.nestedTransactions) {
-        await this.execute(conn, this.transactionDialect.beginNested.replace('%', transactionId));
+        await this.execute(conn, this.transactionDialect.beginNested, [transactionId]);
       }
     } else {
       if (this.isolatedTransactions) {
@@ -162,7 +162,7 @@ export abstract class Connection<C = unknown> {
   async commitTx(conn: C, transactionId?: string): Promise<void> {
     if (transactionId) {
       if (this.nestedTransactions) {
-        await this.execute(conn, this.transactionDialect.commitNested.replace('%', transactionId));
+        await this.execute(conn, this.transactionDialect.commitNested, [transactionId]);
       }
     } else {
       await this.execute(conn, this.transactionDialect.commit);
@@ -175,7 +175,7 @@ export abstract class Connection<C = unknown> {
   async rollbackTx(conn: C, transactionId?: string): Promise<void> {
     if (transactionId) {
       if (this.isolatedTransactions) {
-        await this.execute(conn, this.transactionDialect.rollbackNested.replace('%', transactionId));
+        await this.execute(conn, this.transactionDialect.rollbackNested, [transactionId]);
       }
     } else {
       await this.execute(conn, this.transactionDialect.rollback);