[misc] method renaming to avoid confusion (quote)

mariadb-corporation · May 16, 2018 · b0b1498 · b0b1498
1 parent 12bb9d1
commit b0b1498
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/benchmarks/benchs/bench_basic_insert.js b/benchmarks/benchs/bench_basic_insert.js
@@ -6,7 +6,7 @@ module.exports.displaySql = "INSERT INTO testn.perfTest(test) VALUES (?) (into B
 module.exports.benchFct = function(conn, deferred) {
   conn.query(
     "INSERT INTO testn.perfTest(test) VALUES (?)",
-    [Math.floor(Math.random() * 50000000)],
+    ["" + Math.floor(Math.random() * 50000000)],
     function(err, rows) {
       assert.ifError(err);
       assert.equal(1, rows.info ? rows.info.affectedRows : rows.affectedRows);
@@ -25,7 +25,7 @@ module.exports.initFct = async function(conn) {
         if (err) console.log(err);
       }),
       conn.query(
-        "CREATE TABLE testn.perfTest ( id int(11) NOT NULL AUTO_INCREMENT, test int, PRIMARY KEY (id) ) " +
+        "CREATE TABLE testn.perfTest ( id int(11) NOT NULL AUTO_INCREMENT, test varchar(10), PRIMARY KEY (id) ) " +
           "ENGINE = BLACKHOLE COLLATE='utf8mb4_unicode_ci'",
         err => {
           if (err) console.log(err);

diff --git a/lib/cmd/query.js b/lib/cmd/query.js
@@ -230,19 +230,19 @@ class Query extends ResultSet {
         break;
       case "object":
         if (Object.prototype.toString.call(value) === "[object Date]") {
-          out.writeDate(value, opts);
+          out.writeDateQuote(value, opts);
         } else if (Buffer.isBuffer(value)) {
           out.writeStringAscii("_BINARY '");
           out.writeBufferEscape(value);
           out.writeInt8(QUOTE);
         } else if (typeof value.toSqlString === "function") {
-          out.writeStringEscape(String(value.toSqlString()));
+          out.writeStringEscapeQuote(String(value.toSqlString()));
         } else {
-          out.writeStringEscape(JSON.stringify(value));
+          out.writeStringEscapeQuote(JSON.stringify(value));
         }
         break;
       default:
-        out.writeStringEscape(value);
+        out.writeStringEscapeQuote(value);
     }
   }
 

diff --git a/lib/io/packet-output-stream.js b/lib/io/packet-output-stream.js
@@ -29,21 +29,21 @@ class PacketOutputStream {
     this.info = info;
     this.pos = 4;
     this.buf = Buffer.allocUnsafe(SMALL_BUFFER_SIZE);
-    this.writeDate = opts.timezone === "local" ? this.writeLocalDate : this.writeTimezoneDate;
+    this.writeDateQuote = opts.timezone === "local" ? this.writeLocalDate : this.writeTimezoneDate;
     this.changeEncoding(this.opts.collation);
   }
 
   changeEncoding(collation) {
     this.encoding = collation.encoding;
     if (this.encoding === "utf8") {
       this.writeString = this.writeDefaultBufferString;
-      this.writeStringEscape = this.writeUtf8StringEscape;
+      this.writeStringEscapeQuote = this.writeUtf8StringEscapeQuote;
     } else if (Buffer.isEncoding(this.encoding)) {
       this.writeString = this.writeDefaultBufferString;
-      this.writeStringEscape = this.writeDefaultStringEscape;
+      this.writeStringEscapeQuote = this.writeDefaultStringEscapeQuote;
     } else {
       this.writeString = this.writeDefaultIconvString;
-      this.writeStringEscape = this.writeDefaultStringEscape;
+      this.writeStringEscapeQuote = this.writeDefaultStringEscapeQuote;
     }
   }
 
@@ -168,10 +168,10 @@ class PacketOutputStream {
     const min = date.getMinutes();
     const sec = date.getSeconds();
     const ms = date.getMilliseconds();
-    this._writeDatePart(year, mon, day, hour, min, sec, ms);
+    this._writeDatePartQuote(year, mon, day, hour, min, sec, ms);
   }
 
-  _writeDatePart(year, mon, day, hour, min, sec, ms) {
+  _writeDatePartQuote(year, mon, day, hour, min, sec, ms) {
     //return 'YYYY-MM-DD HH:MM:SS' datetime format
     //see https://mariadb.com/kb/en/library/datetime/
     this.writeStringAscii(
@@ -208,7 +208,7 @@ class PacketOutputStream {
     const min = date.getUTCMinutes();
     const sec = date.getUTCSeconds();
     const ms = date.getUTCMilliseconds();
-    this._writeDatePart(year, mon, day, hour, min, sec, ms);
+    this._writeDatePartQuote(year, mon, day, hour, min, sec, ms);
   }
 
   writeBuffer(arr, off, len) {
@@ -260,7 +260,7 @@ class PacketOutputStream {
     }
   }
 
-  writeUtf8StringEscape(str) {
+  writeUtf8StringEscapeQuote(str) {
     const charsLength = str.length;
 
     //not enough space remaining
@@ -391,7 +391,7 @@ class PacketOutputStream {
    *
    * @param str string to escape.
    */
-  writeDefaultStringEscape(str) {
+  writeDefaultStringEscapeQuote(str) {
     this.writeInt8(QUOTE);
     let match;
     let lastIndex = 0;