mysql2 3.16.3 → 3.17.1

package/index.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const SqlString = require('sqlstring');
+const SqlString = require('sql-escaper');
 
 const ConnectionConfig = require('./lib/connection_config.js');
 const parserCache = require('./lib/parsers/parser_cache.js');

package/lib/base/connection.js

@@ -21,7 +21,7 @@ const Timers = require('timers');
 const EventEmitter = require('events').EventEmitter;
 const Readable = require('stream').Readable;
 const Queue = require('denque');
-const SqlString = require('sqlstring');
+const SqlString = require('sql-escaper');
 const { createLRU } = require('lru.min');
 const PacketParser = require('../packet_parser.js');
 const Packets = require('../packets/index.js');

package/lib/base/pool.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const process = require('process');
-const SqlString = require('sqlstring');
+const SqlString = require('sql-escaper');
 const EventEmitter = require('events').EventEmitter;
 const PoolConnection = require('../pool_connection.js');
 const Queue = require('denque');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mysql2",
-  "version": "3.16.3",
+  "version": "3.17.1",
   "description": "fast mysql driver. Implements core protocol, prepared statements, ssl and compression in native JS",
   "main": "index.js",
   "typings": "typings/mysql/index",
@@ -60,7 +60,7 @@
     "lru.min": "^1.1.3",
     "named-placeholders": "^1.1.6",
     "seq-queue": "^0.0.5",
-    "sqlstring": "^2.3.3"
+    "sql-escaper": "^1.3.2"
   },
   "devDependencies": {
     "@eslint/eslintrc": "^3.3.3",

package/promise.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const SqlString = require('sqlstring');
+const SqlString = require('sql-escaper');
 const EventEmitter = require('events').EventEmitter;
 const parserCache = require('./lib/parsers/parser_cache.js');
 const PoolCluster = require('./lib/pool_cluster.js');

package/typings/mysql/index.d.ts

@@ -1,6 +1,3 @@
-/**
- * sqlstring types are based on https://www.npmjs.com/package/@types/sqlstring, version 2.3.2
- */
 import { Pool as BasePool, PoolOptions } from './lib/Pool.js';
 import {
   Connection as BaseConnection,
@@ -23,6 +20,13 @@ import {
   PrepareStatementInfo,
 } from './lib/protocol/sequences/Prepare.js';
 import { Server } from './lib/Server.js';
+import {
+  escape as SqlStringEscape,
+  escapeId as SqlStringEscapeId,
+  format as SqlStringFormat,
+  raw as SqlStringRaw,
+} from 'sql-escaper';
+export type { Raw, SqlValue, Timezone } from 'sql-escaper';
 
 export {
   ConnectionOptions,
@@ -57,26 +61,10 @@ export function createPool(config: PoolOptions): BasePool;
 
 export function createPoolCluster(config?: PoolClusterOptions): PoolCluster;
 
-type TimeZone = 'local' | 'Z' | (string & NonNullable<unknown>);
-export function escape(
-  value: any,
-  stringifyObjects?: boolean,
-  timeZone?: TimeZone
-): string;
-
-export function escapeId(value: any, forbidQualified?: boolean): string;
-
-export function format(sql: string): string;
-export function format(
-  sql: string,
-  values: any | any[],
-  stringifyObjects?: boolean,
-  timeZone?: TimeZone
-): string;
-
-export function raw(sql: string): {
-  toSqlString: () => string;
-};
+export const escape: typeof SqlStringEscape;
+export const escapeId: typeof SqlStringEscapeId;
+export const format: typeof SqlStringFormat;
+export const raw: typeof SqlStringRaw;
 
 export interface ConnectionConfig extends ConnectionOptions {
   mergeFlags(defaultFlags: string[], userFlags: string[] | string): number;