lib: Remove support for deprecated {__raw: ...} objects

nwoltman · Feb 14, 2018 · 739a293 · 739a293
1 parent 0704b40
commit 739a293
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 21 deletions.
diff --git a/lib/MySQLTable.js b/lib/MySQLTable.js
@@ -1,12 +1,5 @@
 'use strict';
 
-const util = require('util');
-
-const returnDeprecatedRaw = util.deprecate(
-  raw => raw,
-  '[mysql-plus] {__raw: ...} objects are deprected and will not be supported starting in v0.14.0.'
-);
-
 /**
  * A class that provides convenient methods for performing queries.<br>To create
  * an instance, use {@link PoolPlus#defineTable|`poolPlus.defineTable()`} or
@@ -317,13 +310,13 @@ class MySQLTable {
 
     for (var dataColumnName in data) {
       columnNames += (columnNames ? ',' : '') + db.escapeId(dataColumnName);
-      insertValues += (insertValues ? ',' : '') + this._rawEscape(data[dataColumnName]);
+      insertValues += (insertValues ? ',' : '') + db.escape(data[dataColumnName]);
     }
 
     for (var i = 0; i < keyColumns.length; i++) {
       var keyColumnName = keyColumns[i];
       whereClause += (i > 0 ? ' AND ' : '') +
-        db.escapeId(keyColumnName) + '=' + this._rawEscape(data[keyColumnName]);
+        db.escapeId(keyColumnName) + '=' + db.escape(data[keyColumnName]);
     }
 
     return db.pquery(
@@ -466,12 +459,6 @@ class MySQLTable {
   transacting(trxn) {
     return new MySQLTable(this.name, this.schema, this.pool, trxn);
   }
-
-  _rawEscape(value) {
-    return value && value.__raw !== undefined
-      ? returnDeprecatedRaw(value.__raw)
-      : this._db.escape(value);
-  }
 }
 
 function checkExists(rows) {

diff --git a/test/unit/MySQLTable.test.js b/test/unit/MySQLTable.test.js
@@ -453,7 +453,7 @@ describe('MySQLTable', () => {
         const doneDataAndRaw = cbManager.registerCallback();
         const doneRowExists = cbManager.registerCallback();
 
-        testTable.insertIfNotExists({email: {__raw: '"three@email.com"'}}, ['email'], (err, result) => {
+        testTable.insertIfNotExists({email: MySQLPlus.raw('"three@email.com"')}, ['email'], (err, result) => {
           if (err) throw err;
           result.affectedRows.should.equal(1);
           result.insertId.should.equal(3);
@@ -464,15 +464,15 @@ describe('MySQLTable', () => {
             doneOnlyRaw();
           });
 
-          testTable.insertIfNotExists({id: 5, email: {__raw: '"five@email.com"'}}, ['id', 'email'], (err, result) => {
+          testTable.insertIfNotExists({id: 5, email: MySQLPlus.raw('"five@email.com"')}, ['id', 'email'], (err, result) => {
             if (err) throw err;
             result.affectedRows.should.equal(1);
             result.insertId.should.equal(5);
             doneDataAndRaw();
           });
         });
 
-        testTable.insertIfNotExists({email: {__raw: '"one@email.com"'}}, ['email'], (err, result) => {
+        testTable.insertIfNotExists({email: MySQLPlus.raw('"one@email.com"')}, ['email'], (err, result) => {
           if (err) throw err;
           result.affectedRows.should.equal(0);
           doneRowExists();
@@ -510,14 +510,14 @@ describe('MySQLTable', () => {
       });
 
       it('should accept raw data to insert and not escape it', () => {
-        const promiseNewRow = testTable.insertIfNotExists({email: {__raw: '"three@email.com"'}}, ['email'])
+        const promiseNewRow = testTable.insertIfNotExists({email: MySQLPlus.raw('"three@email.com"')}, ['email'])
           .then(result => {
             result.affectedRows.should.equal(1);
             result.insertId.should.equal(3);
 
             return Promise.all([
               testTable.select('email', 'WHERE id = 3'),
-              testTable.insertIfNotExists({id: 5, email: {__raw: '"five@email.com"'}}, ['id', 'email']),
+              testTable.insertIfNotExists({id: 5, email: MySQLPlus.raw('"five@email.com"')}, ['id', 'email']),
             ]);
           })
           .then(results => {
@@ -527,7 +527,7 @@ describe('MySQLTable', () => {
             results[1].insertId.should.equal(5);
           });
 
-        const promiseRowExists = testTable.insertIfNotExists({email: {__raw: '"one@email.com"'}}, ['email'])
+        const promiseRowExists = testTable.insertIfNotExists({email: MySQLPlus.raw('"one@email.com"')}, ['email'])
           .then(result => {
             result.affectedRows.should.equal(0);
           });