Merge pull request #451 from simmartynas/feat/add-hyphen-detection

Detect hyphen in hard coded reference
dbt-labs · May 9, 2024 · fcb464c · fcb464c
2 parents 54f4689 + 19fca6d
commit fcb464c
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 19 deletions.
diff --git a/integration_tests/models/marts/fct_model_6.sql b/integration_tests/models/marts/fct_model_6.sql
@@ -65,7 +65,11 @@ select 1 as id
   union all
   select 
       4 as id
-  from 'raw_relation_4'    
+  from 'raw_relation_4'
+  union all
+  select
+      4 as id
+  from `project-name.dataset_name.table_name`
   union all
   select
       4 as id

diff --git a/integration_tests/seeds/dag/test_fct_hard_coded_references.csv b/integration_tests/seeds/dag/test_fct_hard_coded_references.csv
@@ -1,2 +1,2 @@
 model,hard_coded_references
-fct_model_6,"""my_db"".""my_schema"".""my_table"", ""my_schema"".""raw_relation_5"", ""raw_relation_2"", 'my_db'.'my_schema'.'my_table', 'my_schema'.'raw_relation_5', 'raw_relation_4', [my_db].[my_schema].[my_table], [my_schema].[raw_relation_5], [raw_relation_3], `my_db`.`my_schema`.`my_table`, `my_schema`.`raw_relation_5`, `raw_relation_1`, my_db.my_schema.my_table, my_schema.raw_relation_5, {{ var(""my_table_reference"") }}, {{ var(""my_table_reference"", ""table_d"") }}, {{ var('my_table_reference') }}, {{ var('my_table_reference', 'table_d') }}"
+fct_model_6,"""my_db"".""my_schema"".""my_table"", ""my_schema"".""raw_relation_5"", ""raw_relation_2"", 'my_db'.'my_schema'.'my_table', 'my_schema'.'raw_relation_5', 'raw_relation_4', [my_db].[my_schema].[my_table], [my_schema].[raw_relation_5], [raw_relation_3], `my_db`.`my_schema`.`my_table`, `my_schema`.`raw_relation_5`, `project-name.dataset_name.table_name`, `raw_relation_1`, my_db.my_schema.my_table, my_schema.raw_relation_5, {{ var(""my_table_reference"") }}, {{ var(""my_table_reference"", ""table_d"") }}, {{ var('my_table_reference') }}, {{ var('my_table_reference', 'table_d') }}"
diff --git a/macros/find_all_hard_coded_references.sql b/macros/find_all_hard_coded_references.sql
@@ -134,7 +134,7 @@
 
                 # third matching group
                 # at least 1 word character
-                (\w+)
+                (\w+-?\w+)
 
                 # fouth matching group
                 # 1 or 0 of (closing bracket, backtick, or quotation mark)
@@ -150,7 +150,7 @@
 
                 # seventh matching group
                 # at least 1 word character
-                (\w+)
+                (\w+-?\w+)
 
                 # eighth matching group
                 # 1 or 0 of (closing bracket, backtick, or quotation mark) folowed by a whitespace character or end of string
@@ -164,48 +164,48 @@
                 (?<!distinct\s)
 
                 # first matching group
-                # from or join followed by at least 1 whitespace character 
+                # from or join followed by at least 1 whitespace character
                 (from|join)\s+
 
                 # second matching group
-                # 1 or 0 of (opening bracket, backtick, or quotation mark)            
+                # 1 or 0 of (opening bracket, backtick, or quotation mark)
                 ([\[`\"\']?)
 
                 # third matching group
                 # at least 1 word character
-                (\w+)
+                (\w+-?\w+)
 
                 # fouth matching group
-                # 1 or 0 of (closing bracket, backtick, or quotation mark)            
+                # 1 or 0 of (closing bracket, backtick, or quotation mark)
                 ([\]`\"\']?)
 
                 # fifth matching group
-                # a period            
+                # a period
                 (\.)
 
                 # sixth matching group
                 # 1 or 0 of (opening bracket, backtick, or quotation mark)
                 ([\[`\"\']?)
 
                 # seventh matching group
-                # at least 1 word character            
-                (\w+)
+                # at least 1 word character
+                (\w+-?\w+)
 
                 # eighth matching group
-                # 1 or 0 of (closing bracket, backtick, or quotation mark) 
+                # 1 or 0 of (closing bracket, backtick, or quotation mark)
                 ([\]`\"\']?)
 
                 # ninth matching group
-                # a period             
+                # a period
                 (\.)
 
                 # tenth matching group
-                # 1 or 0 of (closing bracket, backtick, or quotation mark)             
+                # 1 or 0 of (closing bracket, backtick, or quotation mark)
                 ([\[`\"\']?)
 
                 # eleventh matching group
-                # at least 1 word character   
-                (\w+)
+                # at least 1 word character
+                (\w+-?\w+)
 
                 # twelfth matching group
                 # 1 or 0 of (closing bracket, backtick, or quotation mark) followed by a whitespace character or end of string
@@ -219,16 +219,16 @@
                 (?<!distinct\s)
 
                 # first matching group
-                # from or join followed by at least 1 whitespace character             
+                # from or join followed by at least 1 whitespace character
                 (from|join)\s+
 
                 # second matching group
-                # 1 of (opening bracket, backtick, or quotation mark)            
+                # 1 of (opening bracket, backtick, or quotation mark)
                 ([\[`\"\'])
 
                 # third matching group
                 # at least 1 word character
-                (\w+)
+                (\w+-?\w+)
                 
                 # fourth matching group
                 # 1 of (closing bracket, backtick, or quotation mark) folowed by a whitespace character or end of string