Updating tests for addition of performance_schema

dolthub · Jun 24, 2024 · 039a79d · 039a79d
1 parent 75efbeb
commit 039a79d
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 26 deletions.
diff --git a/go/libraries/doltcore/sqle/binlogreplication/binlog_replica_applier.go b/go/libraries/doltcore/sqle/binlogreplication/binlog_replica_applier.go
@@ -905,7 +905,7 @@ func getAllUserDatabaseNames(ctx *sql.Context, engine *gms.Engine) []string {
 	userDatabaseNames := make([]string, 0, len(allDatabases))
 	for _, database := range allDatabases {
 		switch database.Name() {
-		case "information_schema", "mysql":
+		case "information_schema", "mysql", "performance_schema":
 		default:
 			userDatabaseNames = append(userDatabaseNames, database.Name())
 		}

diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_engine_tests.go b/go/libraries/doltcore/sqle/enginetest/dolt_engine_tests.go
@@ -706,7 +706,7 @@ func RunDoltRevisionDbScriptsTest(t *testing.T, h DoltEnginetestHarness) {
 		Assertions: []queries.ScriptTestAssertion{
 			{
 				Query:    "show databases;",
-				Expected: []sql.Row{{"mydb"}, {"information_schema"}, {"mysql"}},
+				Expected: []sql.Row{{"mydb"}, {"information_schema"}, {"mysql"}, {"performance_schema"}},
 			},
 			{
 				Query:    "use mydb/" + commithash,
@@ -724,7 +724,7 @@ func RunDoltRevisionDbScriptsTest(t *testing.T, h DoltEnginetestHarness) {
 			},
 			{
 				Query:    "show databases;",
-				Expected: []sql.Row{{"mydb"}, {"mydb/" + commithash}, {"information_schema"}, {"mysql"}},
+				Expected: []sql.Row{{"mydb"}, {"mydb/" + commithash}, {"information_schema"}, {"mysql"}, {"performance_schema"}},
 			},
 			{
 				Query:    "select * from t01",
@@ -756,7 +756,7 @@ func RunDoltRevisionDbScriptsTest(t *testing.T, h DoltEnginetestHarness) {
 			},
 			{
 				Query:    "show databases;",
-				Expected: []sql.Row{{"mydb"}, {"information_schema"}, {"mysql"}},
+				Expected: []sql.Row{{"mydb"}, {"information_schema"}, {"mysql"}, {"performance_schema"}},
 			},
 		},
 	}

diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_harness.go b/go/libraries/doltcore/sqle/enginetest/dolt_harness.go
@@ -169,7 +169,7 @@ func (d *DoltHarness) SkipSetupCommit() {
 // included.
 func (d *DoltHarness) resetScripts() []setup.SetupScript {
 	ctx := enginetest.NewContext(d)
-	_, res := enginetest.MustQuery(ctx, d.engine, "select schema_name from information_schema.schemata where schema_name not in ('information_schema');")
+	_, res := enginetest.MustQuery(ctx, d.engine, "select schema_name from information_schema.schemata where schema_name not in ('information_schema', 'performance_schema');")
 	var dbs []string
 	for i := range res {
 		dbs = append(dbs, res[i][0].(string))

diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_queries.go b/go/libraries/doltcore/sqle/enginetest/dolt_queries.go
@@ -393,7 +393,7 @@ var DoltRevisionDbScripts = []queries.ScriptTest{
 		Assertions: []queries.ScriptTestAssertion{
 			{
 				Query:    "show databases;",
-				Expected: []sql.Row{{"mydb"}, {"information_schema"}, {"mysql"}},
+				Expected: []sql.Row{{"mydb"}, {"information_schema"}, {"mysql"}, {"performance_schema"}},
 			},
 			{
 				Query:    "use `mydb/tag1~`;",
@@ -406,7 +406,7 @@ var DoltRevisionDbScripts = []queries.ScriptTest{
 			},
 			{
 				Query:    "show databases;",
-				Expected: []sql.Row{{"mydb"}, {"mydb/tag1~"}, {"information_schema"}, {"mysql"}},
+				Expected: []sql.Row{{"mydb"}, {"mydb/tag1~"}, {"information_schema"}, {"mysql"}, {"performance_schema"}},
 			},
 			{
 				// The branch is nil in the case of a non-branch revision DB
@@ -475,7 +475,7 @@ var DoltRevisionDbScripts = []queries.ScriptTest{
 		Assertions: []queries.ScriptTestAssertion{
 			{
 				Query:    "show databases;",
-				Expected: []sql.Row{{"mydb"}, {"information_schema"}, {"mysql"}},
+				Expected: []sql.Row{{"mydb"}, {"information_schema"}, {"mysql"}, {"performance_schema"}},
 			},
 			{
 				Query:    "use mydb/tag1;",
@@ -493,7 +493,7 @@ var DoltRevisionDbScripts = []queries.ScriptTest{
 			},
 			{
 				Query:    "show databases;",
-				Expected: []sql.Row{{"mydb"}, {"mydb/tag1"}, {"information_schema"}, {"mysql"}},
+				Expected: []sql.Row{{"mydb"}, {"mydb/tag1"}, {"information_schema"}, {"mysql"}, {"performance_schema"}},
 			},
 			{
 				Query:    "select * from t01;",
@@ -525,7 +525,7 @@ var DoltRevisionDbScripts = []queries.ScriptTest{
 			},
 			{
 				Query:    "show databases;",
-				Expected: []sql.Row{{"mydb"}, {"information_schema"}, {"mysql"}},
+				Expected: []sql.Row{{"mydb"}, {"information_schema"}, {"mysql"}, {"performance_schema"}},
 			},
 		},
 	},
@@ -548,7 +548,7 @@ var DoltRevisionDbScripts = []queries.ScriptTest{
 			},
 			{
 				Query:    "show databases;",
-				Expected: []sql.Row{{"mydb"}, {"mydb/branch1"}, {"information_schema"}, {"mysql"}},
+				Expected: []sql.Row{{"mydb"}, {"mydb/branch1"}, {"information_schema"}, {"mysql"}, {"performance_schema"}},
 			},
 			{
 				// The database name is always the requested name
@@ -572,7 +572,7 @@ var DoltRevisionDbScripts = []queries.ScriptTest{
 				//  base database name. But we should also consider the connection string: if you connect to a revision
 				//  database, that database should always be visible.
 				Query:    "show databases;",
-				Expected: []sql.Row{{"mydb"}, {"information_schema"}, {"mysql"}},
+				Expected: []sql.Row{{"mydb"}, {"information_schema"}, {"mysql"}, {"performance_schema"}},
 			},
 			{
 				Query:    "select database();",
@@ -592,7 +592,7 @@ var DoltRevisionDbScripts = []queries.ScriptTest{
 			},
 			{
 				Query:    "show databases;",
-				Expected: []sql.Row{{"mydb"}, {"mydb/branch1"}, {"information_schema"}, {"mysql"}},
+				Expected: []sql.Row{{"mydb"}, {"mydb/branch1"}, {"information_schema"}, {"mysql"}, {"performance_schema"}},
 			},
 			{
 				// Create a table in the working set to verify the main db
@@ -679,7 +679,7 @@ var DoltRevisionDbScripts = []queries.ScriptTest{
 		Assertions: []queries.ScriptTestAssertion{
 			{
 				Query:    "show databases;",
-				Expected: []sql.Row{{"mydb"}, {"information_schema"}, {"mysql"}},
+				Expected: []sql.Row{{"mydb"}, {"information_schema"}, {"mysql"}, {"performance_schema"}},
 			},
 			{
 				Query:    "use `mydb/main`;",
@@ -4654,23 +4654,23 @@ var DoltUndropTestScripts = []queries.ScriptTest{
 		Assertions: []queries.ScriptTestAssertion{
 			{
 				Query:    "show databases;",
-				Expected: []sql.Row{{"information_schema"}, {"mydb"}, {"mysql"}, {"one"}, {"two"}},
+				Expected: []sql.Row{{"information_schema"}, {"mydb"}, {"mysql"}, {"one"}, {"performance_schema"}, {"two"}},
 			},
 			{
 				Query:    "drop database one;",
 				Expected: []sql.Row{{types.NewOkResult(1)}},
 			},
 			{
 				Query:    "show databases;",
-				Expected: []sql.Row{{"information_schema"}, {"mydb"}, {"mysql"}, {"two"}},
+				Expected: []sql.Row{{"information_schema"}, {"mydb"}, {"mysql"}, {"performance_schema"}, {"two"}},
 			},
 			{
 				Query:    "call dolt_undrop('one');",
 				Expected: []sql.Row{{0}},
 			},
 			{
 				Query:    "show databases;",
-				Expected: []sql.Row{{"information_schema"}, {"mydb"}, {"mysql"}, {"one"}, {"two"}},
+				Expected: []sql.Row{{"information_schema"}, {"mydb"}, {"mysql"}, {"one"}, {"performance_schema"}, {"two"}},
 			},
 			{
 				Query:    "use one;",
@@ -4698,7 +4698,7 @@ var DoltUndropTestScripts = []queries.ScriptTest{
 			},
 			{
 				Query:    "show databases;",
-				Expected: []sql.Row{{"information_schema"}, {"mydb"}, {"mysql"}, {"two"}},
+				Expected: []sql.Row{{"information_schema"}, {"mydb"}, {"mysql"}, {"two"}, {"performance_schema"}},
 			},
 			{
 				Query:          "call dolt_undrop;",

diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_server_tests.go b/go/libraries/doltcore/sqle/enginetest/dolt_server_tests.go
@@ -134,7 +134,7 @@ var DoltBranchMultiSessionScriptTests = []queries.ScriptTest{
 			},
 			{
 				Query:    "/* client a */ SHOW DATABASES;",
-				Expected: []sql.Row{{"dolt"}, {"dolt/branch1"}, {"information_schema"}, {"mysql"}},
+				Expected: []sql.Row{{"dolt"}, {"dolt/branch1"}, {"information_schema"}, {"mysql"}, {"performance_schema"}},
 			},
 			{
 				Query:          "/* client a */ CALL DOLT_BRANCH('-d', 'branch2');",
@@ -146,7 +146,7 @@ var DoltBranchMultiSessionScriptTests = []queries.ScriptTest{
 			},
 			{
 				Query:    "/* client a */ SHOW DATABASES;",
-				Expected: []sql.Row{{"dolt"}, {"dolt/branch1"}, {"information_schema"}, {"mysql"}},
+				Expected: []sql.Row{{"dolt"}, {"dolt/branch1"}, {"information_schema"}, {"mysql"}, {"performance_schema"}},
 			},
 			{
 				Query:    "/* client a */ SELECT DATABASE(), ACTIVE_BRANCH();",
@@ -185,7 +185,7 @@ var DoltBranchMultiSessionScriptTests = []queries.ScriptTest{
 			},
 			{
 				Query:    "/* client a */ SHOW DATABASES;",
-				Expected: []sql.Row{{"dolt"}, {"dolt/branch1"}, {"information_schema"}, {"mysql"}},
+				Expected: []sql.Row{{"dolt"}, {"dolt/branch1"}, {"information_schema"}, {"mysql"}, {"performance_schema"}},
 			},
 			{
 				Query:          "/* client a */ CALL DOLT_BRANCH('-m', 'branch2', 'newName');",
@@ -197,7 +197,7 @@ var DoltBranchMultiSessionScriptTests = []queries.ScriptTest{
 			},
 			{
 				Query:    "/* client a */ SHOW DATABASES;",
-				Expected: []sql.Row{{"dolt"}, {"dolt/branch1"}, {"information_schema"}, {"mysql"}},
+				Expected: []sql.Row{{"dolt"}, {"dolt/branch1"}, {"information_schema"}, {"mysql"}, {"performance_schema"}},
 			},
 			{
 				// Call a stored procedure since this searches across all databases and will

diff --git a/go/libraries/doltcore/sqle/integration_test/database_revision_test.go b/go/libraries/doltcore/sqle/integration_test/database_revision_test.go
@@ -73,6 +73,7 @@ func TestDbRevision(t *testing.T) {
 					rows: []sql.Row{
 						{"dolt"},
 						{"information_schema"},
+						{"performance_schema"},
 					},
 				},
 				{

diff --git a/integration-tests/bats/sql-multi-db.bats b/integration-tests/bats/sql-multi-db.bats
@@ -30,7 +30,7 @@ seed_repos_with_tables_with_use_statements() {
 }
 
 @test "sql-multi-db: sql multi-db test show databases" {
-    EXPECTED=$(echo -e "Database\ninformation_schema\nmysql\nrepo1\nrepo2")
+    EXPECTED=$(echo -e "Database\ninformation_schema\nmysql\nperformance_schema\nrepo1\nrepo2")
     run dolt --data-dir ./ sql -r csv -q "SHOW DATABASES"
     [ "$status" -eq 0 ]
     [[ "$output" =~ "$EXPECTED" ]] || false

diff --git a/integration-tests/bats/sql.bats b/integration-tests/bats/sql.bats
@@ -1459,7 +1459,7 @@ SQL
 
     run dolt sql -r csv -q "set dolt_show_branch_databases = 1; show databases"
     [ "$status" -eq 0 ]
-    [ "${#lines[@]}" -eq 11 ] # 2 base dbs, 3 branch dbs each, 2 mysql dbs, 1 header line
+    [ "${#lines[@]}" -eq 12 ] # 2 base dbs, 3 branch dbs each, 3 mysql dbs, 1 header line
     [[ "$output" =~ "db1/b1" ]] || false
     [[ "$output" =~ "db1/b2" ]] || false
     [[ "$output" =~ "db1/main" ]] || false
@@ -1476,13 +1476,13 @@ SQL
     dolt sql -q "set @@persist.dolt_show_branch_databases = 1"
     run dolt sql -r csv -q "show databases"
     [ "$status" -eq 0 ]
-    [ "${#lines[@]}" -eq 11 ]
+    [ "${#lines[@]}" -eq 12 ]
 
     # make sure we aren't double-counting revision dbs
     run dolt sql -r csv -q 'use `db1/main`; show databases'
     [ "$status" -eq 0 ]
     [[ "$output" =~ "Database changed" ]] || false
-    [ "${#lines[@]}" -eq 12 ] # one line for above output, 11 dbs
+    [ "${#lines[@]}" -eq 13 ] # one line for above output, 12 dbs
 }
 
 @test "sql: run outside a dolt directory" {

diff --git a/integration-tests/go-sql-server-driver/tests/sql-server-cluster.yaml b/integration-tests/go-sql-server-driver/tests/sql-server-cluster.yaml
@@ -1567,6 +1567,7 @@ tests:
         - ["dolt_cluster"]
         - ["information_schema"]
         - ["mysql"]
+        - ["performance_schema"]
         - ["repo1"]
     - query: "select `database`, standby_remote, role, epoch, replication_lag_millis is not null as `replication_lag_millis`, current_error from dolt_cluster.dolt_cluster_status"
       result:
@@ -1582,6 +1583,7 @@ tests:
         - ["dolt_cluster"]
         - ["information_schema"]
         - ["mysql"]
+        - ["performance_schema"]
         - ["repo1"]
       retry_attempts: 100
     - query: "select `database`, standby_remote, role, epoch from dolt_cluster.dolt_cluster_status"
@@ -1730,6 +1732,7 @@ tests:
         - ["dolt_cluster"]
         - ["information_schema"]
         - ["mysql"]
+        - ["performance_schema"]
       retry_attempts: 100
     - query: "select `database`, standby_remote, role, epoch from dolt_cluster.dolt_cluster_status"
       result:
@@ -1749,6 +1752,7 @@ tests:
         - ["dolt_cluster"]
         - ["information_schema"]
         - ["mysql"]
+        - ["performance_schema"]
         - ["repo1"]
     - exec: 'use repo1'
     - query: "select d from vals"
@@ -1807,6 +1811,7 @@ tests:
         - ["dolt_cluster"]
         - ["information_schema"]
         - ["mysql"]
+        - ["performance_schema"]
     - exec: "call dolt_cluster_transition_to_standby('2', '1')"
   - on: server2
     queries:

diff --git a/integration-tests/go-sql-server-driver/tests/sql-server-orig.yaml b/integration-tests/go-sql-server-driver/tests/sql-server-orig.yaml
@@ -228,6 +228,7 @@ tests:
         rows:
         - ["information_schema"]
         - ["mysql"]
+        - ["performance_schema"]
         - ["repo1"]
 - name: LOAD DATA LOCAL INFILE works
   repos:

diff --git a/integration-tests/mysql-client-tests/node/workbenchTests/databases.js b/integration-tests/mysql-client-tests/node/workbenchTests/databases.js
@@ -23,6 +23,7 @@ export const databaseTests = [
       { Database: `${dbName}/main` },
       { Database: "information_schema" },
       { Database: "mysql" },
+      { Database: "performance_schema" },
     ],
   },
   {
@@ -46,6 +47,7 @@ export const databaseTests = [
       { Database: "information_schema" },
       { Database: "mysql" },
       { Database: "new_db" },
+      { Database: "performance_schema" },
     ],
   },
   {