mythix-orm-postgresql 1.2.3 → 1.3.2

package/lib/postgresql-connection.js

@@ -174,8 +174,28 @@ class PostgreSQLConnection extends SQLConnectionBase {
   async transaction(callback, _options) {
     let options       = _options || {};
     let inheritedThis = Object.create(options.connection || this);
+    let lockMode      = this.getLockMode(options.lock);
     let savePointName;
     let client;
+    let lockStatement;
+
+    if (lockMode && lockMode.lock) {
+      let Model = this.getModel(lockMode.modelName);
+      if (!Model)
+        throw new Error(`${this.constructor.name}::transaction: Request to lock table defined by model "${lockMode.modelName}", but model with that name can not be found.`);
+
+      let escapedTableName  = this.escapeID(Model.getTableName());
+      let lockModeStr       = (lockMode.mode) ? lockMode.mode : 'ACCESS EXCLUSIVE';
+
+      if (!lockMode.mode) {
+        if (lockMode.read === true && lockMode.write === false)
+          lockModeStr = 'EXCLUSIVE';
+        else if (lockMode.read === false || lockMode.write === false)
+          lockModeStr = 'ACCESS SHARE';
+      }
+
+      lockStatement = `LOCK ${(lockMode.dependents === false) ? 'ONLY ' : 'TABLE '} ${escapedTableName} IN ${lockModeStr} MODE${(lockMode.noWait === true) ? ' NOWAIT' : ''}`;
+    }
 
     if (!inheritedThis.inTransaction) {
       client = options.connection;
@@ -185,7 +205,11 @@ class PostgreSQLConnection extends SQLConnectionBase {
       inheritedThis.inTransaction = client;
 
       try {
-        await inheritedThis.query(`BEGIN${(options.mode) ? ` ${options.mode}` : ' DEFERRABLE'}`, options);
+        await inheritedThis.query(`BEGIN${(options.beginArguments) ? ` ${options.beginArguments}` : ''}`, options);
+        if (lockStatement)
+          await inheritedThis.query(lockStatement, options);
+
+        // TODO: Need to handle "busy" error
       } catch (error) {
         if (!options.connection)
           await client.release();

package/lib/postgresql-query-generator.js

@@ -145,6 +145,17 @@ class PostgreSQLQueryGenerator extends SQLQueryGeneratorBase {
 
     return `TRUNCATE TABLE${(options.onlySpecifiedTable === true) ? ' ONLY' : ''} ${escapedTableName}${(options.continueIdentity === true) ? ' CONTINUE IDENTITY' : ' RESTART IDENTITY'}${(options.cascade === false) ? ' RESTRICT' : ' CASCADE'}`;
   }
+
+  generateSelectQueryOperatorFromQueryEngineOperator(queryPart, operator, value, valueIsReference, options) {
+    let sqlOperator = super.generateSelectQueryOperatorFromQueryEngineOperator(queryPart, operator, value, valueIsReference, options);
+
+    if (sqlOperator === 'LIKE' && queryPart.caseSensitive !== true)
+      sqlOperator = 'ILIKE';
+    else if (sqlOperator === 'NOT LIKE' && queryPart.caseSensitive !== true)
+      sqlOperator = 'NOT ILIKE';
+
+    return sqlOperator;
+  }
 }
 
 module.exports = PostgreSQLQueryGenerator;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mythix-orm-postgresql",
-  "version": "1.2.3",
+  "version": "1.3.2",
   "description": "PostgreSQL driver for Mythix ORM",
   "main": "lib/index.js",
   "type": "commonjs",
@@ -33,18 +33,18 @@
   },
   "homepage": "https://github.com/th317erd/mythix-orm-postgresql#readme",
   "peerDependencies": {
-    "mythix-orm": "^1.3.0",
-    "mythix-orm-sql-base": "^1.1.2"
+    "mythix-orm": "^1.4.6",
+    "mythix-orm-sql-base": "^1.3.2"
   },
   "dependencies": {
     "nife": "^1.11.3",
-    "pg": "^8.7.3",
+    "pg": "^8.8.0",
     "pg-format": "^1.0.4",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
     "@spothero/eslint-plugin-spothero": "github:spothero/eslint-plugin-spothero",
-    "eslint": "^8.13.0",
+    "eslint": "^8.22.0",
     "jasmine": "^4.3.0",
     "moment": "^2.29.4",
     "nyc": "^15.1.0"