From eaccf21353459ac8e55b662217d633c746de7c60 Mon Sep 17 00:00:00 2001 From: Vivek Yadav Date: Thu, 9 Jan 2025 12:39:31 +0530 Subject: [PATCH] comment addressed --- .github/workflows/integration-tests-against-emulator.yaml | 2 +- test_data/mysql_checkconstraint_dump.test.out | 8 ++++---- testing/mysql/integration_test.go | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/integration-tests-against-emulator.yaml b/.github/workflows/integration-tests-against-emulator.yaml index 4de4fdcf9..02a1d9bbd 100644 --- a/.github/workflows/integration-tests-against-emulator.yaml +++ b/.github/workflows/integration-tests-against-emulator.yaml @@ -38,7 +38,7 @@ jobs: MYSQLUSER: root MYSQLDATABASE: test_interleave_table_data MYSQLDB_FKACTION: test_foreign_key_action_data - MYSQLDB_CHECKCONSTRAINTACTION: test_mysql_checkconstraint_actions + MYSQLDB_CHECK_CONSTRAINT: test_mysql_checkconstraint MYSQLPWD: root # set DynamoDB related environment variables diff --git a/test_data/mysql_checkconstraint_dump.test.out b/test_data/mysql_checkconstraint_dump.test.out index cddb83db1..74b6309bb 100644 --- a/test_data/mysql_checkconstraint_dump.test.out +++ b/test_data/mysql_checkconstraint_dump.test.out @@ -1,6 +1,6 @@ -- MySQL dump 10.13 Distrib 8.3.0, for macos13.6 (arm64) -- --- Host: 127.0.0.1 Database: test_mysql_checkconstraint_actions +-- Host: 127.0.0.1 Database: test_mysql_checkconstraint -- ------------------------------------------------------ -- Server version 8.0.40 @@ -16,12 +16,12 @@ /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; -- --- Current Database: `test_mysql_checkconstraint_actions` +-- Current Database: `test_mysql_checkconstraint` -- -CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test_mysql_checkconstraint_actions` /*!40100 DEFAULT CHARACTER SET utf8mb4 */ /*!80016 DEFAULT ENCRYPTION='N' */; +CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test_mysql_checkconstraint` /*!40100 DEFAULT CHARACTER SET utf8mb4 */ /*!80016 DEFAULT ENCRYPTION='N' */; -USE `test_mysql_checkconstraint_actions`; +USE `test_mysql_checkconstraint`; -- -- Table structure for table `TestTable` diff --git a/testing/mysql/integration_test.go b/testing/mysql/integration_test.go index 59b4cf52d..f18377b0d 100644 --- a/testing/mysql/integration_test.go +++ b/testing/mysql/integration_test.go @@ -280,7 +280,7 @@ func TestIntegration_MYSQL_CheckConstraintsActionMigration(t *testing.T) { dbURI := fmt.Sprintf("projects/%s/instances/%s/databases/%s", projectID, instanceID, dbName) filePrefix := filepath.Join(tmpdir, dbName) - host, user, srcDb, password := os.Getenv("MYSQLHOST"), os.Getenv("MYSQLUSER"), os.Getenv("MYSQLDB_CHECKCONSTRAINTACTION"), os.Getenv("MYSQLPWD") + host, user, srcDb, password := os.Getenv("MYSQLHOST"), os.Getenv("MYSQLUSER"), os.Getenv("MYSQLDB_CHECK_CONSTRAINT"), os.Getenv("MYSQLPWD") args := fmt.Sprintf("schema-and-data -source=%s -prefix=%s -source-profile='host=%s,user=%s,dbName=%s,password=%s' -target-profile='instance=%s,dbName=%s,project=%s'", constants.MYSQL, filePrefix, host, user, srcDb, password, instanceID, dbName, projectID) err := common.RunCommand(args, projectID) if err != nil {