Skip to content

Commit 54cf7bd

Browse files
committed
Fix tests, add CODEOWNERS
1 parent 33afd32 commit 54cf7bd

File tree

3 files changed

+37
-14
lines changed

3 files changed

+37
-14
lines changed

CODEOWNERS

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Lines starting with '#' are comments.
2+
3+
# Each line is a file pattern followed by one or more owners.
4+
5+
# These owners will be the default owners for everything in the repo.
6+
7+
# * @defunkt
8+
9+
# Order is important. The last matching pattern has the most precedence.
10+
11+
# So if a pull request only touches javascript files, only these owners
12+
13+
# will be requested to review.
14+
15+
# *.js @octocat @github/js
16+
17+
# You can also use email addresses if you prefer.
18+
19+
20+
21+
# Begin dolt repository owners
22+
23+
integration-tests/mysql-client-tests/node/* @tbantle22

integration-tests/mysql-client-tests/node/workbenchTests/databases.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { getArgs } from "../helpers.js";
22

3-
const args = getArgs();
3+
const { dbName } = getArgs();
44

55
export const databaseTests = [
66
{
77
q: `USE ::dbName`,
8-
p: { dbName: `${args.dbName}/main` },
8+
p: { dbName: `${dbName}/main` },
99
res: {
1010
fieldCount: 0,
1111
affectedRows: 0,
@@ -20,8 +20,8 @@ export const databaseTests = [
2020
res: [
2121
{ Database: "information_schema" },
2222
{ Database: "mysql" },
23-
{ Database: "mysql_client" },
24-
{ Database: "mysql_client/main" },
23+
{ Database: `${dbName}` },
24+
{ Database: `${dbName}/main` },
2525
],
2626
},
2727
{
@@ -41,8 +41,8 @@ export const databaseTests = [
4141
res: [
4242
{ Database: "information_schema" },
4343
{ Database: "mysql" },
44-
{ Database: "mysql_client" },
45-
{ Database: "mysql_client/main" },
44+
{ Database: `${dbName}` },
45+
{ Database: `${dbName}/main` },
4646
{ Database: "new_db" },
4747
],
4848
},

integration-tests/mysql-client-tests/node/workbenchTests/table.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { getArgs } from "../helpers.js";
22

3-
const args = getArgs();
3+
const { dbName } = getArgs();
44

55
export const tableTests = [
66
{
@@ -74,7 +74,7 @@ export const tableTests = [
7474
FROM information_schema.statistics
7575
WHERE table_schema=:tableSchema AND table_name=:tableName AND index_name!="PRIMARY"
7676
GROUP BY index_name;`,
77-
p: { tableSchema: `${args.dbName}/main`, tableName: "test" },
77+
p: { tableSchema: `${dbName}/main`, tableName: "test" },
7878
res: [
7979
{
8080
TABLE_NAME: "test",
@@ -116,25 +116,25 @@ export const tableTests = [
116116
q: `SHOW FULL TABLES AS OF :refName WHERE table_type = 'BASE TABLE'`,
117117
p: { refName: "main" },
118118
res: [
119-
{ "Tables_in_mysql_client/main": "test", Table_type: "BASE TABLE" },
120-
{ "Tables_in_mysql_client/main": "test_info", Table_type: "BASE TABLE" },
119+
{ [`Tables_in_${dbName}/main`]: "test", Table_type: "BASE TABLE" },
120+
{ [`Tables_in_${dbName}/main`]: "test_info", Table_type: "BASE TABLE" },
121121
],
122122
},
123123
{
124124
q: `SELECT * FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE WHERE table_name=:tableName AND table_schema=:tableSchema AND referenced_table_schema IS NOT NULL`,
125-
p: { tableName: "test_info", tableSchema: `${args.dbName}/main` },
125+
p: { tableName: "test_info", tableSchema: `${dbName}/main` },
126126
res: [
127127
{
128128
CONSTRAINT_CATALOG: "def",
129-
CONSTRAINT_SCHEMA: "mysql_client/main",
129+
CONSTRAINT_SCHEMA: `${dbName}/main`,
130130
CONSTRAINT_NAME: "s7utamh8",
131131
TABLE_CATALOG: "def",
132-
TABLE_SCHEMA: "mysql_client/main",
132+
TABLE_SCHEMA: `${dbName}/main`,
133133
TABLE_NAME: "test_info",
134134
COLUMN_NAME: "test_pk",
135135
ORDINAL_POSITION: 1,
136136
POSITION_IN_UNIQUE_CONSTRAINT: 1,
137-
REFERENCED_TABLE_SCHEMA: "mysql_client/main",
137+
REFERENCED_TABLE_SCHEMA: `${dbName}/main`,
138138
REFERENCED_TABLE_NAME: "test",
139139
REFERENCED_COLUMN_NAME: "pk",
140140
},

0 commit comments

Comments
 (0)