Remove @dataform/assertion-utils in favor of auto-assertions

scripts/publish

@@ -15,7 +15,6 @@ fi
 
 bazel test //... --build_tests_only -- -tests/integration:snowflake.spec
 
-bazel run packages/@dataform/assertion_utils:package.publish
 bazel run packages/@dataform/cli:package.publish
 bazel run packages/@dataform/core:package.publish
 bazel run cli:push

tests/integration/bigquery.spec.ts

@@ -41,11 +41,10 @@ suite("@dataform/integration/bigquery", { parallel: true }, ({ before, after })
       const executedGraph = await dfapi.run(dbadapter, executionGraph).result();
 
       const actionMap = keyBy(executedGraph.actions, v => targetAsReadableString(v.target));
-      expect(Object.keys(actionMap).length).eql(19);
+      expect(Object.keys(actionMap).length).eql(17);
 
       // Check the status of action execution.
       const expectedFailedActions = [
-        "dataform-integration-tests.df_integration_test_eu_assertions_project_e2e.example_assertion_uniqueness_fail",
         "dataform-integration-tests.df_integration_test_eu_assertions_project_e2e.example_assertion_fail",
         "dataform-integration-tests.df_integration_test_eu_project_e2e.example_operation_partial_fail"
       ];
@@ -61,7 +60,7 @@ suite("@dataform/integration/bigquery", { parallel: true }, ({ before, after })
 
       expect(
         actionMap[
-          "dataform-integration-tests.df_integration_test_eu_assertions_project_e2e.example_assertion_uniqueness_fail"
+          "dataform-integration-tests.df_integration_test_eu_assertions_project_e2e.example_assertion_fail"
         ].tasks[1].errorMessage
       ).to.eql("bigquery error: Assertion failed: query returned 1 row(s).");
 

tests/integration/bigquery_project/BUILD

@@ -12,7 +12,6 @@ filegroup(
 node_modules(
     name = "node_modules",
     deps = [
-        "//packages/@dataform/assertion_utils:package_tar",
         "//packages/@dataform/core:package_tar",
     ],
 )

tests/integration/bigquery_project/definitions/example_assertion_fail.sqlx

@@ -0,0 +1,8 @@
+config {
+    type: "assertion"
+}
+
+WITH base AS (
+    SELECT val1, SUM(1) as row_count FROM ${ref("sample_data_2")} GROUP BY val1
+)
+SELECT * FROM base WHERE row_count > 1

tests/integration/bigquery_project/definitions/example_assertion_pass.sqlx

@@ -1,5 +1,8 @@
-config { type: "assertion" }
+config {
+    type: "assertion"
+}
 
-js { const assertionUtils = require("@dataform/assertion_utils"); }
-
-${assertionUtils.forDataset(ref("sample_data")).groupedBy(["val"]).getUniqueRowQuery()}
+WITH base AS (
+    SELECT val1, val2, SUM(1) as row_count FROM ${ref("sample_data_2")} GROUP BY val1, val2
+)
+SELECT * FROM base WHERE row_count > 1

tests/integration/bigquery_project/definitions/sample_data.sqlx

@@ -1,6 +1,6 @@
 config {
   type: "view",
-  hermetic: false,
+  hermetic: false
 }
 
 select ${when(dataform.projectConfig.vars.fooVar === "bar", "1", "2")} as val union all

tests/integration/postgres.spec.ts

@@ -37,11 +37,10 @@ suite("@dataform/integration/postgres", { parallel: true }, ({ before, after })
     let executedGraph = await dfapi.run(dbadapter, executionGraph).result();
 
     const actionMap = keyBy(executedGraph.actions, v => targetAsReadableString(v.target));
-    expect(Object.keys(actionMap).length).eql(13);
+    expect(Object.keys(actionMap).length).eql(11);
 
     // Check the status of action execution.
     const expectedFailedActions = [
-      "df_integration_test_assertions_project_e2e.example_assertion_uniqueness_fail",
       "df_integration_test_assertions_project_e2e.example_assertion_fail"
     ];
     for (const actionName of Object.keys(actionMap)) {
@@ -55,8 +54,8 @@ suite("@dataform/integration/postgres", { parallel: true }, ({ before, after })
     }
 
     expect(
-      actionMap["df_integration_test_assertions_project_e2e.example_assertion_uniqueness_fail"]
-        .tasks[2].errorMessage
+      actionMap["df_integration_test_assertions_project_e2e.example_assertion_fail"].tasks[2]
+        .errorMessage
     ).to.eql("postgres error: Assertion failed: query returned 1 row(s).");
 
     // Check the data in the incremental table.

tests/integration/postgres_project/BUILD

@@ -12,7 +12,6 @@ filegroup(
 node_modules(
     name = "node_modules",
     deps = [
-        "//packages/@dataform/assertion_utils:package_tar",
         "//packages/@dataform/core:package_tar",
     ],
 )

tests/integration/postgres_project/definitions/example_assertion_fail.sqlx

@@ -0,0 +1,8 @@
+config {
+    type: "assertion"
+}
+
+WITH base AS (
+    SELECT val1, SUM(1) as row_count FROM ${ref("sample_data_2")} GROUP BY val1
+)
+SELECT * FROM base WHERE row_count > 1

tests/integration/postgres_project/definitions/example_assertion_pass.sqlx

@@ -1,5 +1,8 @@
-config { type: "assertion" }
+config {
+    type: "assertion"
+}
 
-js { const assertionUtils = require("@dataform/assertion_utils"); }
-
-${assertionUtils.forDataset(ref("sample_data")).groupedBy(["val"]).getUniqueRowQuery()}
+WITH base AS (
+    SELECT val1, val2, SUM(1) as row_count FROM ${ref("sample_data_2")} GROUP BY val1, val2
+)
+SELECT * FROM base WHERE row_count > 1

tests/integration/presto_project/BUILD

@@ -12,7 +12,6 @@ filegroup(
 node_modules(
     name = "node_modules",
     deps = [
-        "//packages/@dataform/assertion_utils:package_tar",
         "//packages/@dataform/core:package_tar",
     ],
 )

tests/integration/redshift.spec.ts

@@ -41,7 +41,6 @@ suite("@dataform/integration/redshift", { parallel: true }, ({ before, after })
 
     // Check the status of action execution.
     const expectedFailedActions = [
-      "df_integration_test_assertions_project_e2e.example_assertion_uniqueness_fail",
       "df_integration_test_assertions_project_e2e.example_assertion_fail"
     ];
     for (const actionName of Object.keys(actionMap)) {
@@ -55,8 +54,8 @@ suite("@dataform/integration/redshift", { parallel: true }, ({ before, after })
     }
 
     expect(
-      actionMap["df_integration_test_assertions_project_e2e.example_assertion_uniqueness_fail"]
-        .tasks[2].errorMessage
+      actionMap["df_integration_test_assertions_project_e2e.example_assertion_fail"].tasks[2]
+        .errorMessage
     ).to.eql("redshift error: Assertion failed: query returned 1 row(s).");
 
     // Check the status of the s3 load operation.

tests/integration/redshift_project/BUILD

@@ -12,7 +12,6 @@ filegroup(
 node_modules(
     name = "node_modules",
     deps = [
-        "//packages/@dataform/assertion_utils:package_tar",
         "//packages/@dataform/core:package_tar",
     ],
 )

tests/integration/redshift_project/definitions/example_assertion_fail.sqlx

@@ -0,0 +1,8 @@
+config {
+    type: "assertion"
+}
+
+WITH base AS (
+    SELECT val1, SUM(1) as row_count FROM ${ref("sample_data_2")} GROUP BY val1
+)
+SELECT * FROM base WHERE row_count > 1

tests/integration/redshift_project/definitions/example_assertion_pass.sqlx

@@ -1,5 +1,8 @@
-config { type: "assertion" }
+config {
+    type: "assertion"
+}
 
-js { const assertionUtils = require("@dataform/assertion_utils"); }
-
-${assertionUtils.forDataset(ref("sample_data")).groupedBy(["val"]).getUniqueRowQuery()}
+WITH base AS (
+    SELECT val1, val2, SUM(1) as row_count FROM ${ref("sample_data_2")} GROUP BY val1, val2
+)
+SELECT * FROM base WHERE row_count > 1

tests/integration/snowflake.spec.ts

@@ -44,11 +44,10 @@ suite("@dataform/integration/snowflake", ({ before, after }) => {
     let executedGraph = await dfapi.run(dbadapter, executionGraph).result();
 
     const actionMap = keyBy(executedGraph.actions, v => targetAsReadableString(v.target));
-    expect(Object.keys(actionMap).length).eql(20);
+    expect(Object.keys(actionMap).length).eql(18);
 
     // Check the status of action execution.
     const expectedFailedActions = [
-      "INTEGRATION_TESTS.DF_INTEGRATION_TEST_ASSERTIONS_PROJECT_E2E.EXAMPLE_ASSERTION_UNIQUENESS_FAIL",
       "INTEGRATION_TESTS.DF_INTEGRATION_TEST_ASSERTIONS_PROJECT_E2E.EXAMPLE_ASSERTION_FAIL"
     ];
     for (const actionName of Object.keys(actionMap)) {
@@ -65,7 +64,7 @@ suite("@dataform/integration/snowflake", ({ before, after }) => {
 
     expect(
       actionMap[
-        "INTEGRATION_TESTS.DF_INTEGRATION_TEST_ASSERTIONS_PROJECT_E2E.EXAMPLE_ASSERTION_UNIQUENESS_FAIL"
+        "INTEGRATION_TESTS.DF_INTEGRATION_TEST_ASSERTIONS_PROJECT_E2E.EXAMPLE_ASSERTION_FAIL"
       ].tasks[1].errorMessage
     ).to.eql("snowflake error: Assertion failed: query returned 1 row(s).");
 

tests/integration/snowflake_project/BUILD

@@ -12,7 +12,6 @@ filegroup(
 node_modules(
     name = "node_modules",
     deps = [
-        "//packages/@dataform/assertion_utils:package_tar",
         "//packages/@dataform/core:package_tar",
     ],
 )

tests/integration/snowflake_project/definitions/example_assertion_fail.sqlx

@@ -0,0 +1,8 @@
+config {
+    type: "assertion"
+}
+
+WITH base AS (
+    SELECT val1, SUM(1) as row_count FROM ${ref("sample_data_2")} GROUP BY val1
+)
+SELECT * FROM base WHERE row_count > 1

tests/integration/snowflake_project/definitions/example_assertion_pass.sqlx

@@ -1,5 +1,8 @@
-config { type: "assertion" }
+config {
+    type: "assertion"
+}
 
-js { const assertionUtils = require("@dataform/assertion_utils"); }
-
-${assertionUtils.forDataset(ref("sample_data")).groupedBy(["val"]).getUniqueRowQuery()}
+WITH base AS (
+    SELECT val1, val2, SUM(1) as row_count FROM ${ref("sample_data_2")} GROUP BY val1, val2
+)
+SELECT * FROM base WHERE row_count > 1