[refactor]

Author: skywalker-jpg

ydb/core/fq/libs/actors/clusters_from_connections.cpp

@@ -287,9 +287,9 @@ void AddClustersFromConnections(
             FillGenericClusterConfig(
                 common,
                 *gatewaysConfig.MutableGeneric()->AddClusterMapping(),
-                conn.content().setting().greenplum_cluster(),
+                conn.content().setting().mysql_cluster(),
                 connectionName,
-                NYql::NConnector::NApi::EDataSourceKind::GREENPLUM,
+                NYql::NConnector::NApi::EDataSourceKind::MYSQL,
                 authToken,
                 accountIdSignatures);
             clusters.emplace(connectionName, GenericProviderName);

ydb/core/fq/libs/common/util.cpp

@@ -166,7 +166,7 @@ TMaybe<TString> GetLogin(const FederatedQuery::ConnectionSetting& setting) {
         case FederatedQuery::ConnectionSetting::kGreenplumCluster:
             return setting.greenplum_cluster().login();
         case FederatedQuery::ConnectionSetting::kMysqlCluster:
-            return setting.greenplum_cluster().login();
+            return setting.mysql_cluster().login();
     }
 }
 

ydb/core/fq/libs/control_plane_proxy/actors/query_utils.cpp

@@ -255,7 +255,6 @@ TString MakeCreateExternalDataSourceQuery(
                     MDB_CLUSTER_ID={mdb_cluster_id},
                     DATABASE_NAME={database_name},
                     USE_TLS="{use_tls}"
-                    {schema}
                 )",
                 "mdb_cluster_id"_a = EncloseAndEscapeString(connectionContent.setting().mysql_cluster().database_id(), '"'),
                 "database_name"_a = EncloseAndEscapeString(connectionContent.setting().mysql_cluster().database_name(), '"'),

ydb/core/fq/libs/control_plane_proxy/utils/utils.h

@@ -35,7 +35,7 @@ TString ExtractServiceAccountIdWithConnection(const T& setting) {
         return GetServiceAccountId(setting.greenplum_cluster().auth());
     }
     case FederatedQuery::ConnectionSetting::kMysqlCluster: {
-        return GetServiceAccountId(setting.greenplum_cluster().auth());
+        return GetServiceAccountId(setting.mysql_cluster().auth());
     }
     // Do not replace with default. Adding a new connection should cause a compilation error
     case FederatedQuery::ConnectionSetting::CONNECTION_NOT_SET:

ydb/core/fq/libs/control_plane_storage/request_validators.cpp

@@ -85,17 +85,17 @@ NYql::TIssues ValidateConnectionSetting(
         break;
     }
     case FederatedQuery::ConnectionSetting::kMysqlCluster: {
-        const FederatedQuery::GreenplumCluster database = setting.greenplum_cluster(); 
+        const FederatedQuery::MySQLCluster database = setting.mysql_cluster(); 
         if (!database.has_auth() || database.auth().identity_case() == FederatedQuery::IamAuth::IDENTITY_NOT_SET) {
-            issues.AddIssue(MakeErrorIssue(TIssuesIds::BAD_REQUEST, "content.setting.greenplum_database.auth field is not specified"));
+            issues.AddIssue(MakeErrorIssue(TIssuesIds::BAD_REQUEST, "content.setting.mysql_database.auth field is not specified"));
         }
 
         if (database.auth().identity_case() == FederatedQuery::IamAuth::kCurrentIam && disableCurrentIam) {
             issues.AddIssue(MakeErrorIssue(TIssuesIds::BAD_REQUEST, "current iam authorization is disabled"));
         }
 
         if (!database.database_id() && !database.database_name()) {
-            issues.AddIssue(MakeErrorIssue(TIssuesIds::BAD_REQUEST, "content.setting.greenplum_database.{database_id or database_name} field is not specified"));
+            issues.AddIssue(MakeErrorIssue(TIssuesIds::BAD_REQUEST, "content.setting.mysql_database.{database_id or database_name} field is not specified"));
         }
         break;
     }