Adding upstream version 20.9.0.upstream/20.9.0

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 36 insertions, 14 deletions

diff --git a/tests/dialects/test_databricks.py b/tests/dialects/test_databricks.py
index 7c13e79..8222170 100644
--- a/tests/dialects/test_databricks.py
+++ b/tests/dialects/test_databricks.py
@@ -1,3 +1,5 @@
+from sqlglot import transpile
+from sqlglot.errors import ParseError
 from tests.dialects.test_dialect import Validator
 
 
@@ -28,6 +30,14 @@ class TestDatabricks(Validator):
             "SELECT * FROM sales UNPIVOT EXCLUDE NULLS (sales FOR quarter IN (q1 AS `Jan-Mar`))"
         )
 
+        self.validate_identity(
+            "CREATE FUNCTION add_one(x INT) RETURNS INT LANGUAGE PYTHON AS $$def add_one(x):\n  return x+1$$"
+        )
+
+        self.validate_identity(
+            "CREATE FUNCTION add_one(x INT) RETURNS INT LANGUAGE PYTHON AS $FOO$def add_one(x):\n  return x+1$FOO$"
+        )
+
         self.validate_all(
             "CREATE TABLE foo (x INT GENERATED ALWAYS AS (YEAR(y)))",
             write={
@@ -42,6 +52,18 @@ class TestDatabricks(Validator):
             },
         )
 
+        with self.assertRaises(ParseError):
+            transpile(
+                "CREATE FUNCTION add_one(x INT) RETURNS INT LANGUAGE PYTHON AS $foo$def add_one(x):\n  return x+1$$",
+                read="databricks",
+            )
+
+        with self.assertRaises(ParseError):
+            transpile(
+                "CREATE FUNCTION add_one(x INT) RETURNS INT LANGUAGE PYTHON AS $foo bar$def add_one(x):\n  return x+1$foo bar$",
+                read="databricks",
+            )
+
     # https://docs.databricks.com/sql/language-manual/functions/colonsign.html
     def test_json(self):
         self.validate_identity("""SELECT c1 : price FROM VALUES ('{ "price": 5 }') AS T(c1)""")
@@ -81,77 +103,77 @@ class TestDatabricks(Validator):
         self.validate_all(
             "SELECT DATEDIFF(year, 'start', 'end')",
             write={
-                "tsql": "SELECT DATEDIFF(year, 'start', 'end')",
-                "databricks": "SELECT DATEDIFF(year, 'start', 'end')",
+                "tsql": "SELECT DATEDIFF(YEAR, 'start', 'end')",
+                "databricks": "SELECT DATEDIFF(YEAR, 'start', 'end')",
             },
         )
         self.validate_all(
             "SELECT DATEDIFF(microsecond, 'start', 'end')",
             write={
-                "databricks": "SELECT DATEDIFF(microsecond, 'start', 'end')",
+                "databricks": "SELECT DATEDIFF(MICROSECOND, 'start', 'end')",
                 "postgres": "SELECT CAST(EXTRACT(epoch FROM CAST('end' AS TIMESTAMP) - CAST('start' AS TIMESTAMP)) * 1000000 AS BIGINT)",
             },
         )
         self.validate_all(
             "SELECT DATEDIFF(millisecond, 'start', 'end')",
             write={
-                "databricks": "SELECT DATEDIFF(millisecond, 'start', 'end')",
+                "databricks": "SELECT DATEDIFF(MILLISECOND, 'start', 'end')",
                 "postgres": "SELECT CAST(EXTRACT(epoch FROM CAST('end' AS TIMESTAMP) - CAST('start' AS TIMESTAMP)) * 1000 AS BIGINT)",
             },
         )
         self.validate_all(
             "SELECT DATEDIFF(second, 'start', 'end')",
             write={
-                "databricks": "SELECT DATEDIFF(second, 'start', 'end')",
+                "databricks": "SELECT DATEDIFF(SECOND, 'start', 'end')",
                 "postgres": "SELECT CAST(EXTRACT(epoch FROM CAST('end' AS TIMESTAMP) - CAST('start' AS TIMESTAMP)) AS BIGINT)",
             },
         )
         self.validate_all(
             "SELECT DATEDIFF(minute, 'start', 'end')",
             write={
-                "databricks": "SELECT DATEDIFF(minute, 'start', 'end')",
+                "databricks": "SELECT DATEDIFF(MINUTE, 'start', 'end')",
                 "postgres": "SELECT CAST(EXTRACT(epoch FROM CAST('end' AS TIMESTAMP) - CAST('start' AS TIMESTAMP)) / 60 AS BIGINT)",
             },
         )
         self.validate_all(
             "SELECT DATEDIFF(hour, 'start', 'end')",
             write={
-                "databricks": "SELECT DATEDIFF(hour, 'start', 'end')",
+                "databricks": "SELECT DATEDIFF(HOUR, 'start', 'end')",
                 "postgres": "SELECT CAST(EXTRACT(epoch FROM CAST('end' AS TIMESTAMP) - CAST('start' AS TIMESTAMP)) / 3600 AS BIGINT)",
             },
         )
         self.validate_all(
             "SELECT DATEDIFF(day, 'start', 'end')",
             write={
-                "databricks": "SELECT DATEDIFF(day, 'start', 'end')",
+                "databricks": "SELECT DATEDIFF(DAY, 'start', 'end')",
                 "postgres": "SELECT CAST(EXTRACT(epoch FROM CAST('end' AS TIMESTAMP) - CAST('start' AS TIMESTAMP)) / 86400 AS BIGINT)",
             },
         )
         self.validate_all(
             "SELECT DATEDIFF(week, 'start', 'end')",
             write={
-                "databricks": "SELECT DATEDIFF(week, 'start', 'end')",
+                "databricks": "SELECT DATEDIFF(WEEK, 'start', 'end')",
                 "postgres": "SELECT CAST(EXTRACT(days FROM (CAST('end' AS TIMESTAMP) - CAST('start' AS TIMESTAMP))) / 7 AS BIGINT)",
             },
         )
         self.validate_all(
             "SELECT DATEDIFF(month, 'start', 'end')",
             write={
-                "databricks": "SELECT DATEDIFF(month, 'start', 'end')",
+                "databricks": "SELECT DATEDIFF(MONTH, 'start', 'end')",
                 "postgres": "SELECT CAST(EXTRACT(year FROM AGE(CAST('end' AS TIMESTAMP), CAST('start' AS TIMESTAMP))) * 12 + EXTRACT(month FROM AGE(CAST('end' AS TIMESTAMP), CAST('start' AS TIMESTAMP))) AS BIGINT)",
             },
         )
         self.validate_all(
             "SELECT DATEDIFF(quarter, 'start', 'end')",
             write={
-                "databricks": "SELECT DATEDIFF(quarter, 'start', 'end')",
+                "databricks": "SELECT DATEDIFF(QUARTER, 'start', 'end')",
                 "postgres": "SELECT CAST(EXTRACT(year FROM AGE(CAST('end' AS TIMESTAMP), CAST('start' AS TIMESTAMP))) * 4 + EXTRACT(month FROM AGE(CAST('end' AS TIMESTAMP), CAST('start' AS TIMESTAMP))) / 3 AS BIGINT)",
             },
         )
         self.validate_all(
             "SELECT DATEDIFF(year, 'start', 'end')",
             write={
-                "databricks": "SELECT DATEDIFF(year, 'start', 'end')",
+                "databricks": "SELECT DATEDIFF(YEAR, 'start', 'end')",
                 "postgres": "SELECT CAST(EXTRACT(year FROM AGE(CAST('end' AS TIMESTAMP), CAST('start' AS TIMESTAMP))) AS BIGINT)",
             },
         )
@@ -160,8 +182,8 @@ class TestDatabricks(Validator):
         self.validate_all(
             "SELECT DATEADD(year, 1, '2020-01-01')",
             write={
-                "tsql": "SELECT DATEADD(year, 1, '2020-01-01')",
-                "databricks": "SELECT DATEADD(year, 1, '2020-01-01')",
+                "tsql": "SELECT DATEADD(YEAR, 1, '2020-01-01')",
+                "databricks": "SELECT DATEADD(YEAR, 1, '2020-01-01')",
             },
         )
         self.validate_all(