[spam] chang file structrue.

Signed-off-by: clundro <[email protected]>
cmu-db · Mar 28, 2023 · 5fe8610 · 5fe8610
1 parent 85bef31
commit 5fe8610
Show file tree

Hide file tree

Showing 4 changed files with 16,120 additions and 16,027 deletions.
diff --git a/test/binder/binder_test.cpp b/test/binder/binder_test.cpp
@@ -173,11 +173,16 @@ TEST(BinderTest, BindBinaryOp) {
   PrintStatements(statements);
 }
 
-TEST(BinderTest, DIABLED_BindCopyFrom) {
+TEST(BinderTest, DISABLED_BindCopyFrom) {
   auto statements = TryBind("copy from 'a.csv'");
   PrintStatements(statements);
 }
 
+TEST(BinderTest, DISABLED_SelectFromCSV) {
+  auto statements = TryBind("select * from 'a.csv'");
+  PrintStatements(statements);
+}
+
 // TODO(chi): subquery is not supported yet
 TEST(BinderTest, DISABLED_BindUncorrelatedSubquery) {
   auto statements = TryBind("select * from (select * from a) INNER JOIN (select * from b) ON a.x = b.y");

diff --git a/third_party/libpg_query/grammar/statements/copy.y b/third_party/libpg_query/grammar/statements/copy.y
@@ -1,23 +1,4 @@
-CopyStmt:	COPY FROM copy_file_name
-				{
-					PGCopyStmt *n = makeNode(PGCopyStmt);
-					n->relation = NULL;
-					n->query = NULL;
-					n->attlist = NIL;
-					n->is_from = true;
-					n->is_program = true;
-					n->filename = $3;
-					n->options = NIL;
-
-					if (n->is_program && n->filename == NULL)
-						ereport(ERROR,
-								(errcode(PG_ERRCODE_SYNTAX_ERROR),
-								 errmsg("COPYFROMFILE not allowed with NULL"),
-								 parser_errposition(@3)));
-
-					$$ = (PGNode *)n;
-				}
-			|	COPY opt_binary qualified_name opt_column_list opt_oids
+CopyStmt: COPY opt_binary qualified_name opt_column_list opt_oids
 			copy_from opt_program copy_file_name copy_delimiter opt_with copy_options
 				{
 					PGCopyStmt *n = makeNode(PGCopyStmt);
@@ -63,6 +44,25 @@ CopyStmt:	COPY FROM copy_file_name
 								 errmsg("STDIN/STDOUT not allowed with PROGRAM"),
 								 parser_errposition(@5)));
 
+					$$ = (PGNode *)n;
+				}
+			| COPY FROM copy_file_name
+				{
+					PGCopyStmt *n = makeNode(PGCopyStmt);
+					n->relation = NULL;
+					n->query = NULL;
+					n->attlist = NIL;
+					n->is_from = true;
+					n->is_program = false;
+					n->filename = $3;
+					n->options = NIL;
+
+					if (n->filename == NULL)
+						ereport(ERROR,
+								(errcode(PG_ERRCODE_SYNTAX_ERROR),
+								 errmsg("COPYFROMFILE not allowed with NULL"),
+								 parser_errposition(@3)));
+
 					$$ = (PGNode *)n;
 				}
 		;