normalize setting name when expand binding in pg syntax

6 files changed, 29 insertions, 1 deletions

diff --git a/ydb/library/yql/sql/pg/CMakeLists.darwin.txt b/ydb/library/yql/sql/pg/CMakeLists.darwin.txt
index 32e022de17..18433c18e2 100644
--- a/ydb/library/yql/sql/pg/CMakeLists.darwin.txt
+++ b/ydb/library/yql/sql/pg/CMakeLists.darwin.txt
@@ -9,6 +9,7 @@
 
 add_library(yql-sql-pg)
 target_compile_options(yql-sql-pg PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
   -Wno-everything
 )
 target_include_directories(yql-sql-pg PRIVATE
@@ -18,10 +19,12 @@ target_link_libraries(yql-sql-pg PUBLIC
   contrib-libs-cxxsupp
   yutil
   library-yql-ast
+  library-yql-core
   yql-parser-pg_catalog
   yql-parser-pg_wrapper
   yql-sql-settings
 )
 target_sources(yql-sql-pg PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/sql/pg/pg_sql.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/sql/pg/utils.cpp
 )
diff --git a/ydb/library/yql/sql/pg/CMakeLists.linux-aarch64.txt b/ydb/library/yql/sql/pg/CMakeLists.linux-aarch64.txt
index 092455387f..4aa705d269 100644
--- a/ydb/library/yql/sql/pg/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/sql/pg/CMakeLists.linux-aarch64.txt
@@ -9,6 +9,7 @@
 
 add_library(yql-sql-pg)
 target_compile_options(yql-sql-pg PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
   -Wno-everything
 )
 target_include_directories(yql-sql-pg PRIVATE
@@ -19,10 +20,12 @@ target_link_libraries(yql-sql-pg PUBLIC
   contrib-libs-cxxsupp
   yutil
   library-yql-ast
+  library-yql-core
   yql-parser-pg_catalog
   yql-parser-pg_wrapper
   yql-sql-settings
 )
 target_sources(yql-sql-pg PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/sql/pg/pg_sql.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/sql/pg/utils.cpp
 )
diff --git a/ydb/library/yql/sql/pg/CMakeLists.linux.txt b/ydb/library/yql/sql/pg/CMakeLists.linux.txt
index 092455387f..4aa705d269 100644
--- a/ydb/library/yql/sql/pg/CMakeLists.linux.txt
+++ b/ydb/library/yql/sql/pg/CMakeLists.linux.txt
@@ -9,6 +9,7 @@
 
 add_library(yql-sql-pg)
 target_compile_options(yql-sql-pg PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
   -Wno-everything
 )
 target_include_directories(yql-sql-pg PRIVATE
@@ -19,10 +20,12 @@ target_link_libraries(yql-sql-pg PUBLIC
   contrib-libs-cxxsupp
   yutil
   library-yql-ast
+  library-yql-core
   yql-parser-pg_catalog
   yql-parser-pg_wrapper
   yql-sql-settings
 )
 target_sources(yql-sql-pg PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/sql/pg/pg_sql.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/sql/pg/utils.cpp
 )
diff --git a/ydb/library/yql/sql/pg/pg_sql.cpp b/ydb/library/yql/sql/pg/pg_sql.cpp
index e76c407e6b..9e17d17d2d 100644
--- a/ydb/library/yql/sql/pg/pg_sql.cpp
+++ b/ydb/library/yql/sql/pg/pg_sql.cpp
@@ -1,3 +1,4 @@
+#include "utils.h"
 #include <ydb/library/yql/sql/settings/partitioning.h>
 #include <ydb/library/yql/parser/pg_wrapper/interface/parser.h>
 #include <ydb/library/yql/parser/pg_wrapper/parser.h>
@@ -1296,7 +1297,7 @@ public:
 
         for (auto& [key, value] : bindingInfo.Attributes) {
             TVector<TAstNode*> hintValues;
-            hintValues.push_back(QA(key));
+            hintValues.push_back(QA(NormalizeName(key)));
             for (auto& v : value) {
                 hintValues.push_back(QA(v));
             }
diff --git a/ydb/library/yql/sql/pg/utils.cpp b/ydb/library/yql/sql/pg/utils.cpp
new file mode 100644
index 0000000000..dfd212b52c
--- /dev/null
+++ b/ydb/library/yql/sql/pg/utils.cpp
@@ -0,0 +1,10 @@
+#include "utils.h"
+#include <ydb/library/yql/core/yql_expr_type_annotation.h>
+
+namespace NSQLTranslationPG {
+
+TString NormalizeName(TStringBuf name) {
+    return NYql::NormalizeName(name);
+}
+
+}
diff --git a/ydb/library/yql/sql/pg/utils.h b/ydb/library/yql/sql/pg/utils.h
new file mode 100644
index 0000000000..e1c25cdbf7
--- /dev/null
+++ b/ydb/library/yql/sql/pg/utils.h
@@ -0,0 +1,8 @@
+#pragma once
+#include <util/generic/string.h>
+
+namespace NSQLTranslationPG {
+
+TString NormalizeName(TStringBuf name);
+
+}