dataform-co · Ekrekr · Jan 4, 2023 · Jan 3, 2023 · Jan 3, 2023 · Jan 3, 2023
diff --git a/examples/common_v1/BUILD b/examples/common_v1/BUILD
diff --git a/examples/common_v1/dataform.json b/examples/common_v1/dataform.json
diff --git a/examples/common_v1/definitions/example_backticks.sql b/examples/common_v1/definitions/example_backticks.sql
diff --git a/examples/common_v1/definitions/example_deferred.js b/examples/common_v1/definitions/example_deferred.js
diff --git a/examples/common_v1/definitions/example_incremental.sql b/examples/common_v1/definitions/example_incremental.sql
diff --git a/examples/common_v1/definitions/example_inline.sql b/examples/common_v1/definitions/example_inline.sql
diff --git a/examples/common_v1/definitions/example_js_blocks.sql b/examples/common_v1/definitions/example_js_blocks.sql
diff --git a/examples/common_v1/definitions/example_table.sql b/examples/common_v1/definitions/example_table.sql
diff --git a/examples/common_v1/definitions/example_table_dependency.sql b/examples/common_v1/definitions/example_table_dependency.sql
diff --git a/examples/common_v1/definitions/example_using_inline.sql b/examples/common_v1/definitions/example_using_inline.sql
diff --git a/examples/common_v1/definitions/example_view.sql b/examples/common_v1/definitions/example_view.sql
diff --git a/examples/common_v1/definitions/sample_data.sql b/examples/common_v1/definitions/sample_data.sql
diff --git a/examples/common_v1/definitions/test.js b/examples/common_v1/definitions/test.js
diff --git a/examples/common_v1/includes/macros.js b/examples/common_v1/includes/macros.js
diff --git a/examples/common_v1/package.json b/examples/common_v1/package.json
diff --git a/examples/common_v2/BUILD b/examples/common_v2/BUILD
@@ -13,6 +13,5 @@ node_modules(
     name = "node_modules",
     deps = [
         "//packages/@dataform/core:package_tar",
-        "//packages/@dataform/sql:package_tar",
     ],
 )
diff --git a/examples/common_v2/definitions/example_incremental.sqlx b/examples/common_v2/definitions/example_incremental.sqlx
@@ -1,8 +1,6 @@
 config { type: "incremental", protected: true, hermetic: false }
 
-js {  const sql = require("@dataform/sql"); }
-
-select ${sql().timestamps.currentUTC()} as ts
+select current_timestamp() as ts
 
 incremental_where {
     ts > (select max(ts) from ${self()}) or (select max(ts) from ${self()}) is null

diff --git a/examples/common_v2/definitions/example_is_incremental.sqlx b/examples/common_v2/definitions/example_is_incremental.sqlx
@@ -1,9 +1,7 @@
 config { type: "incremental", protected: true, hermetic: false }
 
-js {  const sql = require("@dataform/sql"); }
-
 select * from (
-    select ${sql().timestamps.currentUTC()} as ts
+    select current_timestamp() as ts
 )
 
 ${when(incremental(), `where ts > (select max(ts) from ${self()}) or (select max(ts) from ${self()}) is null`)}

diff --git a/examples/formatter/BUILD b/examples/formatter/BUILD
@@ -13,6 +13,5 @@ node_modules(
     name = "node_modules",
     deps = [
         "//packages/@dataform/core:package_tar",
-        "//packages/@dataform/sql:package_tar",
     ],
 )
diff --git a/examples/never_finishes_compiling/BUILD b/examples/never_finishes_compiling/BUILD
@@ -13,6 +13,5 @@ node_modules(
     name = "node_modules",
     deps = [
         "//packages/@dataform/core:package_tar",
-        "//packages/@dataform/sql:package_tar",
     ],
 )
diff --git a/packages/@dataform/sql/BUILD b/packages/@dataform/sql/BUILD
diff --git a/packages/@dataform/sql/index.ts b/packages/@dataform/sql/index.ts
diff --git a/sql/BUILD b/sql/BUILD
diff --git a/sql/README.md b/sql/README.md
diff --git a/sql/builders/aggregate.ts b/sql/builders/aggregate.ts