From 314749a6985a103882c446eada79ebe6bc5470e1 Mon Sep 17 00:00:00 2001 From: Taylor Bantle Date: Fri, 12 Apr 2024 11:08:23 -0700 Subject: [PATCH] mysql-client-tests/node: Migrate to mysql2 v3 --- integration-tests/mysql-client-tests/node/index.js | 3 +++ .../mysql-client-tests/node/workbenchTests/branches.js | 3 +++ .../mysql-client-tests/node/workbenchTests/databases.js | 2 ++ .../mysql-client-tests/node/workbenchTests/diffs.js | 4 +++- .../mysql-client-tests/node/workbenchTests/docs.js | 2 ++ .../mysql-client-tests/node/workbenchTests/table.js | 8 ++++++++ .../mysql-client-tests/node/workbenchTests/views.js | 4 +++- 7 files changed, 24 insertions(+), 2 deletions(-) diff --git a/integration-tests/mysql-client-tests/node/index.js b/integration-tests/mysql-client-tests/node/index.js index e7ebe20b52..719ff3070e 100644 --- a/integration-tests/mysql-client-tests/node/index.js +++ b/integration-tests/mysql-client-tests/node/index.js @@ -11,6 +11,7 @@ const tests = [ info: "", serverStatus: 2, warningStatus: 0, + changedRows: 0, }, }, { @@ -44,6 +45,7 @@ const tests = [ info: "", serverStatus: 2, warningStatus: 0, + changedRows: 0, }, }, { q: "select * from test", res: [{ pk: 0, value: 0 }] }, @@ -63,6 +65,7 @@ const tests = [ info: "", serverStatus: 2, warningStatus: 0, + changedRows: 0, }, }, { q: "call dolt_commit('-a', '-m', 'my commit2')", res: [] }, diff --git a/integration-tests/mysql-client-tests/node/workbenchTests/branches.js b/integration-tests/mysql-client-tests/node/workbenchTests/branches.js index f8eef95c42..1f0b63b575 100644 --- a/integration-tests/mysql-client-tests/node/workbenchTests/branches.js +++ b/integration-tests/mysql-client-tests/node/workbenchTests/branches.js @@ -23,6 +23,7 @@ export const branchTests = [ info: "", serverStatus: 2, warningStatus: 0, + changedRows: 0, }, }, { @@ -34,6 +35,7 @@ export const branchTests = [ info: "", serverStatus: 2, warningStatus: 0, + changedRows: 0, }, }, { @@ -89,6 +91,7 @@ export const branchTests = [ info: "", serverStatus: 2, warningStatus: 0, + changedRows: 0, }, }, { diff --git a/integration-tests/mysql-client-tests/node/workbenchTests/databases.js b/integration-tests/mysql-client-tests/node/workbenchTests/databases.js index ef08912a4f..aba83627db 100644 --- a/integration-tests/mysql-client-tests/node/workbenchTests/databases.js +++ b/integration-tests/mysql-client-tests/node/workbenchTests/databases.js @@ -13,6 +13,7 @@ export const databaseTests = [ info: "", serverStatus: 2, warningStatus: 0, + changedRows: 0, }, }, { @@ -34,6 +35,7 @@ export const databaseTests = [ info: "", serverStatus: 2, warningStatus: 0, + changedRows: 0, }, }, { diff --git a/integration-tests/mysql-client-tests/node/workbenchTests/diffs.js b/integration-tests/mysql-client-tests/node/workbenchTests/diffs.js index 3fee16e86b..35fb51a3bb 100644 --- a/integration-tests/mysql-client-tests/node/workbenchTests/diffs.js +++ b/integration-tests/mysql-client-tests/node/workbenchTests/diffs.js @@ -22,6 +22,7 @@ export const diffTests = [ info: "", serverStatus: 2, warningStatus: 0, + changedRows: 0, }, }, { @@ -197,7 +198,8 @@ export const diffTests = [ to_name: "myview", to_fragment: "CREATE VIEW `myview` AS SELECT * FROM test", to_extra: { CreatedAt: 0 }, - to_sql_mode: 'NO_ENGINE_SUBSTITUTION,ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES', + to_sql_mode: + "NO_ENGINE_SUBSTITUTION,ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES", to_commit: "WORKING", to_commit_date: "2023-03-09T07:56:29.035Z", from_type: null, diff --git a/integration-tests/mysql-client-tests/node/workbenchTests/docs.js b/integration-tests/mysql-client-tests/node/workbenchTests/docs.js index c2785954ab..34e4ef82a2 100644 --- a/integration-tests/mysql-client-tests/node/workbenchTests/docs.js +++ b/integration-tests/mysql-client-tests/node/workbenchTests/docs.js @@ -23,6 +23,7 @@ export const docsTests = [ info: "", serverStatus: 2, warningStatus: 0, + changedRows: 0, }, }, { @@ -40,6 +41,7 @@ export const docsTests = [ info: "", serverStatus: 2, warningStatus: 0, + changedRows: 0, }, }, { diff --git a/integration-tests/mysql-client-tests/node/workbenchTests/table.js b/integration-tests/mysql-client-tests/node/workbenchTests/table.js index 152f40a366..ba666c28b5 100644 --- a/integration-tests/mysql-client-tests/node/workbenchTests/table.js +++ b/integration-tests/mysql-client-tests/node/workbenchTests/table.js @@ -12,6 +12,7 @@ export const tableTests = [ info: "", serverStatus: 2, warningStatus: 0, + changedRows: 0, }, }, { @@ -23,6 +24,7 @@ export const tableTests = [ info: "", serverStatus: 2, warningStatus: 0, + changedRows: 0, }, }, { @@ -94,6 +96,7 @@ export const tableTests = [ info: "", serverStatus: 2, warningStatus: 0, + changedRows: 0, }, }, { @@ -105,6 +108,7 @@ export const tableTests = [ info: "", serverStatus: 2, warningStatus: 0, + changedRows: 0, }, }, { @@ -155,6 +159,7 @@ export const tableTests = [ info: "", serverStatus: 2, warningStatus: 0, + changedRows: 0, }, }, @@ -172,6 +177,7 @@ export const tableTests = [ info: "", serverStatus: 2, warningStatus: 0, + changedRows: 0, }, }, { @@ -188,6 +194,7 @@ export const tableTests = [ info: "", serverStatus: 2, warningStatus: 0, + changedRows: 0, }, }, { @@ -224,6 +231,7 @@ export const tableTests = [ info: "", serverStatus: 2, warningStatus: 0, + changedRows: 0, }, }, { diff --git a/integration-tests/mysql-client-tests/node/workbenchTests/views.js b/integration-tests/mysql-client-tests/node/workbenchTests/views.js index 4a0aab1646..31fbad9c42 100644 --- a/integration-tests/mysql-client-tests/node/workbenchTests/views.js +++ b/integration-tests/mysql-client-tests/node/workbenchTests/views.js @@ -23,6 +23,7 @@ export const viewsTests = [ info: "", serverStatus: 2, warningStatus: 0, + changedRows: 0, }, }, { @@ -34,7 +35,8 @@ export const viewsTests = [ name: "myview", fragment: "CREATE VIEW `myview` AS SELECT * FROM test", extra: { CreatedAt: 0 }, - sql_mode: 'NO_ENGINE_SUBSTITUTION,ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES', + sql_mode: + "NO_ENGINE_SUBSTITUTION,ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES", }, ], },