Merge pull request #11 from RossOkuno/feature/support-double-quotation

support double quotation in ref function
hiracky16 · Dec 7, 2024 · c77e819 · c77e819
2 parents 3913750 + 9972977
commit c77e819
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/sqlfluff_templater_dataform/templater.py b/sqlfluff_templater_dataform/templater.py
@@ -19,7 +19,7 @@
 # regex pattern for config block and js block
 CONFIG_BLOCK_PATTERN = r'config\s*\{(?:[^{}]|\{(?:[^{}]|\{[^{}]*\})*\})*\}'
 JS_BLOCK_PATTERN = r'js\s*\{(?:[^{}]|\{[^{}]*\})*\}'
-REF_PATTERN = r'\$\{\s*ref\(\s*\'([^\']+)\'(?:\s*,\s*\'([^\']+)\')?\s*\)\s*\}'
+REF_PATTERN = r'\$\{\s*ref\(\s*[\'"]([^\'"]+)[\'"](?:\s*,\s*[\'"]([^\'"]+)[\'"])?\s*\)\s*\}'
 
 class UsedJSBlockError(SQLFluffSkipFile):
     """ This package does not support dataform js block """

diff --git a/test/fixtures/dataform/definitions/test.sqlx b/test/fixtures/dataform/definitions/test.sqlx
@@ -18,7 +18,7 @@ WITH users AS (
 select user_id,
     name,
         age
-    from ${ref('users')}
+    from ${ref("users")}
 )
 , user_orders AS (
     select user_id, order_id, DATE(created_at) AS order_date from ${ref('user_orders')}

diff --git a/test/templater_test.py b/test/templater_test.py
@@ -29,12 +29,24 @@ def test_replace_ref_with_bq_table_single_ref(templater):
     result = templater.replace_ref_with_bq_table(input_sql)
     assert result == expected_sql
 
+def test_replace_ref_with_bq_table_single_ref_double_quotes(templater):
+    input_sql = 'SELECT * FROM ${ref("test")}'
+    expected_sql = "SELECT * FROM `my_project.my_dataset.test`"
+    result = templater.replace_ref_with_bq_table(input_sql)
+    assert result == expected_sql
+
 def test_replace_ref_with_bq_table_with_dataset(templater):
     input_sql = "SELECT * FROM ${ref('other_dataset', 'test')}"
     expected_sql = "SELECT * FROM `my_project.other_dataset.test`"
     result = templater.replace_ref_with_bq_table(input_sql)
     assert result == expected_sql
 
+def test_replace_ref_with_bq_table_with_dataset_double_quotes(templater):
+    input_sql = 'SELECT * FROM ${ref("other_dataset", "test")}'
+    expected_sql = "SELECT * FROM `my_project.other_dataset.test`"
+    result = templater.replace_ref_with_bq_table(input_sql)
+    assert result == expected_sql
+
 def test_replace_ref_with_bq_table_multiple_refs(templater):
     input_sql = "SELECT * FROM ${ref('test')}, ${ref('another')}"
     expected_sql = "SELECT * FROM `my_project.my_dataset.test`, `my_project.my_dataset.another`"