MDEV-10588 sql_mode=ORACLE: TRUNCATE TABLE t1 [ {DROP|REUSE} STORAGE ]

MariaDB · Apr 5, 2017 · cd1afe0 · cd1afe0
1 parent c0576ba
commit cd1afe0
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 0 deletions.
diff --git a/mysql-test/r/keywords.result b/mysql-test/r/keywords.result
@@ -356,3 +356,5 @@ CREATE TABLE notfound (notfound int);
 DROP TABLE notfound;
 CREATE TABLE raise (raise int);
 DROP TABLE raise;
+CREATE TABLE reuse (reuse int);
+DROP TABLE reuse;
diff --git a/mysql-test/suite/compat/oracle/r/truncate.result b/mysql-test/suite/compat/oracle/r/truncate.result
@@ -0,0 +1,10 @@
+SET sql_mode=ORACLE;
+#
+# MDEV-10588 sql_mode=ORACLE: TRUNCATE TABLE t1 [ {DROP|REUSE} STORAGE ]
+#
+CREATE TABLE t1 (a INT);
+TRUNCATE TABLE t1 REUSE STORAGE;
+TRUNCATE TABLE t1 DROP STORAGE;
+DROP TABLE t1;
+CREATE TABLE reuse (reuse INT);
+DROP TABLE reuse;
diff --git a/mysql-test/suite/compat/oracle/t/truncate.test b/mysql-test/suite/compat/oracle/t/truncate.test
@@ -0,0 +1,16 @@
+SET sql_mode=ORACLE;
+
+--echo #
+--echo # MDEV-10588 sql_mode=ORACLE: TRUNCATE TABLE t1 [ {DROP|REUSE} STORAGE ]
+--echo #
+
+CREATE TABLE t1 (a INT);
+TRUNCATE TABLE t1 REUSE STORAGE;
+TRUNCATE TABLE t1 DROP STORAGE;
+DROP TABLE t1;
+
+# REUSE is actually a reserved word in Oracle.
+# But we don't reserve it for MDEV-10588
+
+CREATE TABLE reuse (reuse INT);
+DROP TABLE reuse;
diff --git a/mysql-test/t/keywords.test b/mysql-test/t/keywords.test
@@ -256,3 +256,6 @@ DROP TABLE notfound;
 
 CREATE TABLE raise (raise int);
 DROP TABLE raise;
+
+CREATE TABLE reuse (reuse int);
+DROP TABLE reuse;
diff --git a/sql/lex.h b/sql/lex.h
@@ -517,6 +517,7 @@ static SYMBOL symbols[] = {
   { "RETURN",           SYM(RETURN_SYM)},
   { "RETURNING",        SYM(RETURNING_SYM)},
   { "RETURNS",		SYM(RETURNS_SYM)},
+  { "REUSE",            SYM(REUSE_SYM)},
   { "REVERSE",		SYM(REVERSE_SYM)},
   { "REVOKE",		SYM(REVOKE)},
   { "RIGHT",		SYM(RIGHT)},

diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
@@ -1369,6 +1369,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
 %token  RETURNING_SYM
 %token  RETURNS_SYM                   /* SQL-2003-R */
 %token  RETURN_SYM                    /* SQL-2003-R */
+%token  REUSE_SYM                     /* Oracle-R   */
 %token  REVERSE_SYM
 %token  REVOKE                        /* SQL-2003-R */
 %token  RIGHT                         /* SQL-2003-R */
@@ -14365,6 +14366,7 @@ keyword_sp:
         | RESUME_SYM               {}
         | RETURNED_SQLSTATE_SYM    {}
         | RETURNS_SYM              {}
+        | REUSE_SYM                {}
         | REVERSE_SYM              {}
         | ROLE_SYM                 {}
         | ROLLUP_SYM               {}

diff --git a/sql/sql_yacc_ora.yy b/sql/sql_yacc_ora.yy
@@ -786,6 +786,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
 %token  RETURNING_SYM
 %token  RETURNS_SYM                   /* SQL-2003-R */
 %token  RETURN_SYM                    /* SQL-2003-R */
+%token  REUSE_SYM                     /* Oracle-R   */
 %token  REVERSE_SYM
 %token  REVOKE                        /* SQL-2003-R */
 %token  RIGHT                         /* SQL-2003-R */
@@ -12341,6 +12342,13 @@ truncate:
             if (lex->m_sql_cmd == NULL)
               MYSQL_YYABORT;
           }
+          opt_truncate_table_storage_clause { }
+        ;
+
+opt_truncate_table_storage_clause:
+          /* Empty */
+        | DROP STORAGE_SYM
+        | REUSE_SYM STORAGE_SYM
         ;
 
 opt_table_sym:
@@ -14507,6 +14515,7 @@ keyword_sp:
         | RESUME_SYM               {}
         | RETURNED_SQLSTATE_SYM    {}
         | RETURNS_SYM              {}
+        | REUSE_SYM                {} /* Oracle-R */
         | REVERSE_SYM              {}
         | ROLE_SYM                 {}
         | ROLLUP_SYM               {}