Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support create sequence in pg parser #3465

Merged
merged 6 commits into from
Apr 4, 2024
Merged

Support create sequence in pg parser #3465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
17b2f0f
Initial commit
shnikd Apr 1, 2024
acf497e
Fixes
shnikd Apr 4, 2024
2e0aec7
Fixes
shnikd Apr 4, 2024
e2733d4
Fixes
shnikd Apr 4, 2024
beb77f0
Fixes
shnikd Apr 4, 2024
4cf326f
Fixes
shnikd Apr 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 88 additions & 1 deletion ydb/library/yql/sql/pg/pg_sql.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,8 @@ class TConverter : public IPGParseEvents {
return ParseTransactionStmt(CAST_NODE(TransactionStmt, node));
case T_IndexStmt:
return ParseIndexStmt(CAST_NODE(IndexStmt, node)) != nullptr;
case T_CreateSeqStmt:
return ParseCreateSeqStmt(CAST_NODE(CreateSeqStmt, node)) != nullptr;
default:
NodeNotImplemented(value, node);
return false;
Expand Down Expand Up @@ -2650,6 +2652,91 @@ class TConverter : public IPGParseEvents {
return State.Statements.back();
}

[[nodiscard]]
TAstNode* ParseCreateSeqStmt(const CreateSeqStmt* value) {

std::vector<TAstNode*> options;

TString mode = (value->if_not_exists) ? "create_if_not_exists" : "create";
options.push_back(QL(QA("mode"), QA(mode)));

auto [sink, key] = ParseQualifiedPgObjectName(
value->sequence->catalogname,
value->sequence->schemaname,
value->sequence->relname,
"pgSequence"
);

if (!sink || !key) {
return nullptr;
}

const auto relPersistence = static_cast<NPg::ERelPersistence>(value->sequence->relpersistence);
switch (relPersistence) {
case NPg::ERelPersistence::Temp:
options.push_back(QL(QA("temporary")));
break;
case NPg::ERelPersistence::Unlogged:
AddError("UNLOGGED sequence not supported");
return nullptr;
break;
case NPg::ERelPersistence::Permanent:
break;
}

for (int i = 0; i < ListLength(value->options); ++i) {
auto rawNode = ListNodeNth(value->options, i);

switch (NodeTag(rawNode)) {
case T_DefElem: {
const auto* defElem = CAST_NODE(DefElem, rawNode);
TString nameElem = defElem->defname;
if (defElem->arg) {
switch (NodeTag(defElem->arg))
{
case T_Integer:
options.emplace_back(QL(QAX(nameElem), QA(ToString(intVal(defElem->arg)))));
break;
case T_Float:
options.emplace_back(QL(QAX(nameElem), QA(strVal(defElem->arg))));
break;
case T_TypeName: {
const auto* typeName = CAST_NODE_EXT(PG_TypeName, T_TypeName, defElem->arg);
if (ListLength(typeName->names) > 0) {
options.emplace_back(QL(QAX(nameElem),
QAX(StrVal(ListNodeNth(typeName->names, ListLength(typeName->names) - 1)))));
}
break;
}
default:
NodeNotImplemented(defElem->arg);
return nullptr;
}
}
break;
}
default:
NodeNotImplemented(rawNode);
return nullptr;
}
}

if (value->for_identity) {
options.push_back(QL(QA("for_identity")));
}

if (value->ownerId != InvalidOid) {
options.push_back(QL(QA("owner_id"), QA(ToString(value->ownerId))));
}

State.Statements.push_back(
L(A("let"), A("world"),
L(A("Write!"), A("world"), sink, key, L(A("Void")),
QVL(options.data(), options.size()))));

return State.Statements.back();
}

TFromDesc ParseFromClause(const Node* node) {
switch (NodeTag(node)) {
case T_RangeVar:
Expand Down Expand Up @@ -4760,7 +4847,7 @@ TVector<NYql::TAstParseResult> PGToYqlStatements(const TString& query, const NSQ
TConverter converter(results, settings, query, stmtParseInfo, true);
NYql::PGParse(query, converter);
for (auto& res : results) {
res.ActualSyntaxType = NYql::ESyntaxType::Pg;
res.ActualSyntaxType = NYql::ESyntaxType::Pg;
}
return results;
}
Expand Down
23 changes: 20 additions & 3 deletions ydb/library/yql/sql/pg/pg_sql_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ Y_UNIT_TEST_SUITE(PgSqlParsingOnly) {
)";
const auto expectedAst = NYql::ParseAst(program);
UNIT_ASSERT_STRINGS_EQUAL(res.Root->ToString(), expectedAst.Root->ToString());
}
}

Y_UNIT_TEST(CreateTableStmt_PKAndNotNull) {
auto res = PgSqlToYql("CREATE TABLE t (a int PRIMARY KEY NOT NULL, b text)");
Expand Down Expand Up @@ -265,6 +265,23 @@ Y_UNIT_TEST_SUITE(PgSqlParsingOnly) {
UNIT_ASSERT_STRINGS_EQUAL(res.Root->ToString(), expectedAst.Root->ToString());
}

Y_UNIT_TEST(CreateSeqStmt) {
auto res = PgSqlToYql(
"CREATE TEMP SEQUENCE IF NOT EXISTS seq AS integer START WITH 10 INCREMENT BY 2 NO MINVALUE NO MAXVALUE CACHE 3;");
UNIT_ASSERT_C(res.Root, res.Issues.ToString());

TString program = R"(
(
(let world (Configure! world (DataSource 'config) 'OrderedColumns))
(let world (Write! world (DataSink '"kikimr" '"") (Key '('pgObject (String 'seq) (String 'pgSequence))) (Void) '('('mode 'create_if_not_exists) '('temporary) '('"as" '"int4") '('"start" '10) '('"increment" '2) '('"cache" '3))))
(let world (CommitAll! world))
(return world)
)
)";
const auto expectedAst = NYql::ParseAst(program);
UNIT_ASSERT_STRINGS_EQUAL(res.Root->ToString(), expectedAst.Root->ToString());
}

Y_UNIT_TEST(VariableShowStmt) {
auto res = PgSqlToYql("Show server_version_num");
UNIT_ASSERT(res.Root);
Expand Down Expand Up @@ -482,7 +499,7 @@ SELECT COUNT(*) FROM public.t;");
settings);
UNIT_ASSERT_C(res.IsOk(), res.Issues.ToString());
UNIT_ASSERT(res.Root);

res = SqlToYqlWithMode(
R"(select oid,
typinput::int4 as typinput,
Expand Down Expand Up @@ -514,7 +531,7 @@ from pg_catalog.pg_type)",
settings);
UNIT_ASSERT(res.IsOk());
UNIT_ASSERT(res.Root);

res = SqlToYqlWithMode(
R"(select set_config('search_path', 'public', false);)",
NSQLTranslation::ESqlMode::QUERY,
Expand Down
Loading