1 files changed, 27 insertions, 7 deletions

diff --git a/yql/essentials/sql/v1/sql_query.cpp b/yql/essentials/sql/v1/sql_query.cpp
index b59ae88c4b6..627f1e0ae33 100644
--- a/yql/essentials/sql/v1/sql_query.cpp
+++ b/yql/essentials/sql/v1/sql_query.cpp
@@ -191,7 +191,7 @@ static bool TransferSettingsEntry(std::map<TString, TNodePtr>& out,
         ctx.Context().Error() << key.Name << " is not supported in ALTER";
         return false;
     }
-    
+
     if (!out.emplace(keyName, value).second) {
         ctx.Context().Error() << "Duplicate transfer setting: " << key.Name;
     }
@@ -1961,7 +1961,7 @@ bool TSqlQuery::Statement(TVector<TNodePtr>& blocks, const TRule_sql_stmt_core&
             break;
         }
         case TRule_sql_stmt_core::kAltSqlStmtCore62: {
-            // show_create_table_stmt: SHOW CREATE TABLE table_ref
+            // show_create_table_stmt: SHOW CREATE (TABLE | VIEW) table_ref
             Ctx.BodyPart();
             const auto& rule = core.GetAlt_sql_stmt_core62().GetRule_show_create_table_stmt1();
 
@@ -1969,8 +1969,16 @@ bool TSqlQuery::Statement(TVector<TNodePtr>& blocks, const TRule_sql_stmt_core&
             if (!SimpleTableRefImpl(rule.GetRule_simple_table_ref4(), tr)) {
                 return false;
             }
+            TString type;
+            if (auto typeToken = to_lower(rule.GetToken3().GetValue()); typeToken == "table") {
+                type = "showCreateTable";
+            } else if (typeToken == "view") {
+                type = "showCreateView";
+            } else {
+                YQL_ENSURE(false, "Unsupported SHOW CREATE statement type: " << typeToken);
+            }
 
-            AddStatementToBlocks(blocks, BuildShowCreate(Ctx.Pos(), tr, Ctx.Scoped));
+            AddStatementToBlocks(blocks, BuildShowCreate(Ctx.Pos(), tr, type, Ctx.Scoped));
             break;
         }
         case TRule_sql_stmt_core::ALT_NOT_SET:
@@ -3521,14 +3529,20 @@ TNodePtr TSqlQuery::Build(const TRule_delete_stmt& stmt) {
 
     TSourcePtr source = BuildTableSource(Ctx.Pos(), table);
 
+    const bool isBatch = stmt.HasBlock1();
     TNodePtr options = nullptr;
+
     if (stmt.HasBlock6()) {
+        if (isBatch) {
+          Ctx.Error(GetPos(stmt.GetToken2()))
+              << "BATCH DELETE is unsupported with RETURNING";
+          return nullptr;
+        }
+
         options = ReturningList(stmt.GetBlock6().GetRule_returning_columns_list1());
         options = options->Y(options);
     }
 
-    const bool isBatch = stmt.HasBlock1();
-
     if (stmt.HasBlock5()) {
         switch (stmt.GetBlock5().Alt_case()) {
             case TRule_delete_stmt_TBlock5::kAlt1: {
@@ -3585,14 +3599,20 @@ TNodePtr TSqlQuery::Build(const TRule_update_stmt& stmt) {
         return nullptr;
     }
 
+    const bool isBatch = stmt.HasBlock1();
     TNodePtr options = nullptr;
+
     if (stmt.HasBlock5()) {
+        if (isBatch) {
+            Ctx.Error(GetPos(stmt.GetToken2()))
+                << "BATCH UPDATE is unsupported with RETURNING";
+            return nullptr;
+        }
+
         options = ReturningList(stmt.GetBlock5().GetRule_returning_columns_list1());
         options = options->Y(options);
     }
 
-    const bool isBatch = stmt.HasBlock1();
-
     switch (stmt.GetBlock4().Alt_case()) {
         case TRule_update_stmt_TBlock4::kAlt1: {
             const auto& alt = stmt.GetBlock4().GetAlt1();