chore(stateless): fix stateless test of desc after merge main branch

databendlabs · Apr 20, 2022 · fe8c5b3 · fe8c5b3
1 parent 676feff
commit fe8c5b3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 39 deletions.
diff --git a/tests/suites/0_stateless/05_ddl/05_0000_ddl_create_tables.result b/tests/suites/0_stateless/05_ddl/05_0000_ddl_create_tables.result
@@ -25,7 +25,6 @@ NULL
 ====END TEST CREATE TABLE AS SELECT STATEMENT====
 ====TIMESTAMP====
 ====CREATE ALL DATA TYPE TABLE====
-<<<<<<< HEAD
 tiny	TINYINT	NO	0	
 tiny_unsigned	TINYINT UNSIGNED	NO	0	
 smallint	SMALLINT	NO	0	
@@ -36,31 +35,11 @@ bigint	BIGINT	NO	0
 bigint_unsigned	BIGINT UNSIGNED	NO	0	
 float	FLOAT	NO	0	
 double	DOUBLE	NO	0	
-date	DATE16	NO	0	
-datetime	DATETIME32	NO	0	
-ts	DATETIME64(3)	NO	0	
+date	DATE	NO	0	
+datetime	DATETIME_0	NO	0	
+ts	DATETIME_3	NO	0	
 str	VARCHAR	NO	3	
 bool	BOOLEAN	NO	false	
 array	ARRAY	NO	[]	
 obj	OBJECT	NO	{}	
 variant	VARIANT	NO	null	
-=======
-tiny	TINYINT	NO	0
-tiny_unsigned	TINYINT UNSIGNED	NO	0
-smallint	SMALLINT	NO	0
-smallint_unsigned	SMALLINT UNSIGNED	NO	0
-int	INT	NO	0
-int_unsigned	INT UNSIGNED	NO	0
-bigint	BIGINT	NO	0
-bigint_unsigned	BIGINT UNSIGNED	NO	0
-float	FLOAT	NO	0
-double	DOUBLE	NO	0
-date	DATE	NO	0
-datetime	DATETIME_0	NO	0
-ts	DATETIME_3	NO	0
-str	VARCHAR	NO	3
-bool	BOOLEAN	NO	false
-array	ARRAY	NO	[]
-obj	OBJECT	NO	{}
-variant	VARIANT	NO	null
->>>>>>> main
diff --git a/tests/suites/0_stateless/20+_others/20_0000_describe_table.result b/tests/suites/0_stateless/20+_others/20_0000_describe_table.result
@@ -1,23 +1,10 @@
-<<<<<<< HEAD
 a	BIGINT	YES	NULL	
 b	INT	YES	NULL	
 c	VARCHAR	YES	NULL	
 d	SMALLINT	NO	0	
-e	DATE16	NO	0	
+e	DATE	NO	0	
 a	BIGINT	YES	NULL	
 b	INT	YES	NULL	
 c	VARCHAR	YES	NULL	
 d	SMALLINT	NO	0	
-e	DATE16	NO	0	
-=======
-a	BIGINT	YES	NULL
-b	INT	YES	NULL
-c	VARCHAR	YES	NULL
-d	SMALLINT	NO	0
-e	DATE	NO	0
-a	BIGINT	YES	NULL
-b	INT	YES	NULL
-c	VARCHAR	YES	NULL
-d	SMALLINT	NO	0
-e	DATE	NO	0
->>>>>>> main
+e	DATE	NO	0