diff options
author | vvvv <vvvv@yandex-team.ru> | 2022-02-16 22:25:04 +0300 |
---|---|---|
committer | vvvv <vvvv@yandex-team.ru> | 2022-02-16 22:25:04 +0300 |
commit | 2e6085a5c02dce174fa055cb5464daab9dc8cbfe (patch) | |
tree | 148812c26e1a821deb8d6486ca3e78a02083df9d | |
parent | 29ee003f90c26137a79ebb7eac59ff1575c2c073 (diff) | |
download | ydb-2e6085a5c02dce174fa055cb5464daab9dc8cbfe.tar.gz |
YQL-13710 allow to select full or dummy PG parser implementation
ref:29cbb0cea27da6930f1f965b1d0c24c5160c7c2b
-rw-r--r-- | ydb/apps/ydbd/ya.make | 1 | ||||
-rw-r--r-- | ydb/core/kqp/host/ya.make | 1 | ||||
-rw-r--r-- | ydb/core/kqp/provider/ya.make | 1 | ||||
-rw-r--r-- | ydb/core/yq/libs/actors/ya.make | 1 | ||||
-rw-r--r-- | ydb/core/yq/libs/mock/ya.make | 1 | ||||
-rw-r--r-- | ydb/library/yql/providers/pq/provider/ut/ya.make | 1 | ||||
-rw-r--r-- | ydb/library/yql/sql/pg/pg_sql.cpp | 2 | ||||
-rw-r--r-- | ydb/library/yql/sql/pg_dummy/pg_sql_dummy.cpp | 13 | ||||
-rw-r--r-- | ydb/library/yql/sql/pg_dummy/ya.make | 14 | ||||
-rw-r--r-- | ydb/library/yql/sql/pg_sql.h (renamed from ydb/library/yql/sql/pg/pg_sql.h) | 0 | ||||
-rw-r--r-- | ydb/library/yql/sql/sql.cpp | 2 | ||||
-rw-r--r-- | ydb/library/yql/sql/v0/ut/ya.make | 1 | ||||
-rw-r--r-- | ydb/library/yql/sql/v1/ut/ya.make | 1 | ||||
-rw-r--r-- | ydb/library/yql/sql/ya.make | 1 | ||||
-rw-r--r-- | ydb/library/yql/ya.make | 2 | ||||
-rw-r--r-- | ydb/services/yq/ut_integration/ya.make | 1 |
16 files changed, 40 insertions, 3 deletions
diff --git a/ydb/apps/ydbd/ya.make b/ydb/apps/ydbd/ya.make index a7a8ceb0299..25af1f6106f 100644 --- a/ydb/apps/ydbd/ya.make +++ b/ydb/apps/ydbd/ya.make @@ -27,6 +27,7 @@ SRCS( ) PEERDIR( + ydb/library/yql/sql/pg_dummy ydb/core/driver_lib/run ydb/core/protos ydb/core/security diff --git a/ydb/core/kqp/host/ya.make b/ydb/core/kqp/host/ya.make index e0f595515c4..5d8ebfc02c7 100644 --- a/ydb/core/kqp/host/ya.make +++ b/ydb/core/kqp/host/ya.make @@ -25,6 +25,7 @@ PEERDIR( ydb/library/yql/core/services ydb/library/yql/minikql/invoke_builtins ydb/library/yql/sql + ydb/library/yql/sql/pg_dummy ydb/library/yql/core ydb/library/yql/providers/common/codec ydb/library/yql/providers/common/udf_resolve diff --git a/ydb/core/kqp/provider/ya.make b/ydb/core/kqp/provider/ya.make index 7f9f5a7950e..bed1627f687 100644 --- a/ydb/core/kqp/provider/ya.make +++ b/ydb/core/kqp/provider/ya.make @@ -50,6 +50,7 @@ PEERDIR( ydb/library/yql/providers/common/schema/expr ydb/library/yql/providers/result/expr_nodes ydb/library/yql/providers/result/provider + ydb/library/yql/sql/pg_dummy ) YQL_LAST_ABI_VERSION() diff --git a/ydb/core/yq/libs/actors/ya.make b/ydb/core/yq/libs/actors/ya.make index 15edfaccf4e..2d1d074a854 100644 --- a/ydb/core/yq/libs/actors/ya.make +++ b/ydb/core/yq/libs/actors/ya.make @@ -58,6 +58,7 @@ PEERDIR( ydb/library/yql/public/issue ydb/library/yql/public/issue/protos ydb/library/yql/sql/settings + ydb/library/yql/sql/pg_dummy ydb/library/yql/utils/actor_log ydb/public/api/protos ydb/public/lib/yq diff --git a/ydb/core/yq/libs/mock/ya.make b/ydb/core/yq/libs/mock/ya.make index 37712832f6f..641444e59a2 100644 --- a/ydb/core/yq/libs/mock/ya.make +++ b/ydb/core/yq/libs/mock/ya.make @@ -28,6 +28,7 @@ PEERDIR( ydb/library/yql/public/issue ydb/library/yql/public/issue/protos ydb/library/yql/sql/settings + ydb/library/yql/sql/pg_dummy ydb/public/api/protos ydb/public/sdk/cpp/client/ydb_table ydb/library/yql/providers/clickhouse/provider diff --git a/ydb/library/yql/providers/pq/provider/ut/ya.make b/ydb/library/yql/providers/pq/provider/ut/ya.make index c477f74ba54..1515e273e19 100644 --- a/ydb/library/yql/providers/pq/provider/ut/ya.make +++ b/ydb/library/yql/providers/pq/provider/ut/ya.make @@ -7,6 +7,7 @@ SRCS( ) PEERDIR( + ydb/library/yql/sql/pg_dummy ydb/library/yql/core/facade ydb/library/yql/core/file_storage ydb/library/yql/core/services/mounts diff --git a/ydb/library/yql/sql/pg/pg_sql.cpp b/ydb/library/yql/sql/pg/pg_sql.cpp index 120078e254b..354b4d4dc4e 100644 --- a/ydb/library/yql/sql/pg/pg_sql.cpp +++ b/ydb/library/yql/sql/pg/pg_sql.cpp @@ -1,4 +1,4 @@ -#include "pg_sql.h" +#include <ydb/library/yql/sql/pg_sql.h> #include <ydb/library/yql/parser/pg_query_wrapper/wrapper.h> #include <ydb/library/yql/providers/common/provider/yql_provider_names.h> #include <ydb/library/yql/core/yql_callable_names.h> diff --git a/ydb/library/yql/sql/pg_dummy/pg_sql_dummy.cpp b/ydb/library/yql/sql/pg_dummy/pg_sql_dummy.cpp new file mode 100644 index 00000000000..e811c69d057 --- /dev/null +++ b/ydb/library/yql/sql/pg_dummy/pg_sql_dummy.cpp @@ -0,0 +1,13 @@ +#include <ydb/library/yql/sql/pg_sql.h> + +namespace NSQLTranslationPG { + +NYql::TAstParseResult PGToYql(const TString& query, const NSQLTranslation::TTranslationSettings& settings) { + Y_UNUSED(query); + Y_UNUSED(settings); + NYql::TAstParseResult result; + result.Issues.AddIssue(NYql::TIssue("PostgreSQL parser is not available")); + return result; +} + +} // NSQLTranslationPG diff --git a/ydb/library/yql/sql/pg_dummy/ya.make b/ydb/library/yql/sql/pg_dummy/ya.make new file mode 100644 index 00000000000..966b9de4fd7 --- /dev/null +++ b/ydb/library/yql/sql/pg_dummy/ya.make @@ -0,0 +1,14 @@ +LIBRARY() + +OWNER(g:yql) + +PEERDIR( + ydb/library/yql/ast + ydb/library/yql/sql/settings +) + +SRCS( + pg_sql_dummy.cpp +) + +END() diff --git a/ydb/library/yql/sql/pg/pg_sql.h b/ydb/library/yql/sql/pg_sql.h index c27ff312482..c27ff312482 100644 --- a/ydb/library/yql/sql/pg/pg_sql.h +++ b/ydb/library/yql/sql/pg_sql.h diff --git a/ydb/library/yql/sql/sql.cpp b/ydb/library/yql/sql/sql.cpp index 9b03f681f3e..edbc7779884 100644 --- a/ydb/library/yql/sql/sql.cpp +++ b/ydb/library/yql/sql/sql.cpp @@ -5,7 +5,7 @@ #include <ydb/library/yql/sql/v0/lexer/lexer.h> #include <ydb/library/yql/sql/v1/sql.h> #include <ydb/library/yql/sql/v1/lexer/lexer.h> -#include <ydb/library/yql/sql/pg/pg_sql.h> +#include "pg_sql.h" #include <google/protobuf/arena.h> diff --git a/ydb/library/yql/sql/v0/ut/ya.make b/ydb/library/yql/sql/v0/ut/ya.make index a524a082ea3..ef3bafde1ee 100644 --- a/ydb/library/yql/sql/v0/ut/ya.make +++ b/ydb/library/yql/sql/v0/ut/ya.make @@ -9,6 +9,7 @@ SRCS( PEERDIR( ydb/library/yql/public/udf/service/exception_policy ydb/library/yql/sql + ydb/library/yql/sql/pg_dummy ) TIMEOUT(300) diff --git a/ydb/library/yql/sql/v1/ut/ya.make b/ydb/library/yql/sql/v1/ut/ya.make index f281b7472d4..7285bea1bb2 100644 --- a/ydb/library/yql/sql/v1/ut/ya.make +++ b/ydb/library/yql/sql/v1/ut/ya.make @@ -9,6 +9,7 @@ SRCS( PEERDIR( ydb/library/yql/public/udf/service/exception_policy ydb/library/yql/sql + ydb/library/yql/sql/pg_dummy ) TIMEOUT(300) diff --git a/ydb/library/yql/sql/ya.make b/ydb/library/yql/sql/ya.make index e10a314ebc5..db8ca771016 100644 --- a/ydb/library/yql/sql/ya.make +++ b/ydb/library/yql/sql/ya.make @@ -7,7 +7,6 @@ OWNER( PEERDIR( library/cpp/deprecated/split - ydb/library/yql/sql/pg ydb/library/yql/sql/settings ydb/library/yql/sql/v0 ydb/library/yql/sql/v0/lexer diff --git a/ydb/library/yql/ya.make b/ydb/library/yql/ya.make index d8d2be341fb..b801a5d115f 100644 --- a/ydb/library/yql/ya.make +++ b/ydb/library/yql/ya.make @@ -23,6 +23,8 @@ RECURSE( providers public sql + sql/pg + sql/pg_dummy udfs utils ) diff --git a/ydb/services/yq/ut_integration/ya.make b/ydb/services/yq/ut_integration/ya.make index b8c3a0f800e..a1b44729066 100644 --- a/ydb/services/yq/ut_integration/ya.make +++ b/ydb/services/yq/ut_integration/ya.make @@ -29,6 +29,7 @@ PEERDIR( ydb/library/yql/providers/common/db_id_async_resolver ydb/library/yql/udfs/common/clickhouse/client ydb/library/yql/utils + ydb/library/yql/sql/pg_dummy ) YQL_LAST_ABI_VERSION() |