diff --git a/eslint.config.mjs b/eslint.config.mjs index ebf51ba7aa..f50463d50d 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -151,6 +151,12 @@ export default [ '@typescript-eslint/no-unsafe-function-type': 'off', }, }, + { + files: ['test/tsc-build/**/*.ts'], + rules: { + '@typescript-eslint/no-unused-vars': 'off', + }, + }, { files: ['**/*.mjs', '**/*.mts'], languageOptions: { diff --git a/test/tsc-build/helpers.test.ts b/test/tsc-build/helpers.test.ts index a076175437..88aacc80b8 100644 --- a/test/tsc-build/helpers.test.ts +++ b/test/tsc-build/helpers.test.ts @@ -16,22 +16,3 @@ export const isResultSetHeader = ( return keys.every((key) => key in data); }; - -export const isOkPacket = ( - data: unknown -): data is mysql.OkPacket | mysqlp.OkPacket => { - if (!data || typeof data !== 'object') return false; - - const keys = [ - 'fieldCount', - 'affectedRows', - 'changedRows', - 'insertId', - 'serverStatus', - 'warningCount', - 'message', - 'protocol41', - ]; - - return keys.every((key) => key in data); -}; diff --git a/test/tsc-build/mysql/constants/CharsetToEncoding.test.ts b/test/tsc-build/mysql/constants/CharsetToEncoding.test.ts index cbd4e5384d..983991ffe4 100644 --- a/test/tsc-build/mysql/constants/CharsetToEncoding.test.ts +++ b/test/tsc-build/mysql/constants/CharsetToEncoding.test.ts @@ -2,5 +2,3 @@ import { mysql } from '../../index.test.js'; const charsetToEncoding: string[] = mysql.CharsetToEncoding; const utf8: string = charsetToEncoding[0]; - -console.log(utf8, charsetToEncoding); diff --git a/test/tsc-build/mysql/constants/Charsets.test.ts b/test/tsc-build/mysql/constants/Charsets.test.ts index eec3ed0d56..e6a15707be 100644 --- a/test/tsc-build/mysql/constants/Charsets.test.ts +++ b/test/tsc-build/mysql/constants/Charsets.test.ts @@ -2,5 +2,3 @@ import { mysql } from '../../index.test.js'; const BIG5_CHINESE_CI: number = mysql.Charsets.BIG5_CHINESE_CI; const BIG5: number = mysql.Charsets.BIG5; - -console.log(BIG5_CHINESE_CI, BIG5); diff --git a/test/tsc-build/mysql/constants/Types.test.ts b/test/tsc-build/mysql/constants/Types.test.ts index 4f72875152..8e4c9b1113 100644 --- a/test/tsc-build/mysql/constants/Types.test.ts +++ b/test/tsc-build/mysql/constants/Types.test.ts @@ -3,5 +3,3 @@ import { mysql } from '../../index.test.js'; const BLOB: number = mysql.Types.BLOB; const DECIMAL: string = mysql.Types[0x00]; const DOUBLE: string = mysql.Types[5]; - -console.log(BLOB, DECIMAL, DOUBLE); diff --git a/test/tsc-build/mysql/createConnection/callbacks/execute.test.ts b/test/tsc-build/mysql/createConnection/callbacks/execute.test.ts deleted file mode 100644 index 2796c481ff..0000000000 --- a/test/tsc-build/mysql/createConnection/callbacks/execute.test.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { mysql } from '../../../index.test.js'; -import { access, sql, sqlPS, values } from '../../baseConnection.test.js'; - -{ - const db = mysql.createConnection(access); - - /** Overload: execute(sql, () => {}}) */ - db.execute(sql, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: execute(sql, values, () => {}}) */ - db.execute(sqlPS, values, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: execute(QueryOptions, () => {}}) I */ - db.execute({ sql }, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: execute(QueryOptions, () => {}}) II */ - db.execute({ sql: sqlPS, values }, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: execute(QueryOptions, values, () => {}}) */ - db.execute({ sql: sqlPS }, values, (err, result, fields) => { - console.log(err, result, fields); - }); -} diff --git a/test/tsc-build/mysql/createConnection/callbacks/query.test.ts b/test/tsc-build/mysql/createConnection/callbacks/query.test.ts deleted file mode 100644 index e833f13c81..0000000000 --- a/test/tsc-build/mysql/createConnection/callbacks/query.test.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { mysql } from '../../../index.test.js'; -import { access, sql, sqlPS, values } from '../../baseConnection.test.js'; - -{ - const db = mysql.createConnection(access); - - /** Overload: query(sql, () => {}}) */ - db.query(sql, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: query(sql, values, () => {}}) */ - db.query(sqlPS, values, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: query(QueryOptions, () => {}}) I */ - db.query({ sql }, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: query(QueryOptions, () => {}}) II */ - db.query({ sql: sqlPS, values }, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: query(QueryOptions, values, () => {}}) */ - db.query({ sql: sqlPS }, values, (err, result, fields) => { - console.log(err, result, fields); - }); -} diff --git a/test/tsc-build/mysql/createConnection/promise/execute.test.ts b/test/tsc-build/mysql/createConnection/promise/execute.test.ts deleted file mode 100644 index 3d7efe14bf..0000000000 --- a/test/tsc-build/mysql/createConnection/promise/execute.test.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { mysql } from '../../../index.test.js'; -import { access, sql, sqlPS, values } from '../../baseConnection.test.js'; - -(async () => { - const db = mysql.createConnection(access).promise(); - - { - /** Overload: execute(sql) */ - const [results, fields] = await db.execute(sql); - console.log(results, fields); - } - - { - /** Overload: execute(sql, values) */ - const [results, fields] = await db.execute(sqlPS, values); - console.log(results, fields); - } - - { - /** Overload: execute(QueryOptions) I */ - const [results, fields] = await db.execute({ sql }); - console.log(results, fields); - } - - { - /** Overload: execute(QueryOptions) II */ - const [results, fields] = await db.execute({ sql: sqlPS, values }); - console.log(results, fields); - } - - { - /** Overload: execute(QueryOptions, values) */ - const [results, fields] = await db.execute({ sql: sqlPS }, values); - console.log(results, fields); - } - - await db.end(); -})(); diff --git a/test/tsc-build/mysql/createConnection/promise/query.test.ts b/test/tsc-build/mysql/createConnection/promise/query.test.ts deleted file mode 100644 index 146c99e5dc..0000000000 --- a/test/tsc-build/mysql/createConnection/promise/query.test.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { mysql } from '../../../index.test.js'; -import { access, sql, sqlPS, values } from '../../baseConnection.test.js'; - -(async () => { - const db = mysql.createConnection(access).promise(); - - { - /** Overload: query(sql) */ - const [results, fields] = await db.query(sql); - console.log(results, fields); - } - - { - /** Overload: query(sql, values) */ - const [results, fields] = await db.query(sqlPS, values); - console.log(results, fields); - } - - { - /** Overload: query(QueryOptions) I */ - const [results, fields] = await db.query({ sql }); - console.log(results, fields); - } - - { - /** Overload: query(QueryOptions) II */ - const [results, fields] = await db.query({ sql: sqlPS, values }); - console.log(results, fields); - } - - { - /** Overload: query(QueryOptions, values) */ - const [results, fields] = await db.query({ sql: sqlPS }, values); - console.log(results, fields); - } - - await db.end(); -})(); diff --git a/test/tsc-build/mysql/createPool/callbacks/connection.test.ts b/test/tsc-build/mysql/createPool/callbacks/connection.test.ts index 7b16fe76fd..3db47edcc4 100644 --- a/test/tsc-build/mysql/createPool/callbacks/connection.test.ts +++ b/test/tsc-build/mysql/createPool/callbacks/connection.test.ts @@ -3,13 +3,9 @@ import { access } from '../../baseConnection.test.js'; const pool = mysql.createPool(access); -pool.getConnection((_err, conn) => { +pool.getConnection((_, conn) => { conn.connection; - try { - // @ts-expect-error: The pool can't be a connection itself - pool.connection; - } catch (err) { - console.log('This error is expected', err); - } + // @ts-expect-error: The pool can't be a connection itself + pool.connection; }); diff --git a/test/tsc-build/mysql/createPool/callbacks/createPool.test.ts b/test/tsc-build/mysql/createPool/callbacks/createPool.test.ts index 508b08ebc4..fcd0ff10be 100644 --- a/test/tsc-build/mysql/createPool/callbacks/createPool.test.ts +++ b/test/tsc-build/mysql/createPool/callbacks/createPool.test.ts @@ -1,12 +1,5 @@ import { mysql } from '../../../index.test.js'; -import { uriAccess, access } from '../../baseConnection.test.js'; +import { uriAccess } from '../../baseConnection.test.js'; -(() => { - let uriPool: mysql.Pool | null = null; - let pool: mysql.Pool | null = null; - - if (uriPool === null || pool === null) return; - - uriPool = mysql.createPool(uriAccess); - pool = mysql.createPool(access); -})(); +// createPool(uri) overload is not covered by .mts tests +const pool: mysql.Pool = mysql.createPool(uriAccess); diff --git a/test/tsc-build/mysql/createPool/callbacks/execute.test.ts b/test/tsc-build/mysql/createPool/callbacks/execute.test.ts deleted file mode 100644 index a13b7ca0c0..0000000000 --- a/test/tsc-build/mysql/createPool/callbacks/execute.test.ts +++ /dev/null @@ -1,61 +0,0 @@ -import { mysql } from '../../../index.test.js'; -import { access, sql, sqlPS, values } from '../../baseConnection.test.js'; - -{ - const db = mysql.createPool(access); - - /** Overload: execute(sql, () => {}}) */ - db.execute(sql, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: execute(sql, values, () => {}}) */ - db.execute(sqlPS, values, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: execute(QueryOptions, () => {}}) I */ - db.execute({ sql }, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: execute(QueryOptions, () => {}}) II */ - db.execute({ sql: sqlPS, values }, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: execute(QueryOptions, values, () => {}}) */ - db.execute({ sql: sqlPS }, values, (err, result, fields) => { - console.log(err, result, fields); - }); -} - -/** getConnection and query */ -{ - mysql.createPool(access).getConnection((_err, connection) => { - /** Overload: execute(sql, () => {}}) */ - connection.execute(sql, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: execute(sql, values, () => {}}) */ - connection.execute(sqlPS, values, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: execute(QueryOptions, () => {}}) I */ - connection.execute({ sql }, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: execute(QueryOptions, () => {}}) II */ - connection.execute({ sql: sqlPS, values }, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: execute(QueryOptions, values, () => {}}) */ - connection.execute({ sql: sqlPS }, values, (err, result, fields) => { - console.log(err, result, fields); - }); - }); -} diff --git a/test/tsc-build/mysql/createPool/callbacks/getConnection.test.ts b/test/tsc-build/mysql/createPool/callbacks/getConnection.test.ts index 5cc4552365..a10259f2f8 100644 --- a/test/tsc-build/mysql/createPool/callbacks/getConnection.test.ts +++ b/test/tsc-build/mysql/createPool/callbacks/getConnection.test.ts @@ -3,11 +3,7 @@ import { access } from '../../baseConnection.test.js'; const pool = mysql.createPool(access); -pool.getConnection((_err, conn) => { - try { - // @ts-expect-error: The connection can't get another connection - conn.getConnection(); - } catch (err) { - console.log('This error is expected', err); - } +pool.getConnection((_) => { + // @ts-expect-error: The connection can't get another connection + conn.getConnection(); }); diff --git a/test/tsc-build/mysql/createPool/callbacks/query.test.ts b/test/tsc-build/mysql/createPool/callbacks/query.test.ts deleted file mode 100644 index fcfcac83df..0000000000 --- a/test/tsc-build/mysql/createPool/callbacks/query.test.ts +++ /dev/null @@ -1,61 +0,0 @@ -import { mysql } from '../../../index.test.js'; -import { access, sql, sqlPS, values } from '../../baseConnection.test.js'; - -{ - const db = mysql.createPool(access); - - /** Overload: query(sql, () => {}}) */ - db.query(sql, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: query(sql, values, () => {}}) */ - db.query(sqlPS, values, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: query(QueryOptions, () => {}}) I */ - db.query({ sql }, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: query(QueryOptions, () => {}}) II */ - db.query({ sql: sqlPS, values }, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: query(QueryOptions, values, () => {}}) */ - db.query({ sql: sqlPS }, values, (err, result, fields) => { - console.log(err, result, fields); - }); -} - -/** getConnection */ -{ - mysql.createPool(access).getConnection((_err, connection) => { - /** Overload: query(sql, () => {}}) */ - connection.query(sql, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: query(sql, values, () => {}}) */ - connection.query(sqlPS, values, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: query(QueryOptions, () => {}}) I */ - connection.query({ sql }, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: query(QueryOptions, () => {}}) II */ - connection.query({ sql: sqlPS, values }, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: query(QueryOptions, values, () => {}}) */ - connection.query({ sql: sqlPS }, values, (err, result, fields) => { - console.log(err, result, fields); - }); - }); -} diff --git a/test/tsc-build/mysql/createPool/callbacks/release.test.ts b/test/tsc-build/mysql/createPool/callbacks/release.test.ts index eb98d64858..abf4427f6b 100644 --- a/test/tsc-build/mysql/createPool/callbacks/release.test.ts +++ b/test/tsc-build/mysql/createPool/callbacks/release.test.ts @@ -3,13 +3,5 @@ import { access } from '../../baseConnection.test.js'; const pool = mysql.createPool(access); -pool.getConnection((_err, conn) => { - conn.release(); - - try { - // @ts-expect-error: The pool isn't a connection itself, so it doesn't have the connection methods - pool.release(); - } catch (err) { - console.log('This error is expected', err); - } -}); +// @ts-expect-error: The pool isn't a connection itself, so it doesn't have the connection methods +pool.release(); diff --git a/test/tsc-build/mysql/createPool/callbacks/releaseConnection.test.ts b/test/tsc-build/mysql/createPool/callbacks/releaseConnection.test.ts deleted file mode 100644 index a992dac04b..0000000000 --- a/test/tsc-build/mysql/createPool/callbacks/releaseConnection.test.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { mysql } from '../../../index.test.js'; -import { access } from '../../baseConnection.test.js'; - -const pool = mysql.createPool(access); - -pool.getConnection((_err, conn) => { - pool.releaseConnection(conn); -}); diff --git a/test/tsc-build/mysql/createPool/promise/connection.test.ts b/test/tsc-build/mysql/createPool/promise/connection.test.ts index 4b2ddad4dc..5fe4be167d 100644 --- a/test/tsc-build/mysql/createPool/promise/connection.test.ts +++ b/test/tsc-build/mysql/createPool/promise/connection.test.ts @@ -1,16 +1,7 @@ import { mysql } from '../../../index.test.js'; import { access } from '../../baseConnection.test.js'; -(async () => { - const pool = mysql.createPool(access); - const conn = await pool.promise().getConnection(); +const pool = mysql.createPool(access); - conn.connection; - - try { - // @ts-expect-error: The pool can't be a connection itself - pool.connection; - } catch (err) { - console.log('This error is expected', err); - } -})(); +// @ts-expect-error: The pool can't be a connection itself +pool.connection; diff --git a/test/tsc-build/mysql/createPool/promise/execute.test.ts b/test/tsc-build/mysql/createPool/promise/execute.test.ts deleted file mode 100644 index 95585de308..0000000000 --- a/test/tsc-build/mysql/createPool/promise/execute.test.ts +++ /dev/null @@ -1,75 +0,0 @@ -import { mysql } from '../../../index.test.js'; -import { access, sql, sqlPS, values } from '../../baseConnection.test.js'; - -(async () => { - const db = mysql.createPool(access).promise(); - - { - /** Overload: execute(sql) */ - const [results, fields] = await db.execute(sql); - console.log(results, fields); - } - - { - /** Overload: execute(sql, values) */ - const [results, fields] = await db.execute(sqlPS, values); - console.log(results, fields); - } - - { - /** Overload: execute(QueryOptions) I */ - const [results, fields] = await db.execute({ sql }); - console.log(results, fields); - } - - { - /** Overload: execute(QueryOptions) II */ - const [results, fields] = await db.execute({ sql: sqlPS, values }); - console.log(results, fields); - } - - { - /** Overload: execute(QueryOptions, values) */ - const [results, fields] = await db.execute({ sql: sqlPS }, values); - console.log(results, fields); - } - - await db.end(); -})(); - -/** getConnection */ -(async () => { - const db = await mysql.createPool(access).promise().getConnection(); - - { - /** Overload: execute(sql) */ - const [results, fields] = await db.execute(sql); - console.log(results, fields); - } - - { - /** Overload: execute(sql, values) */ - const [results, fields] = await db.execute(sqlPS, values); - console.log(results, fields); - } - - { - /** Overload: execute(QueryOptions) I */ - const [results, fields] = await db.execute({ sql }); - console.log(results, fields); - } - - { - /** Overload: execute(QueryOptions) II */ - const [results, fields] = await db.execute({ sql: sqlPS, values }); - console.log(results, fields); - } - - { - /** Overload: execute(QueryOptions, values) */ - const [results, fields] = await db.execute({ sql: sqlPS }, values); - console.log(results, fields); - } - - await db.end(); -})(); diff --git a/test/tsc-build/mysql/createPool/promise/getConnection.test.ts b/test/tsc-build/mysql/createPool/promise/getConnection.test.ts index 86a76b2ca6..8a38dbb14f 100644 --- a/test/tsc-build/mysql/createPool/promise/getConnection.test.ts +++ b/test/tsc-build/mysql/createPool/promise/getConnection.test.ts @@ -5,10 +5,6 @@ import { access } from '../../baseConnection.test.js'; const pool = mysql.createPool(access); const conn = await pool.promise().getConnection(); - try { - // @ts-expect-error: The connection can't get another connection - conn.getConnection(); - } catch (err) { - console.log('This error is expected', err); - } + // @ts-expect-error: The connection can't get another connection + conn.getConnection(); })(); diff --git a/test/tsc-build/mysql/createPool/promise/promise.test.ts b/test/tsc-build/mysql/createPool/promise/promise.test.ts deleted file mode 100644 index 5144ca6b82..0000000000 --- a/test/tsc-build/mysql/createPool/promise/promise.test.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { mysql, mysqlp } from '../../../index.test.js'; -import { access } from '../../baseConnection.test.js'; - -(async () => { - let pool: mysql.Pool | null = null; - let promisePool: mysqlp.Pool | null = null; - let conn: mysqlp.PoolConnection | null = null; - - if (pool === null) return; - - pool = mysql.createPool(access); - promisePool = pool.promise(); - conn = await promisePool.getConnection(); - - conn.release(); -})(); diff --git a/test/tsc-build/mysql/createPool/promise/query.test.ts b/test/tsc-build/mysql/createPool/promise/query.test.ts deleted file mode 100644 index 6e1eb53854..0000000000 --- a/test/tsc-build/mysql/createPool/promise/query.test.ts +++ /dev/null @@ -1,75 +0,0 @@ -import { mysql } from '../../../index.test.js'; -import { access, sql, sqlPS, values } from '../../baseConnection.test.js'; - -(async () => { - const db = mysql.createPool(access).promise(); - - { - /** Overload: query(sql) */ - const [results, fields] = await db.query(sql); - console.log(results, fields); - } - - { - /** Overload: query(sql, values) */ - const [results, fields] = await db.query(sqlPS, values); - console.log(results, fields); - } - - { - /** Overload: query(QueryOptions) I */ - const [results, fields] = await db.query({ sql }); - console.log(results, fields); - } - - { - /** Overload: query(QueryOptions) II */ - const [results, fields] = await db.query({ sql: sqlPS, values }); - console.log(results, fields); - } - - { - /** Overload: query(QueryOptions, values) */ - const [results, fields] = await db.query({ sql: sqlPS }, values); - console.log(results, fields); - } - - await db.end(); -})(); - -/** getConnection and query */ -(async () => { - const db = await mysql.createPool(access).promise().getConnection(); - - { - /** Overload: query(sql) */ - const [results, fields] = await db.query(sql); - console.log(results, fields); - } - - { - /** Overload: query(sql, values) */ - const [results, fields] = await db.query(sqlPS, values); - console.log(results, fields); - } - - { - /** Overload: query(QueryOptions) I */ - const [results, fields] = await db.query({ sql }); - console.log(results, fields); - } - - { - /** Overload: query(QueryOptions) II */ - const [results, fields] = await db.query({ sql: sqlPS, values }); - console.log(results, fields); - } - - { - /** Overload: query(QueryOptions, values) */ - const [results, fields] = await db.query({ sql: sqlPS }, values); - console.log(results, fields); - } - - await db.end(); -})(); diff --git a/test/tsc-build/mysql/createPool/promise/release.test.ts b/test/tsc-build/mysql/createPool/promise/release.test.ts index 496bbfdd6f..abf4427f6b 100644 --- a/test/tsc-build/mysql/createPool/promise/release.test.ts +++ b/test/tsc-build/mysql/createPool/promise/release.test.ts @@ -1,16 +1,7 @@ import { mysql } from '../../../index.test.js'; import { access } from '../../baseConnection.test.js'; -(async () => { - const pool = mysql.createPool(access); - const conn = await pool.promise().getConnection(); +const pool = mysql.createPool(access); - conn.release(); - - try { - // @ts-expect-error: The pool isn't a connection itself, so it doesn't have the connection methods - pool.release(); - } catch (err) { - console.log('This error is expected', err); - } -})(); +// @ts-expect-error: The pool isn't a connection itself, so it doesn't have the connection methods +pool.release(); diff --git a/test/tsc-build/mysql/createPool/promise/releaseConnection.test.ts b/test/tsc-build/mysql/createPool/promise/releaseConnection.test.ts deleted file mode 100644 index 8b20716f6b..0000000000 --- a/test/tsc-build/mysql/createPool/promise/releaseConnection.test.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { mysql } from '../../../index.test.js'; -import { access } from '../../baseConnection.test.js'; - -(async () => { - const pool = mysql.createPool(access); - const conn = await pool.promise().getConnection(); - - pool.releaseConnection(conn); -})(); diff --git a/test/tsc-build/mysql/createPoolCluster/add.test.ts b/test/tsc-build/mysql/createPoolCluster/add.test.ts index 12ca88ee44..1e8b045a56 100644 --- a/test/tsc-build/mysql/createPoolCluster/add.test.ts +++ b/test/tsc-build/mysql/createPoolCluster/add.test.ts @@ -3,11 +3,9 @@ import { access, uriAccess } from '../baseConnection.test.js'; const poolCluster = mysql.createPoolCluster(); -// Overload: poolCluster.add(group, connectionUri); +// Overload: poolCluster.add(group, connectionUri) — not covered by .mts poolCluster.add('cluster1', uriAccess); -// Overload: poolCluster.add(group, config); -poolCluster.add('cluster2', access); -// Overload: poolCluster.add(config); +// Overload: poolCluster.add(config) — not covered by .mts poolCluster.add(access); // @ts-expect-error: The option to pass only `URI` doesn't exists diff --git a/test/tsc-build/mysql/createPoolCluster/getConnection.test.ts b/test/tsc-build/mysql/createPoolCluster/getConnection.test.ts deleted file mode 100644 index 5ccfaa3583..0000000000 --- a/test/tsc-build/mysql/createPoolCluster/getConnection.test.ts +++ /dev/null @@ -1,75 +0,0 @@ -import { mysql } from '../../index.test.js'; -import { - access, - uriAccess, - sql, - sqlPS, - values, -} from '../baseConnection.test.js'; - -const poolCluster = mysql.createPoolCluster(); - -poolCluster.add('cluster1', uriAccess); -poolCluster.add('cluster2', access); - -/** execute */ -poolCluster.getConnection((_err, conn) => { - /** Overload: execute(sql, () => {}}) */ - conn.execute(sql, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: execute(sql, values, () => {}}) */ - conn.execute(sqlPS, values, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: execute(QueryOptions, () => {}}) I */ - conn.execute({ sql }, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: execute(QueryOptions, () => {}}) II */ - conn.execute({ sql: sqlPS, values }, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: execute(QueryOptions, values, () => {}}) */ - conn.execute({ sql: sqlPS }, values, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Checking `PoolConnection` */ - conn.release(); -}); - -/** query */ -poolCluster.getConnection('cluster1', (_err, conn) => { - /** Overload: query(sql, () => {}}) */ - conn.query(sql, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: query(sql, values, () => {}}) */ - conn.query(sqlPS, values, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: query(QueryOptions, () => {}}) I */ - conn.query({ sql }, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: query(QueryOptions, () => {}}) II */ - conn.query({ sql: sqlPS, values }, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: query(QueryOptions, values, () => {}}) */ - conn.query({ sql: sqlPS }, values, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Checking `PoolConnection` */ - conn.release(); -}); diff --git a/test/tsc-build/mysql/createPoolCluster/of/getConnection.test.ts b/test/tsc-build/mysql/createPoolCluster/of/getConnection.test.ts deleted file mode 100644 index 79e1e1f267..0000000000 --- a/test/tsc-build/mysql/createPoolCluster/of/getConnection.test.ts +++ /dev/null @@ -1,75 +0,0 @@ -import { mysql } from '../../../index.test.js'; -import { - access, - uriAccess, - sql, - sqlPS, - values, -} from '../../baseConnection.test.js'; - -const poolCluster = mysql.createPoolCluster(); - -poolCluster.add('cluster1', uriAccess); -poolCluster.add('cluster2', access); - -/** execute */ -poolCluster.of('cluster1').getConnection((_err, conn) => { - /** Overload: execute(sql, () => {}}) */ - conn.execute(sql, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: execute(sql, values, () => {}}) */ - conn.execute(sqlPS, values, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: execute(QueryOptions, () => {}}) I */ - conn.execute({ sql }, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: execute(QueryOptions, () => {}}) II */ - conn.execute({ sql: sqlPS, values }, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: execute(QueryOptions, values, () => {}}) */ - conn.execute({ sql: sqlPS }, values, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Checking `PoolConnection` */ - conn.release(); -}); - -/** query */ -poolCluster.of('cluster2').getConnection((_err, conn) => { - /** Overload: query(sql, () => {}}) */ - conn.query(sql, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: query(sql, values, () => {}}) */ - conn.query(sqlPS, values, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: query(QueryOptions, () => {}}) I */ - conn.query({ sql }, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: query(QueryOptions, () => {}}) II */ - conn.query({ sql: sqlPS, values }, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: query(QueryOptions, values, () => {}}) */ - conn.query({ sql: sqlPS }, values, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Checking `PoolConnection` */ - conn.release(); -}); diff --git a/test/tsc-build/mysql/createPoolCluster/of/of.test.ts b/test/tsc-build/mysql/createPoolCluster/of/of.test.ts index bdeb98fde1..1acae27b49 100644 --- a/test/tsc-build/mysql/createPoolCluster/of/of.test.ts +++ b/test/tsc-build/mysql/createPoolCluster/of/of.test.ts @@ -1,79 +1,12 @@ import { mysql } from '../../../index.test.js'; -import { - access, - uriAccess, - sql, - sqlPS, - values, -} from '../../baseConnection.test.js'; +import { access, uriAccess } from '../../baseConnection.test.js'; const poolCluster = mysql.createPoolCluster(); poolCluster.add('cluster1', uriAccess); poolCluster.add('cluster2', access); -/** execute */ -{ - const conn = poolCluster.of('cluster1'); +const conn = poolCluster.of('cluster1'); - /** Overload: execute(sql, () => {}}) */ - conn.execute(sql, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: execute(sql, values, () => {}}) */ - conn.execute(sqlPS, values, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: execute(QueryOptions, () => {}}) I */ - conn.execute({ sql }, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: execute(QueryOptions, () => {}}) II */ - conn.execute({ sql: sqlPS, values }, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: execute(QueryOptions, values, () => {}}) */ - conn.execute({ sql: sqlPS }, values, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** @ts-expect-error: PoolNamespace can't be a `PoolConnection` */ - conn.release(); -} - -/** query */ -{ - const conn = poolCluster.of('cluster2'); - - /** Overload: query(sql, () => {}}) */ - conn.query(sql, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: query(sql, values, () => {}}) */ - conn.query(sqlPS, values, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: query(QueryOptions, () => {}}) I */ - conn.query({ sql }, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: query(QueryOptions, () => {}}) II */ - conn.query({ sql: sqlPS, values }, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** Overload: query(QueryOptions, values, () => {}}) */ - conn.query({ sql: sqlPS }, values, (err, result, fields) => { - console.log(err, result, fields); - }); - - /** @ts-expect-error: PoolNamespace can't be a `PoolConnection` */ - conn.release(); -} +/** @ts-expect-error: PoolNamespace can't be a `PoolConnection` */ +conn.release(); diff --git a/test/tsc-build/mysql/createPoolCluster/remove.test.ts b/test/tsc-build/mysql/createPoolCluster/remove.test.ts deleted file mode 100644 index a561e4b5be..0000000000 --- a/test/tsc-build/mysql/createPoolCluster/remove.test.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { mysql } from '../../index.test.js'; - -const poolCluster = mysql.createPoolCluster(); - -// Overload: poolCluster.add(group, connectionUri); -poolCluster.remove('cluster1'); diff --git a/test/tsc-build/promise/constants/CharsetToEncoding.test.ts b/test/tsc-build/promise/constants/CharsetToEncoding.test.ts index 212381fda6..39c1ffa867 100644 --- a/test/tsc-build/promise/constants/CharsetToEncoding.test.ts +++ b/test/tsc-build/promise/constants/CharsetToEncoding.test.ts @@ -2,5 +2,3 @@ import { mysqlp as mysql } from '../../index.test.js'; const charsetToEncoding: string[] = mysql.CharsetToEncoding; const utf8: string = charsetToEncoding[0]; - -console.log(utf8, charsetToEncoding); diff --git a/test/tsc-build/promise/constants/Charsets.test.ts b/test/tsc-build/promise/constants/Charsets.test.ts index a38ea7c8a9..8d66c90c1f 100644 --- a/test/tsc-build/promise/constants/Charsets.test.ts +++ b/test/tsc-build/promise/constants/Charsets.test.ts @@ -2,5 +2,3 @@ import { mysqlp as mysql } from '../../index.test.js'; const BIG5_CHINESE_CI: number = mysql.Charsets.BIG5_CHINESE_CI; const BIG5: number = mysql.Charsets.BIG5; - -console.log(BIG5_CHINESE_CI, BIG5); diff --git a/test/tsc-build/promise/constants/Types.test.ts b/test/tsc-build/promise/constants/Types.test.ts index f8761077c3..344ebf9f92 100644 --- a/test/tsc-build/promise/constants/Types.test.ts +++ b/test/tsc-build/promise/constants/Types.test.ts @@ -3,5 +3,3 @@ import { mysqlp as mysql } from '../../index.test.js'; const BLOB: number = mysql.Types.BLOB; const DECIMAL: string = mysql.Types[0x00]; const DOUBLE: string = mysql.Types[5]; - -console.log(BLOB, DECIMAL, DOUBLE); diff --git a/test/tsc-build/promise/createConnection/execute.test.ts b/test/tsc-build/promise/createConnection/execute.test.ts deleted file mode 100644 index 67e11a6f88..0000000000 --- a/test/tsc-build/promise/createConnection/execute.test.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { mysqlp as mysql } from '../../index.test.js'; -import { access, sql, sqlPS, values } from '../baseConnection.test.js'; - -(async () => { - const db = await mysql.createConnection(access); - - { - /** Overload: execute(sql) */ - const [results, fields] = await db.execute(sql); - console.log(results, fields); - } - - { - /** Overload: execute(sql, values) */ - const [results, fields] = await db.execute(sqlPS, values); - console.log(results, fields); - } - - { - /** Overload: execute(QueryOptions) I */ - const [results, fields] = await db.execute({ sql }); - console.log(results, fields); - } - - { - /** Overload: execute(QueryOptions) II */ - const [results, fields] = await db.execute({ sql: sqlPS, values }); - console.log(results, fields); - } - - { - /** Overload: execute(QueryOptions, values) */ - const [results, fields] = await db.execute({ sql: sqlPS }, values); - console.log(results, fields); - } - - await db.end(); -})(); diff --git a/test/tsc-build/promise/createConnection/query.test.ts b/test/tsc-build/promise/createConnection/query.test.ts deleted file mode 100644 index 4070c78e93..0000000000 --- a/test/tsc-build/promise/createConnection/query.test.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { mysqlp as mysql } from '../../index.test.js'; -import { access, sql, sqlPS, values } from '../baseConnection.test.js'; - -(async () => { - const db = await mysql.createConnection(access); - - { - /** Overload: query(sql) */ - const [results, fields] = await db.query(sql); - console.log(results, fields); - } - - { - /** Overload: query(sql, values) */ - const [results, fields] = await db.query(sqlPS, values); - console.log(results, fields); - } - - { - /** Overload: query(QueryOptions) I */ - const [results, fields] = await db.query({ sql }); - console.log(results, fields); - } - - { - /** Overload: query(QueryOptions) II */ - const [results, fields] = await db.query({ sql: sqlPS, values }); - console.log(results, fields); - } - - { - /** Overload: query(QueryOptions, values) */ - const [results, fields] = await db.query({ sql: sqlPS }, values); - console.log(results, fields); - } - - await db.end(); -})(); diff --git a/test/tsc-build/promise/createPool/connection.test.ts b/test/tsc-build/promise/createPool/connection.test.ts index 2245041f6e..8162a9cba2 100644 --- a/test/tsc-build/promise/createPool/connection.test.ts +++ b/test/tsc-build/promise/createPool/connection.test.ts @@ -7,10 +7,6 @@ import { access } from '../baseConnection.test.js'; conn.connection; - try { - // @ts-expect-error: The pool can't be a connection itself - pool.connection; - } catch (err) { - console.log('This error is expected', err); - } + // @ts-expect-error: The pool can't be a connection itself + pool.connection; })(); diff --git a/test/tsc-build/promise/createPool/createPool.test.ts b/test/tsc-build/promise/createPool/createPool.test.ts deleted file mode 100644 index 5073aaf758..0000000000 --- a/test/tsc-build/promise/createPool/createPool.test.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { mysqlp as mysql } from '../../index.test.js'; -import { uriAccess, access } from '../baseConnection.test.js'; - -(() => { - let uriPool: mysql.Pool | null = null; - let pool: mysql.Pool | null = null; - - if (uriPool === null || pool === null) return; - - uriPool = mysql.createPool(uriAccess); - pool = mysql.createPool(access); -})(); diff --git a/test/tsc-build/promise/createPool/execute.test.ts b/test/tsc-build/promise/createPool/execute.test.ts deleted file mode 100644 index 1e1695f4c3..0000000000 --- a/test/tsc-build/promise/createPool/execute.test.ts +++ /dev/null @@ -1,75 +0,0 @@ -import { mysqlp as mysql } from '../../index.test.js'; -import { access, sql, sqlPS, values } from '../baseConnection.test.js'; - -(async () => { - const db = mysql.createPool(access); - - { - /** Overload: execute(sql) */ - const [results, fields] = await db.execute(sql); - console.log(results, fields); - } - - { - /** Overload: execute(sql, values) */ - const [results, fields] = await db.execute(sqlPS, values); - console.log(results, fields); - } - - { - /** Overload: execute(QueryOptions) I */ - const [results, fields] = await db.execute({ sql }); - console.log(results, fields); - } - - { - /** Overload: execute(QueryOptions) II */ - const [results, fields] = await db.execute({ sql: sqlPS, values }); - console.log(results, fields); - } - - { - /** Overload: execute(QueryOptions, values) */ - const [results, fields] = await db.execute({ sql: sqlPS }, values); - console.log(results, fields); - } - - await db.end(); -})(); - -/** getConnection */ -(async () => { - const db = await mysql.createPool(access).getConnection(); - - { - /** Overload: execute(sql) */ - const [results, fields] = await db.execute(sql); - console.log(results, fields); - } - - { - /** Overload: execute(sql, values) */ - const [results, fields] = await db.execute(sqlPS, values); - console.log(results, fields); - } - - { - /** Overload: execute(QueryOptions) I */ - const [results, fields] = await db.execute({ sql }); - console.log(results, fields); - } - - { - /** Overload: execute(QueryOptions) II */ - const [results, fields] = await db.execute({ sql: sqlPS, values }); - console.log(results, fields); - } - - { - /** Overload: execute(QueryOptions, values) */ - const [results, fields] = await db.execute({ sql: sqlPS }, values); - console.log(results, fields); - } - - await db.end(); -})(); diff --git a/test/tsc-build/promise/createPool/getConnection.test.ts b/test/tsc-build/promise/createPool/getConnection.test.ts index c8f4d868de..b89eae2f5f 100644 --- a/test/tsc-build/promise/createPool/getConnection.test.ts +++ b/test/tsc-build/promise/createPool/getConnection.test.ts @@ -5,12 +5,6 @@ import { access } from '../baseConnection.test.js'; const pool = mysql.createPool(access); const conn = await pool.getConnection(); - conn.connection; - - try { - // @ts-expect-error: The connection can't get another connection - conn.getConnection(); - } catch (err) { - console.log('This error is expected', err); - } + // @ts-expect-error: The connection can't get another connection + conn.getConnection(); })(); diff --git a/test/tsc-build/promise/createPool/query.test.ts b/test/tsc-build/promise/createPool/query.test.ts deleted file mode 100644 index 17ddfc5e4d..0000000000 --- a/test/tsc-build/promise/createPool/query.test.ts +++ /dev/null @@ -1,75 +0,0 @@ -import { mysqlp as mysql } from '../../index.test.js'; -import { access, sql, sqlPS, values } from '../baseConnection.test.js'; - -(async () => { - const db = mysql.createPool(access); - - { - /** Overload: query(sql) */ - const [results, fields] = await db.query(sql); - console.log(results, fields); - } - - { - /** Overload: query(sql, values) */ - const [results, fields] = await db.query(sqlPS, values); - console.log(results, fields); - } - - { - /** Overload: query(QueryOptions) I */ - const [results, fields] = await db.query({ sql }); - console.log(results, fields); - } - - { - /** Overload: query(QueryOptions) II */ - const [results, fields] = await db.query({ sql: sqlPS, values }); - console.log(results, fields); - } - - { - /** Overload: query(QueryOptions, values) */ - const [results, fields] = await db.query({ sql: sqlPS }, values); - console.log(results, fields); - } - - await db.end(); -})(); - -/** getConnection and query */ -(async () => { - const db = await mysql.createPool(access).getConnection(); - - { - /** Overload: query(sql) */ - const [results, fields] = await db.query(sql); - console.log(results, fields); - } - - { - /** Overload: query(sql, values) */ - const [results, fields] = await db.query(sqlPS, values); - console.log(results, fields); - } - - { - /** Overload: query(QueryOptions) I */ - const [results, fields] = await db.query({ sql }); - console.log(results, fields); - } - - { - /** Overload: query(QueryOptions) II */ - const [results, fields] = await db.query({ sql: sqlPS, values }); - console.log(results, fields); - } - - { - /** Overload: query(QueryOptions, values) */ - const [results, fields] = await db.query({ sql: sqlPS }, values); - console.log(results, fields); - } - - await db.end(); -})(); diff --git a/test/tsc-build/promise/createPool/release.test.ts b/test/tsc-build/promise/createPool/release.test.ts index fd62bb7e56..5b9d023593 100644 --- a/test/tsc-build/promise/createPool/release.test.ts +++ b/test/tsc-build/promise/createPool/release.test.ts @@ -1,16 +1,7 @@ import { mysqlp as mysql } from '../../index.test.js'; import { access } from '../baseConnection.test.js'; -(async () => { - const pool = mysql.createPool(access); - const conn = await pool.getConnection(); +const pool = mysql.createPool(access); - conn.release(); - - try { - // @ts-expect-error: The pool isn't a connection itself, so it doesn't have the connection methods - pool.release(); - } catch (err) { - console.log('This error is expected', err); - } -})(); +// @ts-expect-error: The pool isn't a connection itself, so it doesn't have the connection methods +pool.release(); diff --git a/test/tsc-build/promise/createPool/releaseConnection.test.ts b/test/tsc-build/promise/createPool/releaseConnection.test.ts deleted file mode 100644 index b4528501c3..0000000000 --- a/test/tsc-build/promise/createPool/releaseConnection.test.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { mysqlp as mysql } from '../../index.test.js'; -import { access } from '../baseConnection.test.js'; - -(async () => { - const pool = mysql.createPool(access); - const conn = await pool.getConnection(); - - pool.releaseConnection(conn); -})(); diff --git a/test/tsc-build/promise/createPoolCluster/add.test.ts b/test/tsc-build/promise/createPoolCluster/add.test.ts index ba38ac6c47..db077ba9c5 100644 --- a/test/tsc-build/promise/createPoolCluster/add.test.ts +++ b/test/tsc-build/promise/createPoolCluster/add.test.ts @@ -3,11 +3,9 @@ import { access, uriAccess } from '../baseConnection.test.js'; const poolCluster = mysql.createPoolCluster(); -// Overload: poolCluster.add(group, connectionUri); +// Overload: poolCluster.add(group, connectionUri) — not covered by .mts poolCluster.add('cluster1', uriAccess); -// Overload: poolCluster.add(group, config); -poolCluster.add('cluster2', access); -// Overload: poolCluster.add(config); +// Overload: poolCluster.add(config) — not covered by .mts poolCluster.add(access); // @ts-expect-error: The option to pass only `URI` doesn't exists diff --git a/test/tsc-build/promise/createPoolCluster/getConnection.test.ts b/test/tsc-build/promise/createPoolCluster/getConnection.test.ts deleted file mode 100644 index 878fd0901e..0000000000 --- a/test/tsc-build/promise/createPoolCluster/getConnection.test.ts +++ /dev/null @@ -1,89 +0,0 @@ -import { mysqlp as mysql } from '../../index.test.js'; -import { - access, - uriAccess, - sql, - sqlPS, - values, -} from '../baseConnection.test.js'; - -const poolCluster = mysql.createPoolCluster(); - -poolCluster.add('cluster1', uriAccess); -poolCluster.add('cluster2', access); - -/** execute */ -(async () => { - const conn = await poolCluster.getConnection(); - - { - /** Overload: execute(sql) */ - const [results, fields] = await conn.execute(sql); - console.log(results, fields); - } - - { - /** Overload: execute(sql, values) */ - const [results, fields] = await conn.execute(sqlPS, values); - console.log(results, fields); - } - - { - /** Overload: execute(QueryOptions) I */ - const [results, fields] = await conn.execute({ sql }); - console.log(results, fields); - } - - { - /** Overload: execute(QueryOptions) II */ - const [results, fields] = await conn.execute({ sql: sqlPS, values }); - console.log(results, fields); - } - - { - /** Overload: execute(QueryOptions, values) */ - const [results, fields] = await conn.execute({ sql: sqlPS }, values); - console.log(results, fields); - } - - /** Checking `PoolConnection` */ - conn.release(); -})(); - -/** query */ -(async () => { - const conn = await poolCluster.getConnection('cluster1'); - - { - /** Overload: query(sql) */ - const [results, fields] = await conn.query(sql); - console.log(results, fields); - } - - { - /** Overload: query(sql, values) */ - const [results, fields] = await conn.query(sqlPS, values); - console.log(results, fields); - } - - { - /** Overload: query(QueryOptions) I */ - const [results, fields] = await conn.query({ sql }); - console.log(results, fields); - } - - { - /** Overload: query(QueryOptions) II */ - const [results, fields] = await conn.query({ sql: sqlPS, values }); - console.log(results, fields); - } - - { - /** Overload: query(QueryOptions, values) */ - const [results, fields] = await conn.query({ sql: sqlPS }, values); - console.log(results, fields); - } - - /** Checking `PoolConnection` */ - conn.release(); -})(); diff --git a/test/tsc-build/promise/createPoolCluster/of/getConnection.test.ts b/test/tsc-build/promise/createPoolCluster/of/getConnection.test.ts deleted file mode 100644 index c2341c99a8..0000000000 --- a/test/tsc-build/promise/createPoolCluster/of/getConnection.test.ts +++ /dev/null @@ -1,89 +0,0 @@ -import { mysqlp as mysql } from '../../../index.test.js'; -import { - access, - uriAccess, - sql, - sqlPS, - values, -} from '../../baseConnection.test.js'; - -const poolCluster = mysql.createPoolCluster(); - -poolCluster.add('cluster1', uriAccess); -poolCluster.add('cluster2', access); - -/** execute */ -(async () => { - const conn = await poolCluster.of('cluster1').getConnection(); - - { - /** Overload: execute(sql) */ - const [results, fields] = await conn.execute(sql); - console.log(results, fields); - } - - { - /** Overload: execute(sql, values) */ - const [results, fields] = await conn.execute(sqlPS, values); - console.log(results, fields); - } - - { - /** Overload: execute(QueryOptions) I */ - const [results, fields] = await conn.execute({ sql }); - console.log(results, fields); - } - - { - /** Overload: execute(QueryOptions) II */ - const [results, fields] = await conn.execute({ sql: sqlPS, values }); - console.log(results, fields); - } - - { - /** Overload: execute(QueryOptions, values) */ - const [results, fields] = await conn.execute({ sql: sqlPS }, values); - console.log(results, fields); - } - - /** Checking `PoolConnection` */ - conn.release(); -})(); - -/** query */ -(async () => { - const conn = await poolCluster.of('cluster2').getConnection(); - - { - /** Overload: query(sql) */ - const [results, fields] = await conn.query(sql); - console.log(results, fields); - } - - { - /** Overload: query(sql, values) */ - const [results, fields] = await conn.query(sqlPS, values); - console.log(results, fields); - } - - { - /** Overload: query(QueryOptions) I */ - const [results, fields] = await conn.query({ sql }); - console.log(results, fields); - } - - { - /** Overload: query(QueryOptions) II */ - const [results, fields] = await conn.query({ sql: sqlPS, values }); - console.log(results, fields); - } - - { - /** Overload: query(QueryOptions, values) */ - const [results, fields] = await conn.query({ sql: sqlPS }, values); - console.log(results, fields); - } - - /** Checking `PoolConnection` */ - conn.release(); -})(); diff --git a/test/tsc-build/promise/createPoolCluster/of/of.test.ts b/test/tsc-build/promise/createPoolCluster/of/of.test.ts index 2ab60f8144..267de593cb 100644 --- a/test/tsc-build/promise/createPoolCluster/of/of.test.ts +++ b/test/tsc-build/promise/createPoolCluster/of/of.test.ts @@ -1,89 +1,12 @@ import { mysqlp as mysql } from '../../../index.test.js'; -import { - access, - uriAccess, - sql, - sqlPS, - values, -} from '../../baseConnection.test.js'; +import { access, uriAccess } from '../../baseConnection.test.js'; const poolCluster = mysql.createPoolCluster(); poolCluster.add('cluster1', uriAccess); poolCluster.add('cluster2', access); -/** execute */ -(async () => { - const conn = poolCluster.of('cluster1'); +const conn = poolCluster.of('cluster1'); - { - /** Overload: execute(sql) */ - const [results, fields] = await conn.execute(sql); - console.log(results, fields); - } - - { - /** Overload: execute(sql, values) */ - const [results, fields] = await conn.execute(sqlPS, values); - console.log(results, fields); - } - - { - /** Overload: execute(QueryOptions) I */ - const [results, fields] = await conn.execute({ sql }); - console.log(results, fields); - } - - { - /** Overload: execute(QueryOptions) II */ - const [results, fields] = await conn.execute({ sql: sqlPS, values }); - console.log(results, fields); - } - - { - /** Overload: execute(QueryOptions, values) */ - const [results, fields] = await conn.execute({ sql: sqlPS }, values); - console.log(results, fields); - } - - /** @ts-expect-error: PoolNamespace can't be a `PoolConnection` */ - conn.release(); -})(); - -/** query */ -(async () => { - const conn = poolCluster.of('cluster2'); - - { - /** Overload: query(sql) */ - const [results, fields] = await conn.query(sql); - console.log(results, fields); - } - - { - /** Overload: query(sql, values) */ - const [results, fields] = await conn.query(sqlPS, values); - console.log(results, fields); - } - - { - /** Overload: query(QueryOptions) I */ - const [results, fields] = await conn.query({ sql }); - console.log(results, fields); - } - - { - /** Overload: query(QueryOptions) II */ - const [results, fields] = await conn.query({ sql: sqlPS, values }); - console.log(results, fields); - } - - { - /** Overload: query(QueryOptions, values) */ - const [results, fields] = await conn.query({ sql: sqlPS }, values); - console.log(results, fields); - } - - /** @ts-expect-error: PoolNamespace can't be a `PoolConnection` */ - conn.release(); -})(); +/** @ts-expect-error: PoolNamespace can't be a `PoolConnection` */ +conn.release(); diff --git a/test/tsc-build/strict-checks/query.test.ts b/test/tsc-build/strict-checks/query.test.ts index 3282815966..f025b3a14d 100644 --- a/test/tsc-build/strict-checks/query.test.ts +++ b/test/tsc-build/strict-checks/query.test.ts @@ -14,40 +14,30 @@ import { access, sql } from '../promise/baseConnection.test.js'; const err: mysql.QueryError | null = _e; const result: mysql.RowDataPacket[] = _r; const fields: mysql.FieldPacket[] = _f; - - console.log(err, result, fields); }); conn.query(sql, (_e, _r, _f) => { const err: mysql.QueryError | null = _e; const result: mysql.RowDataPacket[][] = _r; const fields: mysql.FieldPacket[] = _f; - - console.log(err, result, fields); }); conn.query(sql, (_e, _r, _f) => { const err: mysql.QueryError | null = _e; const result: mysql.OkPacket = _r; const fields: mysql.FieldPacket[] = _f; - - console.log(err, result, fields); }); conn.query(sql, (_e, _r, _f) => { const err: mysql.QueryError | null = _e; const result: mysql.OkPacket[] = _r; const fields: mysql.FieldPacket[] = _f; - - console.log(err, result, fields); }); conn.query(sql, (_e, _r, _f) => { const err: mysql.QueryError | null = _e; const result: mysql.ResultSetHeader = _r; const fields: mysql.FieldPacket[] = _f; - - console.log(err, result, fields); }); conn.query(sql, (_e, _r, _f) => { @@ -56,8 +46,6 @@ import { access, sql } from '../promise/baseConnection.test.js'; | [mysqlp.RowDataPacket[], mysqlp.ResultSetHeader] | mysqlp.ResultSetHeader = _r; const fields: mysql.FieldPacket[] = _f; - - console.log(err, result, fields); }); conn.query>( @@ -66,8 +54,6 @@ import { access, sql } from '../promise/baseConnection.test.js'; const err: mysql.QueryError | null = _e; const result: [mysqlp.RowDataPacket[], mysql.ResultSetHeader] = _r; const fields: mysql.FieldPacket[] = _f; - - console.log(err, result, fields); } ); @@ -77,8 +63,6 @@ import { access, sql } from '../promise/baseConnection.test.js'; const err: mysql.QueryError | null = _e; const result: mysql.ResultSetHeader = _r; const fields: mysql.FieldPacket[] = _f; - - console.log(err, result, fields); } ); } @@ -90,36 +74,26 @@ import { access, sql } from '../promise/baseConnection.test.js'; conn.query(sql).then(([_r, _f]) => { const result: mysqlp.RowDataPacket[] = _r; const fields: mysqlp.FieldPacket[] = _f; - - console.log(result, fields); }); conn.query(sql).then(([_r, _f]) => { const result: mysqlp.RowDataPacket[][] = _r; const fields: mysqlp.FieldPacket[] = _f; - - console.log(result, fields); }); conn.query(sql).then(([_r, _f]) => { const result: mysqlp.OkPacket = _r; const fields: mysqlp.FieldPacket[] = _f; - - console.log(result, fields); }); conn.query(sql).then(([_r, _f]) => { const result: mysqlp.OkPacket[] = _r; const fields: mysqlp.FieldPacket[] = _f; - - console.log(result, fields); }); conn.query(sql).then(([_r, _f]) => { const result: mysqlp.ResultSetHeader = _r; const fields: mysqlp.FieldPacket[] = _f; - - console.log(result, fields); }); conn.query(sql).then(([_r, _f]) => { @@ -127,8 +101,6 @@ import { access, sql } from '../promise/baseConnection.test.js'; | [mysqlp.RowDataPacket[], mysqlp.ResultSetHeader] | mysqlp.ResultSetHeader = _r; const fields: mysqlp.FieldPacket[] = _f; - - console.log(result, fields); }); conn @@ -136,8 +108,6 @@ import { access, sql } from '../promise/baseConnection.test.js'; .then(([_r, _f]) => { const result: [mysqlp.RowDataPacket[], mysql.ResultSetHeader] = _r; const fields: mysqlp.FieldPacket[] = _f; - - console.log(result, fields); }); conn @@ -147,7 +117,5 @@ import { access, sql } from '../promise/baseConnection.test.js'; .then(([_r, _f]) => { const result: mysqlp.ResultSetHeader = _r; const fields: mysqlp.FieldPacket[] = _f; - - console.log(result, fields); }); })(); diff --git a/test/tsc-build/strict-checks/typeCast.test.ts b/test/tsc-build/strict-checks/typeCast.test.ts index 21368f6665..d17643a7d2 100644 --- a/test/tsc-build/strict-checks/typeCast.test.ts +++ b/test/tsc-build/strict-checks/typeCast.test.ts @@ -1,158 +1,30 @@ -import { QueryOptions, ConnectionOptions } from '../../../index.js'; -import { - QueryOptions as QueryOptionsP, - ConnectionOptions as ConnectionOptionsP, -} from '../../../promise.js'; -import { access, sql } from '../promise/baseConnection.test.js'; +import { QueryOptions } from '../../../index.js'; +import { QueryOptions as QueryOptionsP } from '../../../promise.js'; -// Callback: QueryOptions -{ - const options1: QueryOptions = { - sql, - typeCast: true, - }; +const sql = 'SELECT 1'; - const options2: QueryOptions = { - sql, - typeCast: false, - }; - - const options3: QueryOptions = { - sql, - typeCast: (field, next) => { - const db: string = field.db; - const length: number = field.length; - const name: string = field.name; - const table: string = field.table; - const type: string = field.type; - const buffer: Buffer | null = field.buffer(); - const string: string | null = field.string(); - const stringWithEncoding: string | null = field.string('utf-8'); - const geometry: - | { x: number; y: number } - | { x: number; y: number }[] - | null = field.geometry(); - - console.log(db, length, name, table, type); - console.log(buffer, string, stringWithEncoding, geometry); - - return next(); - }, - }; - - console.log(options1, options2, options3); -} - -// Callback: ConnectionOptions +// Callback: field.db and field.string(encoding) are not covered by .mts tests { - const options1: ConnectionOptions = { - ...access, - typeCast: true, - }; - - const options2: ConnectionOptions = { - ...access, - typeCast: false, - }; - - const options3: ConnectionOptions = { - ...access, - typeCast: (field, next) => { - const db: string = field.db; - const length: number = field.length; - const name: string = field.name; - const table: string = field.table; - const type: string = field.type; - const buffer: Buffer | null = field.buffer(); - const string: string | null = field.string(); - const stringWithEncoding: string | null = field.string('utf-8'); - const geometry: - | { x: number; y: number } - | { x: number; y: number }[] - | null = field.geometry(); - - console.log(db, length, name, table, type); - console.log(buffer, string, stringWithEncoding, geometry); - - return next(); - }, - }; - - console.log(options1, options2, options3); -} - -// Promise: QueryOptions -{ - const options1: QueryOptionsP = { - sql, - typeCast: true, - }; - - const options2: QueryOptionsP = { - sql, - typeCast: false, - }; - - const options3: QueryOptionsP = { + const options: QueryOptions = { sql, typeCast: (field, next) => { const db: string = field.db; - const length: number = field.length; - const name: string = field.name; - const table: string = field.table; - const type: string = field.type; - const buffer: Buffer | null = field.buffer(); - const string: string | null = field.string(); const stringWithEncoding: string | null = field.string('utf-8'); - const geometry: - | { x: number; y: number } - | { x: number; y: number }[] - | null = field.geometry(); - - console.log(db, length, name, table, type); - console.log(buffer, string, stringWithEncoding, geometry); return next(); }, }; - - console.log(options1, options2, options3); } -// Promise: ConnectionOptions +// Promise: field.db and field.string(encoding) are not covered by .mts tests { - const options1: ConnectionOptionsP = { - ...access, - typeCast: true, - }; - - const options2: ConnectionOptionsP = { - ...access, - typeCast: false, - }; - - const options3: ConnectionOptionsP = { - ...access, + const options: QueryOptionsP = { + sql, typeCast: (field, next) => { const db: string = field.db; - const length: number = field.length; - const name: string = field.name; - const table: string = field.table; - const type: string = field.type; - const buffer: Buffer | null = field.buffer(); - const string: string | null = field.string(); const stringWithEncoding: string | null = field.string('utf-8'); - const geometry: - | { x: number; y: number } - | { x: number; y: number }[] - | null = field.geometry(); - - console.log(db, length, name, table, type); - console.log(buffer, string, stringWithEncoding, geometry); return next(); }, }; - - console.log(options1, options2, options3); } diff --git a/test/tsc-build/tsconfig.json b/test/tsc-build/tsconfig.json index 8c01d8dc9d..f29964a456 100644 --- a/test/tsc-build/tsconfig.json +++ b/test/tsc-build/tsconfig.json @@ -19,7 +19,8 @@ "skipLibCheck": false, "noEmitOnError": true, "noEmit": true, - "noUnusedParameters": true, + "noUnusedParameters": false, + "noUnusedLocals": false, "isolatedModules": true } }