Restore parameter tests

datafusion/core/tests/sql/select.rs

@@ -19,6 +19,85 @@ use super::*;
 use datafusion_common::ScalarValue;
 use tempfile::TempDir;
 
+#[tokio::test]
+async fn test_list_query_parameters() -> Result<()> {
+    let tmp_dir = TempDir::new()?;
+    let partition_count = 4;
+    let ctx = create_ctx_with_partition(&tmp_dir, partition_count).await?;
+
+    let results = ctx
+        .sql("SELECT * FROM test WHERE c1 = $1")
+        .await?
+        .with_param_values(vec![ScalarValue::from(3i32)])?
+        .collect()
+        .await?;
+    let expected = vec![
+        "+----+----+-------+",
+        "| c1 | c2 | c3    |",
+        "+----+----+-------+",
+        "| 3  | 1  | false |",
+        "| 3  | 10 | true  |",
+        "| 3  | 2  | true  |",
+        "| 3  | 3  | false |",
+        "| 3  | 4  | true  |",
+        "| 3  | 5  | false |",
+        "| 3  | 6  | true  |",
+        "| 3  | 7  | false |",
+        "| 3  | 8  | true  |",
+        "| 3  | 9  | false |",
+        "+----+----+-------+",
+    ];
+    assert_batches_sorted_eq!(expected, &results);
+    Ok(())
+}
+
+#[tokio::test]
+async fn test_named_query_parameters() -> Result<()> {
+    let tmp_dir = TempDir::new()?;
+    let partition_count = 4;
+    let ctx = create_ctx_with_partition(&tmp_dir, partition_count).await?;
+
+    // sql to statement then to logical plan with parameters
+    // c1 defined as UINT32, c2 defined as UInt64
+    let results = ctx
+        .sql("SELECT c1, c2 FROM test WHERE c1 > $coo AND c1 < $foo")
+        .await?
+        .with_param_values(vec![
+            ("foo", ScalarValue::UInt32(Some(3))),
+            ("coo", ScalarValue::UInt32(Some(0))),
+        ])?
+        .collect()
+        .await?;
+    let expected = vec![
+        "+----+----+",
+        "| c1 | c2 |",
+        "+----+----+",
+        "| 1  | 1  |",
+        "| 1  | 2  |",
+        "| 1  | 3  |",
+        "| 1  | 4  |",
+        "| 1  | 5  |",
+        "| 1  | 6  |",
+        "| 1  | 7  |",
+        "| 1  | 8  |",
+        "| 1  | 9  |",
+        "| 1  | 10 |",
+        "| 2  | 1  |",
+        "| 2  | 2  |",
+        "| 2  | 3  |",
+        "| 2  | 4  |",
+        "| 2  | 5  |",
+        "| 2  | 6  |",
+        "| 2  | 7  |",
+        "| 2  | 8  |",
+        "| 2  | 9  |",
+        "| 2  | 10 |",
+        "+----+----+",
+    ];
+    assert_batches_sorted_eq!(expected, &results);
+    Ok(())
+}
+
 // Test prepare statement from sql to final result
 // This test is equivalent with the test parallel_query_with_filter below but using prepare statement
 #[tokio::test]

datafusion/sqllogictest/test_files/select.slt

@@ -96,12 +96,9 @@ One 1
 Three 1
 NULL 1
 
-##########
-## query_parameters_table_test
-##########
 
 statement ok
-CREATE TABLE query_parameters_table (
+CREATE TABLE test (
   c1 BIGINT NOT NULL,
   c2 BIGINT NOT NULL,
   c3 BOOLEAN NOT NULL,
@@ -146,24 +143,10 @@ CREATE TABLE query_parameters_table (
 (3, 8, true),
 (3, 9, false);
 
-# test_list_query_parameters
-query IIB
-SELECT * FROM query_parameters_table WHERE c1 = 3;
-----
-3 1 false
-3 10 true
-3 2 true
-3 3 false
-3 4 true
-3 5 false
-3 6 true
-3 7 false
-3 8 true
-3 9 false
 
 # parallel_query_with_filter
 query II
-SELECT c1, c2 FROM query_parameters_table WHERE c1 > 0 AND c1 < 3;
+SELECT c1, c2 FROM test WHERE c1 > 0 AND c1 < 3;
 ----
 1 1
 1 10
@@ -190,14 +173,17 @@ SELECT c1, c2 FROM query_parameters_table WHERE c1 > 0 AND c1 < 3;
 # Boolean literal
 ######
 query IB
-SELECT c1, c3 FROM query_parameters_table WHERE c1 > 2 AND c3 = true;
+SELECT c1, c3 FROM test WHERE c1 > 2 AND c3 = true;
 ----
 3 true
 3 true
 3 true
 3 true
 3 true
 
+statement ok
+drop table test;
+
 ######
 # struct test
 ######