@@ -155,13 +155,13 @@ fn test_prepare_statement_to_plan_no_param() {
155155 assert_snapshot ! (
156156 plan,
157157 @r#"
158- Prepare: "my_plan" [ Int32]
158+ Prepare: "my_plan" Int32
159159 Projection: person.id, person.age
160160 Filter: person.age = Int64(10)
161161 TableScan: person
162162 "#
163163 ) ;
164- assert_snapshot ! ( dt, @r#"[ Int32] "# ) ;
164+ assert_snapshot ! ( dt, @r#"Int32"# ) ;
165165
166166 ///////////////////
167167 // replace params with values
@@ -183,13 +183,13 @@ fn test_prepare_statement_to_plan_no_param() {
183183 assert_snapshot ! (
184184 plan,
185185 @r#"
186- Prepare: "my_plan" []
186+ Prepare: "my_plan"
187187 Projection: person.id, person.age
188188 Filter: person.age = Int64(10)
189189 TableScan: person
190190 "#
191191 ) ;
192- assert_snapshot ! ( dt, @r#"[] "# ) ;
192+ assert_snapshot ! ( dt, @r#""# ) ;
193193
194194 ///////////////////
195195 // replace params with values
@@ -265,12 +265,12 @@ fn test_prepare_statement_to_plan_params_as_constants() {
265265 assert_snapshot ! (
266266 plan,
267267 @r#"
268- Prepare: "my_plan" [ Int32]
268+ Prepare: "my_plan" Int32
269269 Projection: $1
270270 EmptyRelation: rows=1
271271 "#
272272 ) ;
273- assert_snapshot ! ( dt, @r#"[ Int32] "# ) ;
273+ assert_snapshot ! ( dt, @r#"Int32"# ) ;
274274
275275 ///////////////////
276276 // replace params with values
@@ -290,12 +290,12 @@ fn test_prepare_statement_to_plan_params_as_constants() {
290290 assert_snapshot ! (
291291 plan,
292292 @r#"
293- Prepare: "my_plan" [ Int32]
293+ Prepare: "my_plan" Int32
294294 Projection: Int64(1) + $1
295295 EmptyRelation: rows=1
296296 "#
297297 ) ;
298- assert_snapshot ! ( dt, @r#"[ Int32] "# ) ;
298+ assert_snapshot ! ( dt, @r#"Int32"# ) ;
299299
300300 ///////////////////
301301 // replace params with values
@@ -315,12 +315,12 @@ fn test_prepare_statement_to_plan_params_as_constants() {
315315 assert_snapshot ! (
316316 plan,
317317 @r#"
318- Prepare: "my_plan" [ Int32, Float64]
318+ Prepare: "my_plan" Int32, Float64
319319 Projection: Int64(1) + $1 + $2
320320 EmptyRelation: rows=1
321321 "#
322322 ) ;
323- assert_snapshot ! ( dt, @r#"[ Int32, Float64] "# ) ;
323+ assert_snapshot ! ( dt, @r#"Int32, Float64"# ) ;
324324
325325 ///////////////////
326326 // replace params with values
@@ -376,7 +376,7 @@ fn test_prepare_statement_infer_types_from_join() {
376376 test. run( ) ,
377377 @r#"
378378 ** Initial Plan:
379- Prepare: "my_plan" [ Int32]
379+ Prepare: "my_plan" Int32
380380 Projection: person.id, orders.order_id
381381 Inner Join: Filter: person.id = orders.customer_id AND person.age = $1
382382 TableScan: person
@@ -424,7 +424,7 @@ fn test_prepare_statement_infer_types_from_predicate() {
424424 test. run( ) ,
425425 @r#"
426426 ** Initial Plan:
427- Prepare: "my_plan" [ Int32]
427+ Prepare: "my_plan" Int32
428428 Projection: person.id, person.age
429429 Filter: person.age = $1
430430 TableScan: person
@@ -476,7 +476,7 @@ fn test_prepare_statement_infer_types_from_between_predicate() {
476476 test. run( ) ,
477477 @r#"
478478 ** Initial Plan:
479- Prepare: "my_plan" [ Int32, Int32]
479+ Prepare: "my_plan" Int32, Int32
480480 Projection: person.id, person.age
481481 Filter: person.age BETWEEN $1 AND $2
482482 TableScan: person
@@ -533,7 +533,7 @@ fn test_prepare_statement_infer_types_subquery() {
533533 test. run( ) ,
534534 @r#"
535535 ** Initial Plan:
536- Prepare: "my_plan" [ UInt32]
536+ Prepare: "my_plan" UInt32
537537 Projection: person.id, person.age
538538 Filter: person.age = (<subquery>)
539539 Subquery:
@@ -598,7 +598,7 @@ fn test_prepare_statement_update_infer() {
598598 test. run( ) ,
599599 @r#"
600600 ** Initial Plan:
601- Prepare: "my_plan" [ Int32, UInt32]
601+ Prepare: "my_plan" Int32, UInt32
602602 Dml: op=[Update] table=[person]
603603 Projection: person.id AS id, person.first_name AS first_name, person.last_name AS last_name, $1 AS age, person.state AS state, person.salary AS salary, person.birth_date AS birth_date, person.😀 AS 😀
604604 Filter: person.id = $2
@@ -662,7 +662,7 @@ fn test_prepare_statement_insert_infer() {
662662 test. run( ) ,
663663 @r#"
664664 ** Initial Plan:
665- Prepare: "my_plan" [ UInt32, Utf8, Utf8]
665+ Prepare: "my_plan" UInt32, Utf8, Utf8
666666 Dml: op=[Insert Into] table=[person]
667667 Projection: column1 AS id, column2 AS first_name, column3 AS last_name, CAST(NULL AS Int32) AS age, CAST(NULL AS Utf8) AS state, CAST(NULL AS Float64) AS salary, CAST(NULL AS Timestamp(Nanosecond, None)) AS birth_date, CAST(NULL AS Int32) AS 😀
668668 Values: ($1, $2, $3)
@@ -681,13 +681,13 @@ fn test_prepare_statement_to_plan_one_param() {
681681 assert_snapshot ! (
682682 plan,
683683 @r#"
684- Prepare: "my_plan" [ Int32]
684+ Prepare: "my_plan" Int32
685685 Projection: person.id, person.age
686686 Filter: person.age = $1
687687 TableScan: person
688688 "#
689689 ) ;
690- assert_snapshot ! ( dt, @r#"[ Int32] "# ) ;
690+ assert_snapshot ! ( dt, @r#"Int32"# ) ;
691691
692692 ///////////////////
693693 // replace params with values
@@ -714,13 +714,13 @@ fn test_prepare_statement_to_plan_data_type() {
714714 // age is defined as Int32 but prepare statement declares it as DOUBLE/Float64
715715 // Prepare statement and its logical plan should be created successfully
716716 @r#"
717- Prepare: "my_plan" [ Float64]
717+ Prepare: "my_plan" Float64
718718 Projection: person.id, person.age
719719 Filter: person.age = $1
720720 TableScan: person
721721 "#
722722 ) ;
723- assert_snapshot ! ( dt, @r#"[ Float64] "# ) ;
723+ assert_snapshot ! ( dt, @r#"Float64"# ) ;
724724
725725 ///////////////////
726726 // replace params with values still succeed and use Float64
@@ -747,13 +747,13 @@ fn test_prepare_statement_to_plan_multi_params() {
747747 assert_snapshot ! (
748748 plan,
749749 @r#"
750- Prepare: "my_plan" [ Int32, Utf8View, Float64, Int32, Float64, Utf8View]
750+ Prepare: "my_plan" Int32, Utf8View, Float64, Int32, Float64, Utf8View
751751 Projection: person.id, person.age, $6
752752 Filter: person.age IN ([$1, $4]) AND person.salary > $3 AND person.salary < $5 OR person.first_name < $2
753753 TableScan: person
754754 "#
755755 ) ;
756- assert_snapshot ! ( dt, @r#"[ Int32, Utf8View, Float64, Int32, Float64, Utf8View] "# ) ;
756+ assert_snapshot ! ( dt, @r#"Int32, Utf8View, Float64, Int32, Float64, Utf8View"# ) ;
757757
758758 ///////////////////
759759 // replace params with values
@@ -790,15 +790,15 @@ fn test_prepare_statement_to_plan_having() {
790790 assert_snapshot ! (
791791 plan,
792792 @r#"
793- Prepare: "my_plan" [ Int32, Float64, Float64, Float64]
793+ Prepare: "my_plan" Int32, Float64, Float64, Float64
794794 Projection: person.id, sum(person.age)
795795 Filter: sum(person.age) < $1 AND sum(person.age) > Int64(10) OR sum(person.age) IN ([$3, $4])
796796 Aggregate: groupBy=[[person.id]], aggr=[[sum(person.age)]]
797797 Filter: person.salary > $2
798798 TableScan: person
799799 "#
800800 ) ;
801- assert_snapshot ! ( dt, @r#"[ Int32, Float64, Float64, Float64] "# ) ;
801+ assert_snapshot ! ( dt, @r#"Int32, Float64, Float64, Float64"# ) ;
802802
803803 ///////////////////
804804 // replace params with values
@@ -831,13 +831,13 @@ fn test_prepare_statement_to_plan_limit() {
831831 assert_snapshot ! (
832832 plan,
833833 @r#"
834- Prepare: "my_plan" [ Int64, Int64]
834+ Prepare: "my_plan" Int64, Int64
835835 Limit: skip=$1, fetch=$2
836836 Projection: person.id
837837 TableScan: person
838838 "#
839839 ) ;
840- assert_snapshot ! ( dt, @r#"[ Int64, Int64] "# ) ;
840+ assert_snapshot ! ( dt, @r#"Int64, Int64"# ) ;
841841
842842 // replace params with values
843843 let param_values = vec ! [ ScalarValue :: Int64 ( Some ( 10 ) ) , ScalarValue :: Int64 ( Some ( 200 ) ) ] ;
0 commit comments