fix

kuzudb · Feb 28, 2024 · b521639 · b521639
1 parent 6bf9593
commit b521639
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 75 deletions.
diff --git a/src/binder/bind/bind_import_database.cpp b/src/binder/bind/bind_import_database.cpp
@@ -1,5 +1,3 @@
-#include <iostream>
-
 #include "binder/binder.h"
 #include "binder/copy/bound_import_database.h"
 #include "common/exception/binder.h"

diff --git a/src/include/processor/operator/persistent/import_db.h b/src/include/processor/operator/persistent/import_db.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "common/copier_config/reader_config.h"
 #include "processor/operator/physical_operator.h"
 
 namespace kuzu {

diff --git a/test/test_files/copy/export_import_db.test b/test/test_files/copy/export_import_db.test
@@ -3,83 +3,83 @@
 
 --
 
-#-CASE ExportImportDatabaseDefault
-#
-#-STATEMENT create macro addWithDefault(a,b:=3) as a + b;
-#---- ok
-#-STATEMENT ALTER TABLE User ADD random MAP(STRING, INT64) DEFAULT map(['key1','key2'],[400,250])
-#---- ok
-#-STATEMENT MATCH (p:User) WHERE p.name = 'Adam' return p.random
-#---- 1
-#{key1=400, key2=250}
-#-STATEMENT Export Database "${KUZU_EXPORT_DB_DIRECTORY}_case1/demo-db"
-#---- ok
-#-IMPORT_DATABASE "${KUZU_EXPORT_DB_DIRECTORY}_case1/demo-db"
-#-STATEMENT IMPORT DATABASE "${KUZU_EXPORT_DB_DIRECTORY}_case1/demo-db"
-#---- ok
-#-STATEMENT MATCH (u:User) WHERE u.name = 'Adam' SET u.age = 50
-#---- ok
-#-LOG ReturnAge
-#-STATEMENT MATCH (u:User) WHERE u.name='Adam' RETURN u.age
-#---- 1
-#50
-#-STATEMENT return addWithDefault(2);
-#---- 1
-#5
-#
-#-CASE ExportImportDatabaseWithCSVOption
-#-STATEMENT Export Database "${KUZU_EXPORT_DB_DIRECTORY}_case2/demo-db2" (format="csv", header=true)
-#---- ok
-#-IMPORT_DATABASE "${KUZU_EXPORT_DB_DIRECTORY}_case2/demo-db2"
-#-STATEMENT IMPORT DATABASE "${KUZU_EXPORT_DB_DIRECTORY}_case2/demo-db2"
-#---- ok
-#-STATEMENT MATCH (u:User) WHERE u.name = 'Adam' SET u.age = 50
-#---- ok
-#-LOG ReturnAge
-#-STATEMENT MATCH (u:User) WHERE u.name='Adam' RETURN u.age
-#---- 1
-#50
-#-STATEMENT Export Database "${KUZU_EXPORT_DB_DIRECTORY}_case2/demo-db2" (format='csv', header=true)
-#---- error
-#Binder exception: Directory ${KUZU_EXPORT_DB_DIRECTORY}_case2/demo-db2 already exists.
-#
-#-CASE ExportImportDatabaseWithPARQUET
-#-STATEMENT Export Database "${KUZU_EXPORT_DB_DIRECTORY}_case2/demo-db3" (format='parquet')
-#---- ok
-#-IMPORT_DATABASE "${KUZU_EXPORT_DB_DIRECTORY}_case2/demo-db3"
-#-STATEMENT IMPORT DATABASE "${KUZU_EXPORT_DB_DIRECTORY}_case2/demo-db3"
-#---- ok
-#-STATEMENT MATCH (u:User) WHERE u.name = 'Adam' SET u.age = 50
-#---- ok
-#-LOG ReturnAge
-#-STATEMENT MATCH (u:User) WHERE u.name='Adam' RETURN u.age
-#---- 1
-#50
+-CASE ExportImportDatabaseDefault
+
+-STATEMENT create macro addWithDefault(a,b:=3) as a + b;
+---- ok
+-STATEMENT ALTER TABLE User ADD random MAP(STRING, INT64) DEFAULT map(['key1','key2'],[400,250])
+---- ok
+-STATEMENT MATCH (p:User) WHERE p.name = 'Adam' return p.random
+---- 1
+{key1=400, key2=250}
+-STATEMENT Export Database "${KUZU_EXPORT_DB_DIRECTORY}_case1/demo-db"
+---- ok
+-IMPORT_DATABASE "${KUZU_EXPORT_DB_DIRECTORY}_case1/demo-db"
+-STATEMENT IMPORT DATABASE "${KUZU_EXPORT_DB_DIRECTORY}_case1/demo-db"
+---- ok
+-STATEMENT MATCH (u:User) WHERE u.name = 'Adam' SET u.age = 50
+---- ok
+-LOG ReturnAge
+-STATEMENT MATCH (u:User) WHERE u.name='Adam' RETURN u.age
+---- 1
+50
+-STATEMENT return addWithDefault(2);
+---- 1
+5
+
+-CASE ExportImportDatabaseWithCSVOption
+-STATEMENT Export Database "${KUZU_EXPORT_DB_DIRECTORY}_case2/demo-db2" (format="csv", header=true)
+---- ok
+-IMPORT_DATABASE "${KUZU_EXPORT_DB_DIRECTORY}_case2/demo-db2"
+-STATEMENT IMPORT DATABASE "${KUZU_EXPORT_DB_DIRECTORY}_case2/demo-db2"
+---- ok
+-STATEMENT MATCH (u:User) WHERE u.name = 'Adam' SET u.age = 50
+---- ok
+-LOG ReturnAge
+-STATEMENT MATCH (u:User) WHERE u.name='Adam' RETURN u.age
+---- 1
+50
+-STATEMENT Export Database "${KUZU_EXPORT_DB_DIRECTORY}_case2/demo-db2" (format='csv', header=true)
+---- error
+Binder exception: Directory ${KUZU_EXPORT_DB_DIRECTORY}_case2/demo-db2 already exists.
+
+-CASE ExportImportDatabaseWithPARQUET
+-STATEMENT Export Database "${KUZU_EXPORT_DB_DIRECTORY}_case2/demo-db3" (format='parquet')
+---- ok
+-IMPORT_DATABASE "${KUZU_EXPORT_DB_DIRECTORY}_case2/demo-db3"
+-STATEMENT IMPORT DATABASE "${KUZU_EXPORT_DB_DIRECTORY}_case2/demo-db3"
+---- ok
+-STATEMENT MATCH (u:User) WHERE u.name = 'Adam' SET u.age = 50
+---- ok
+-LOG ReturnAge
+-STATEMENT MATCH (u:User) WHERE u.name='Adam' RETURN u.age
+---- 1
+50
 
 -CASE ExportImportDatabaseError
-#-STATEMENT Export Database "${KUZU_EXPORT_DB_DIRECTORY}_case3/demo-db4" (format='TURTLE')
-#---- error
-#Binder exception: Unsupported file type: TURTLE.
-#
-#-STATEMENT Export Database "${KUZU_EXPORT_DB_DIRECTORY}_case3/demo-db4" (format='npy')
-#---- error
-#Binder exception: Export database currently only supports csv and parquet files.
-#
-#-STATEMENT Export Database "${KUZU_EXPORT_DB_DIRECTORY}_case3/demo-db4" (format=false)
-#---- error
-#Binder exception: The type of format option must be a string.
-#
-#-STATEMENT Export Database "${KUZU_EXPORT_DB_DIRECTORY}_case3/demo-db4" (format='PARQUET', header=true)
-#---- error
-#Binder exception: Only export to csv can have options.
-#
+-STATEMENT Export Database "${KUZU_EXPORT_DB_DIRECTORY}_case3/demo-db4" (format='TURTLE')
+---- error
+Binder exception: Unsupported file type: TURTLE.
+
+-STATEMENT Export Database "${KUZU_EXPORT_DB_DIRECTORY}_case3/demo-db4" (format='npy')
+---- error
+Binder exception: Export database currently only supports csv and parquet files.
+
+-STATEMENT Export Database "${KUZU_EXPORT_DB_DIRECTORY}_case3/demo-db4" (format=false)
+---- error
+Binder exception: The type of format option must be a string.
+
+-STATEMENT Export Database "${KUZU_EXPORT_DB_DIRECTORY}_case3/demo-db4" (format='PARQUET', header=true)
+---- error
+Binder exception: Only export to csv can have options.
+
 -STATEMENT Export Database "${KUZU_EXPORT_DB_DIRECTORY}_case3/demo-db4" (header=true)
 ---- ok
 
-#-IMPORT_DATABASE "${KUZU_EXPORT_DB_DIRECTORY}_case3/demo-db5"
-#-STATEMENT IMPORT DATABASE "${KUZU_EXPORT_DB_DIRECTORY}_case3/demo-db5"
-#---- error
-#Binder exception: Directory ${KUZU_EXPORT_DB_DIRECTORY}_case3/demo-db5 does not exist.
+-IMPORT_DATABASE "${KUZU_EXPORT_DB_DIRECTORY}_case3/demo-db5"
+-STATEMENT IMPORT DATABASE "${KUZU_EXPORT_DB_DIRECTORY}_case3/demo-db5"
+---- error
+Binder exception: Directory ${KUZU_EXPORT_DB_DIRECTORY}_case3/demo-db5 does not exist.
 
 -REMOVE_FILE "${KUZU_EXPORT_DB_DIRECTORY}_case3/demo-db4/schema.cypher"
 -IMPORT_DATABASE "${KUZU_EXPORT_DB_DIRECTORY}_case3/demo-db4"