Merge pull request #697 from benesch/ci-slt

civiz: account for rows_inserted -> rows_affected rename

ci/slt/upload.sh

@@ -15,5 +15,5 @@ if [[ "${BUILDKITE_BRANCH-}" = master && "${BUILDKITE_COMMIT-}" ]]; then
     mkdir -p target
     buildkite-agent artifact download target/slt-summary.json .
     jq --arg commit "$BUILDKITE_COMMIT" -rf ci/slt/parse-summary.jq target/slt-summary.json \
-        | ssh buildkite@mtrlz.dev psql
+        | ssh buildkite@mtrlz.dev psql -v ON_ERROR_STOP=on
 fi

misc/civiz/README.md

@@ -10,7 +10,6 @@ Then:
 
 ```shell
 cd misc/civiz
-python3 -m venv venv
 source venv/bin/activate
 python setup.py develop
 ```

misc/civiz/migrate/versions/c8a6f3f3a2ac_rename_rows_inserted_to_rows_affected.py

@@ -0,0 +1,23 @@
+# Copyright 2019 Materialize, Inc. All rights reserved.
+#
+# This file is part of Materialize. Materialize may not be used or
+# distributed without the express permission of Materialize, Inc.
+
+from alembic import op
+import sqlalchemy as sa
+
+
+revision = 'c8a6f3f3a2ac'
+down_revision = 'e542fdd47f4a'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.alter_column("slt", "wrong_number_of_rows_inserted",
+                    new_column_name="wrong_number_of_rows_affected")
+
+
+def downgrade():
+    op.alter_column("slt", "wrong_number_of_rows_affected",
+                    new_column_name="wrong_number_of_rows_inserted")

misc/civiz/templates/slt.html

@@ -36,7 +36,7 @@ <h1>SQL Logic Test Results</h1>
             <th>Parse failure</th>
             <th>Plan failure</th>
             <th>Unexpected plan success</th>
-            <th>Wrong number of rows inserted</th>
+            <th>Wrong number of rows affected</th>
             <th>Inference failure</th>
             <th>Wrong column names</th>
             <th>Output failure</th>
@@ -63,10 +63,10 @@ <h1>SQL Logic Test Results</h1>
                     {% endif %}
                 </td>
                 <td>
-                    {% if r.wrong_number_of_rows_inserted is none %}
+                    {% if r.wrong_number_of_rows_affected is none %}
                         ?
                     {% else %}
-                        {{ r.wrong_number_of_rows_inserted }}
+                        {{ r.wrong_number_of_rows_affected }}
                     {% endif %}
                 </td>
                 <td>{{ r.inference_failure }}</td>
@@ -82,7 +82,7 @@ <h1>SQL Logic Test Results</h1>
                 <td>{{ r.success }}</td>
                 <td>
                     {{ r.unsupported + r.parse_failure + r.plan_failure +
-                       r.unexpected_plan_success + r.wrong_number_of_rows_inserted +
+                       r.unexpected_plan_success + r.wrong_number_of_rows_affected +
                        r.inference_failure + r.wrong_column_names + r.output_failure +
                        r.bail + r.success }}
                 </td>
@@ -109,7 +109,7 @@ <h1>SQL Logic Test Results</h1>
                         "Bails",
                         "Successes",
                         "Unexpected plan successes",
-                        "Wrong number of rows inserted",
+                        "Wrong number of rows affected",
                         "Wrong column names"
                     ],
                     ...results.map(r => {