Updates to address code review

GoogleCloudPlatform · danieldeleo · Apr 7, 2020 · Nov 7, 2019 · Nov 7, 2019 · Nov 7, 2019
commit e956336cd2d28fc87cb9c4b53c92daf66b99fa6b
diff --git a/udfs/tests/create_udf_signatures.py b/udfs/tests/create_udf_signatures.py
@@ -35,10 +35,10 @@ def test_create_udf_signature(self, udf_path):
         job_config.default_dataset = (
             f'{client.project}.{bq_test_dataset}'
         )
-        udf_name = utils.extract_udf_signature(udf_path)
+        udf_signature = utils.extract_udf_signature(udf_path)
         udf_sql = utils.replace_with_test_datasets(
             project_id=client.project,
-            udf_sql=f'CREATE OR REPLACE FUNCTION {udf_name} AS (NULL)')
+            udf_sql=f'CREATE OR REPLACE FUNCTION {udf_signature} AS (NULL)')
         try:
             udf_creation_result = client.query(
                 udf_sql,

diff --git a/udfs/tests/udf_test_utils.py b/udfs/tests/udf_test_utils.py
@@ -63,10 +63,10 @@ def extract_udf_signature(udf_path):
     with open(udf_path) as udf_file:
         udf_sql = udf_file.read()
     udf_sql = udf_sql.replace('\n', ' ')
-    pattern = re.compile(r'FUNCTION\s+(`?.+?`?.*?\)).*?\s+AS')
+    pattern = re.compile(r'FUNCTION\s+(`?.+?`?.*?\).*?\s+)AS')
     match = pattern.search(udf_sql)
     if match:
-        udf_name = match[1]
+        udf_name = match[1].replace('LANGUAGE', '').replace('js', '')
         return udf_name
     else:
         return udf_path