You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mh...@apache.org on 2017/08/22 10:15:27 UTC

[32/32] asterixdb git commit: [ASTERIXDB-2050][SQL] Enforce a Semicolon After Each SQL++ Statement

[ASTERIXDB-2050][SQL] Enforce a Semicolon After Each SQL++ Statement

- user model changes: a semicolon must be added after
  every SQL++ statement.
- storage format changes: no
- interface changes: no

Details:
- Enforce a semicolon after each SQL++ statement.
- Adapt existing SQL++ test cases to new model.

Change-Id: I27e9e8fde5ff867ab569c8d443ba1522738046e3
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1954
Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Till Westmann <ti...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/dc77522b
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/dc77522b
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/dc77522b

Branch: refs/heads/master
Commit: dc77522bf4e732b4801cc962cc0139b4c563bfef
Parents: 6ea45c8
Author: Murtadha Hubail <mh...@apache.org>
Authored: Mon Aug 21 15:22:45 2017 +0300
Committer: Murtadha Hubail <mh...@apache.org>
Committed: Tue Aug 22 03:13:32 2017 -0700

----------------------------------------------------------------------
 .../queries/aggregate/constant-agg.sqlpp        |  8 +--
 .../queries/aggregate/constant-gby-agg.sqlpp    |  8 +--
 .../queries/aggregate/count-dataset.sqlpp       |  2 +-
 .../queries/aggregate/list-dataset.sqlpp        |  2 +-
 .../aggregate/query-ASTERIXDB-1626-2.sqlpp      |  2 +-
 .../aggregate/query-ASTERIXDB-1626-3.sqlpp      |  2 +-
 .../aggregate/query-ASTERIXDB-1626.sqlpp        |  2 +-
 .../primary-between-join_01.sqlpp               |  2 +-
 .../queries/join-singletonbranch-2.sqlpp        |  4 +-
 .../queries/join-singletonbranch-3.sqlpp        |  4 +-
 .../queries/join-singletonbranch.sqlpp          |  4 +-
 .../optimizerts/queries/loj-core.sqlpp          |  4 +-
 .../optimizerts/queries/loj-sugar.sqlpp         |  4 +-
 .../btree-equi-join-non-enforced-05.sqlpp       |  4 +-
 .../btree-equi-join-non-enforced-06.sqlpp       |  4 +-
 .../btree-equi-join-non-enforced-07.sqlpp       |  4 +-
 .../btree-equi-join-non-enforced-08.sqlpp       |  4 +-
 .../btree-equi-join-non-enforced-09.sqlpp       |  4 +-
 .../btree-index-non-enforced-04.sqlpp           |  4 +-
 .../btree-index-non-enforced-05.sqlpp           |  4 +-
 .../btree-index-non-enforced-06.sqlpp           |  4 +-
 .../btree-index-non-enforced-07.sqlpp           |  4 +-
 .../btree-index-non-enforced-08.sqlpp           |  4 +-
 .../btree-index-non-enforced-09.sqlpp           |  4 +-
 .../btree-index-non-enforced-10.sqlpp           |  4 +-
 .../btree-index-non-enforced-105.sqlpp          |  4 +-
 .../btree-index-non-enforced-11.sqlpp           |  4 +-
 .../queries/query-ASTERIXDB-159-3.sqlpp         |  2 +-
 .../queries/query-ASTERIXDB-1671.sqlpp          |  2 +-
 .../queries/query-ASTERIXDB-1806.sqlpp          |  2 +-
 .../queries/query-ASTERIXDB-810-2.sqlpp         |  2 +-
 .../queries/query-ASTERIXDB-810.sqlpp           |  2 +-
 .../optimizerts/queries/subquery/exists.sqlpp   |  4 +-
 .../optimizerts/queries/subquery/in.sqlpp       |  4 +-
 .../queries/subquery/in_correlated.sqlpp        |  4 +-
 .../queries/subquery/not_exists.sqlpp           |  4 +-
 .../queries/tpcds/query-ASTERIXDB-1580.sqlpp    | 10 +--
 .../tpcds/query-ASTERIXDB-1581-correlated.sqlpp |  4 +-
 .../queries/tpcds/query-ASTERIXDB-1581.sqlpp    |  4 +-
 .../queries/tpcds/query-ASTERIXDB-1591.sqlpp    | 16 ++---
 .../queries/tpcds/query-ASTERIXDB-1596.sqlpp    |  6 +-
 .../optimizerts/queries/tpch/q12_shipping.sqlpp |  4 +-
 .../queries/tpch/q12_shipping_broadcast.sqlpp   |  4 +-
 ...oin-probe-pidx-with-join-btree-sidx_01.sqlpp |  6 +-
 ...oin-probe-pidx-with-join-btree-sidx_02.sqlpp |  6 +-
 .../primary-composite-key-join_01.sqlpp         |  4 +-
 .../primary-composite-key-join_02.sqlpp         |  4 +-
 .../primary-composite-key-join_03.sqlpp         |  4 +-
 .../primary-composite-key-prefix-join_01.sqlpp  |  4 +-
 .../primary-composite-key-prefix-join_02.sqlpp  |  4 +-
 .../primary-composite-key-prefix-join_03.sqlpp  |  4 +-
 .../primary-composite-key-prefix-join_04.sqlpp  |  4 +-
 .../primary-composite-key-prefix-join_05.sqlpp  |  4 +-
 .../primary-composite-key-prefix-join_06.sqlpp  |  4 +-
 .../primary-equi-join-multipred.sqlpp           |  8 +--
 .../primary-equi-join-neg_01.sqlpp              |  4 +-
 .../primary-equi-join-neg_02.sqlpp              |  4 +-
 .../btree-index-join/primary-equi-join_01.sqlpp |  4 +-
 .../btree-index-join/primary-equi-join_02.sqlpp |  4 +-
 .../btree-index-join/primary-equi-join_03.sqlpp |  8 +--
 .../btree-index-join/primary-equi-join_04.sqlpp |  8 +--
 .../btree-index-join/primary-equi-join_05.sqlpp |  6 +-
 .../btree-index-join/primary-ge-join_01.sqlpp   |  4 +-
 .../btree-index-join/primary-ge-join_02.sqlpp   |  4 +-
 .../btree-index-join/primary-gt-join_01.sqlpp   |  4 +-
 .../btree-index-join/primary-gt-join_02.sqlpp   |  4 +-
 .../btree-index-join/primary-le-join_01.sqlpp   |  4 +-
 .../btree-index-join/primary-le-join_02.sqlpp   |  4 +-
 .../btree-index-join/primary-lt-join_01.sqlpp   |  4 +-
 .../btree-index-join/primary-lt-join_02.sqlpp   |  4 +-
 .../secondary-equi-join-multiindex.sqlpp        |  8 +--
 .../secondary-equi-join-multipred.sqlpp         |  6 +-
 .../secondary-equi-join_01.sqlpp                |  6 +-
 .../secondary-equi-join_02.sqlpp                |  6 +-
 .../secondary-equi-join_03.sqlpp                |  4 +-
 .../btree-index/btree-datetime-01.sqlpp         |  2 +-
 .../btree-index/btree-datetime-02.sqlpp         |  2 +-
 .../btree-index/btree-datetime-03.sqlpp         |  2 +-
 .../btree-index/btree-datetime-04.sqlpp         |  2 +-
 .../btree-index/btree-primary-01.sqlpp          |  4 +-
 .../btree-index/btree-primary-02.sqlpp          |  4 +-
 .../btree-index/btree-primary-03.sqlpp          |  4 +-
 .../btree-index/btree-primary-04.sqlpp          |  4 +-
 .../btree-index/btree-primary-05.sqlpp          |  4 +-
 .../btree-index/btree-primary-06.sqlpp          |  4 +-
 .../btree-index/btree-primary-07.sqlpp          |  4 +-
 .../btree-index/btree-primary-08.sqlpp          |  4 +-
 .../btree-index/btree-primary-09.sqlpp          |  4 +-
 .../btree-index/btree-primary-10.sqlpp          |  4 +-
 .../btree-index/btree-primary-11.sqlpp          |  4 +-
 .../btree-index/btree-primary-12.sqlpp          |  4 +-
 .../btree-index/btree-primary-13.sqlpp          |  4 +-
 .../btree-index/btree-primary-14.sqlpp          |  4 +-
 .../btree-index/btree-primary-15.sqlpp          |  4 +-
 .../btree-index/btree-primary-16.sqlpp          |  4 +-
 .../btree-index/btree-primary-17.sqlpp          |  4 +-
 .../btree-index/btree-primary-18.sqlpp          |  4 +-
 .../btree-index/btree-primary-19.sqlpp          |  4 +-
 .../btree-index/btree-primary-20.sqlpp          |  4 +-
 .../btree-index/btree-primary-21.sqlpp          |  4 +-
 .../btree-index/btree-primary-22.sqlpp          |  4 +-
 .../btree-index/btree-primary-23.sqlpp          |  4 +-
 .../btree-index/btree-primary-24.sqlpp          |  4 +-
 .../btree-index/btree-primary-25.sqlpp          |  4 +-
 .../btree-index/btree-primary-26.sqlpp          |  4 +-
 .../btree-index/btree-primary-27.sqlpp          |  4 +-
 .../btree-index/btree-primary-28.sqlpp          |  4 +-
 .../btree-index/btree-primary-29.sqlpp          |  4 +-
 .../btree-index/btree-primary-30.sqlpp          |  4 +-
 .../btree-index/btree-primary-31.sqlpp          |  4 +-
 .../btree-index/btree-primary-32.sqlpp          |  4 +-
 .../btree-index/btree-secondary-33.sqlpp        |  4 +-
 .../btree-index/btree-secondary-34.sqlpp        |  4 +-
 .../btree-index/btree-secondary-35.sqlpp        |  4 +-
 .../btree-index/btree-secondary-36.sqlpp        |  4 +-
 .../btree-index/btree-secondary-37.sqlpp        |  4 +-
 .../btree-index/btree-secondary-38.sqlpp        |  4 +-
 .../btree-index/btree-secondary-39.sqlpp        |  4 +-
 .../btree-index/btree-secondary-40.sqlpp        |  4 +-
 .../btree-index/btree-secondary-41.sqlpp        |  4 +-
 .../btree-index/btree-secondary-42.sqlpp        |  4 +-
 .../btree-index/btree-secondary-43.sqlpp        |  4 +-
 .../btree-index/btree-secondary-44.sqlpp        |  4 +-
 .../btree-index/btree-secondary-45.sqlpp        |  4 +-
 .../btree-index/btree-secondary-46.sqlpp        |  4 +-
 .../btree-index/btree-secondary-47.sqlpp        |  4 +-
 .../btree-index/btree-secondary-48.sqlpp        |  4 +-
 .../btree-index/btree-secondary-49.sqlpp        |  4 +-
 .../btree-index/btree-secondary-50.sqlpp        |  4 +-
 .../btree-index/btree-secondary-51.sqlpp        |  4 +-
 .../btree-index/btree-secondary-52.sqlpp        |  4 +-
 .../btree-index/btree-secondary-53.sqlpp        |  4 +-
 .../btree-index/btree-secondary-54.sqlpp        |  4 +-
 .../btree-index/btree-secondary-55.sqlpp        |  4 +-
 .../btree-index/btree-secondary-56.sqlpp        |  4 +-
 .../btree-index/btree-secondary-57.sqlpp        |  4 +-
 .../btree-index/btree-secondary-58.sqlpp        |  4 +-
 .../btree-index/btree-secondary-59.sqlpp        |  4 +-
 .../btree-index/btree-secondary-60.sqlpp        |  4 +-
 .../btree-index/btree-secondary-61.sqlpp        |  4 +-
 .../btree-index/btree-secondary-62.sqlpp        |  4 +-
 .../btree-index/btree-secondary-63.sqlpp        |  4 +-
 .../optimizerts/queries_sqlpp/collocated.sqlpp  |  6 +-
 .../consolidate-selects-complex.sqlpp           |  4 +-
 .../consolidate-selects-simple.sqlpp            |  4 +-
 .../queries_sqlpp/const-folding.sqlpp           |  2 +-
 .../queries_sqlpp/count-tweets.sqlpp            |  4 +-
 .../queries_sqlpp/cust_group_no_agg.sqlpp       |  4 +-
 .../queries_sqlpp/denorm-cust-order.sqlpp       |  8 +--
 .../disjunction-to-join-delete-1.sqlpp          |  2 +-
 .../disjunction-to-join-delete-2.sqlpp          |  2 +-
 .../disjunction-to-join-delete-3.sqlpp          |  2 +-
 .../queries_sqlpp/distinct_aggregate.sqlpp      |  4 +-
 .../queries_sqlpp/filter-nested.sqlpp           |  6 +-
 .../optimizerts/queries_sqlpp/fj-dblp-csx.sqlpp |  6 +-
 .../optimizerts/queries_sqlpp/fj-phase1.sqlpp   |  6 +-
 .../queries_sqlpp/fj-phase2-with-hints.sqlpp    |  4 +-
 .../queries_sqlpp/hashjoin-with-unnest.sqlpp    |  4 +-
 .../optimizerts/queries_sqlpp/inline-funs.sqlpp |  2 +-
 .../inlined_q18_large_volume_customer.sqlpp     |  8 +--
 .../insert-and-scan-dataset-with-index.sqlpp    |  2 +-
 .../queries_sqlpp/insert-and-scan-dataset.sqlpp |  2 +-
 .../insert-and-scan-joined-datasets.sqlpp       |  4 +-
 .../queries_sqlpp/introhashpartitionmerge.sqlpp |  4 +-
 .../ngram-contains-panic.sqlpp                  |  4 +-
 .../inverted-index-basic/ngram-contains.sqlpp   |  4 +-
 .../ngram-edit-distance-check-panic.sqlpp       |  4 +-
 .../ngram-edit-distance-check.sqlpp             |  4 +-
 .../ngram-edit-distance-panic.sqlpp             |  4 +-
 .../ngram-edit-distance.sqlpp                   |  4 +-
 .../ngram-fuzzyeq-edit-distance.sqlpp           |  4 +-
 .../ngram-fuzzyeq-jaccard.sqlpp                 |  4 +-
 .../ngram-jaccard-check.sqlpp                   |  4 +-
 .../inverted-index-basic/ngram-jaccard.sqlpp    |  4 +-
 .../olist-edit-distance-check-panic.sqlpp       |  6 +-
 .../olist-edit-distance-check.sqlpp             |  6 +-
 .../olist-edit-distance-panic.sqlpp             |  6 +-
 .../olist-edit-distance.sqlpp                   |  6 +-
 .../olist-fuzzyeq-edit-distance.sqlpp           |  6 +-
 .../olist-fuzzyeq-jaccard.sqlpp                 |  6 +-
 .../olist-jaccard-check.sqlpp                   |  6 +-
 .../inverted-index-basic/olist-jaccard.sqlpp    |  6 +-
 .../ulist-fuzzyeq-jaccard.sqlpp                 |  6 +-
 .../ulist-jaccard-check.sqlpp                   |  6 +-
 .../inverted-index-basic/ulist-jaccard.sqlpp    |  6 +-
 .../inverted-index-basic/word-contains.sqlpp    |  4 +-
 .../word-fuzzyeq-jaccard.sqlpp                  |  4 +-
 .../word-jaccard-check.sqlpp                    |  4 +-
 .../inverted-index-basic/word-jaccard.sqlpp     |  4 +-
 ...it-distance-check-let-panic-nopanic_01.sqlpp |  4 +-
 ...it-distance-check-let-panic-nopanic_02.sqlpp |  4 +-
 .../ngram-edit-distance-check-let-panic.sqlpp   |  4 +-
 .../ngram-edit-distance-check-let.sqlpp         |  4 +-
 .../ngram-edit-distance-check-substring.sqlpp   |  4 +-
 .../ngram-edit-distance-check-word-tokens.sqlpp |  4 +-
 .../ngram-jaccard-check-let.sqlpp               |  4 +-
 .../ngram-jaccard-check-multi-let.sqlpp         |  4 +-
 .../olist-edit-distance-check-let-panic.sqlpp   |  6 +-
 .../olist-edit-distance-check-let.sqlpp         |  6 +-
 .../olist-jaccard-check-let.sqlpp               |  6 +-
 .../ulist-jaccard-check-let.sqlpp               |  6 +-
 .../word-jaccard-check-let.sqlpp                |  4 +-
 .../word-jaccard-check-multi-let.sqlpp          |  4 +-
 .../ngram-edit-distance-inline.sqlpp            |  4 +-
 .../ngram-edit-distance.sqlpp                   |  6 +-
 .../ngram-fuzzyeq-edit-distance.sqlpp           |  6 +-
 .../ngram-fuzzyeq-jaccard.sqlpp                 |  6 +-
 .../ngram-jaccard-inline.sqlpp                  |  4 +-
 .../ngram-jaccard.sqlpp                         |  6 +-
 .../olist-edit-distance-inline.sqlpp            |  6 +-
 .../olist-edit-distance.sqlpp                   |  6 +-
 .../olist-fuzzyeq-edit-distance.sqlpp           |  6 +-
 .../olist-fuzzyeq-jaccard.sqlpp                 |  6 +-
 .../olist-jaccard-inline.sqlpp                  |  6 +-
 .../olist-jaccard.sqlpp                         |  6 +-
 .../ulist-fuzzyeq-jaccard.sqlpp                 |  6 +-
 .../ulist-jaccard-inline.sqlpp                  |  6 +-
 .../ulist-jaccard.sqlpp                         |  6 +-
 .../word-fuzzyeq-jaccard.sqlpp                  |  6 +-
 .../word-jaccard-inline.sqlpp                   |  4 +-
 .../word-jaccard.sqlpp                          |  6 +-
 .../inverted-index-join/issue741.sqlpp          |  6 +-
 ...x-with-join-edit-distance-check-idx_01.sqlpp |  6 +-
 ...be-pidx-with-join-jaccard-check-idx_01.sqlpp |  6 +-
 .../inverted-index-join/ngram-contains.sqlpp    |  4 +-
 .../ngram-edit-distance-check_01.sqlpp          |  6 +-
 .../ngram-edit-distance-check_02.sqlpp          |  6 +-
 .../ngram-edit-distance-check_03.sqlpp          |  4 +-
 .../ngram-edit-distance-check_04.sqlpp          |  4 +-
 .../ngram-edit-distance-contains.sqlpp          |  6 +-
 .../ngram-edit-distance_01.sqlpp                |  6 +-
 .../ngram-edit-distance_02.sqlpp                |  6 +-
 .../ngram-edit-distance_03.sqlpp                |  4 +-
 .../ngram-edit-distance_04.sqlpp                |  4 +-
 .../ngram-fuzzyeq-edit-distance_01.sqlpp        |  6 +-
 .../ngram-fuzzyeq-edit-distance_02.sqlpp        |  6 +-
 .../ngram-fuzzyeq-edit-distance_03.sqlpp        |  4 +-
 .../ngram-fuzzyeq-jaccard_01.sqlpp              |  6 +-
 .../ngram-fuzzyeq-jaccard_02.sqlpp              |  6 +-
 .../ngram-fuzzyeq-jaccard_03.sqlpp              |  4 +-
 .../ngram-jaccard-check_01.sqlpp                |  6 +-
 .../ngram-jaccard-check_02.sqlpp                |  6 +-
 .../ngram-jaccard-check_03.sqlpp                |  4 +-
 .../ngram-jaccard-check_04.sqlpp                |  4 +-
 .../inverted-index-join/ngram-jaccard_01.sqlpp  |  6 +-
 .../inverted-index-join/ngram-jaccard_02.sqlpp  |  6 +-
 .../inverted-index-join/ngram-jaccard_03.sqlpp  |  4 +-
 .../inverted-index-join/ngram-jaccard_04.sqlpp  |  4 +-
 .../olist-edit-distance-check_01.sqlpp          |  6 +-
 .../olist-edit-distance-check_02.sqlpp          |  6 +-
 .../olist-edit-distance-check_03.sqlpp          |  6 +-
 .../olist-edit-distance-check_04.sqlpp          |  6 +-
 .../olist-edit-distance_01.sqlpp                |  6 +-
 .../olist-edit-distance_02.sqlpp                |  6 +-
 .../olist-edit-distance_03.sqlpp                |  6 +-
 .../olist-edit-distance_04.sqlpp                |  6 +-
 .../olist-fuzzyeq-edit-distance_01.sqlpp        |  6 +-
 .../olist-fuzzyeq-edit-distance_02.sqlpp        |  6 +-
 .../olist-fuzzyeq-edit-distance_03.sqlpp        |  6 +-
 .../olist-fuzzyeq-jaccard_01.sqlpp              |  6 +-
 .../olist-fuzzyeq-jaccard_02.sqlpp              |  6 +-
 .../olist-fuzzyeq-jaccard_03.sqlpp              |  6 +-
 .../olist-jaccard-check_01.sqlpp                |  6 +-
 .../olist-jaccard-check_02.sqlpp                |  6 +-
 .../olist-jaccard-check_03.sqlpp                |  6 +-
 .../olist-jaccard-check_04.sqlpp                |  6 +-
 .../inverted-index-join/olist-jaccard_01.sqlpp  |  6 +-
 .../inverted-index-join/olist-jaccard_02.sqlpp  |  6 +-
 .../inverted-index-join/olist-jaccard_03.sqlpp  |  6 +-
 .../inverted-index-join/olist-jaccard_04.sqlpp  |  6 +-
 .../ulist-fuzzyeq-jaccard_01.sqlpp              |  6 +-
 .../ulist-fuzzyeq-jaccard_02.sqlpp              |  6 +-
 .../ulist-fuzzyeq-jaccard_03.sqlpp              |  6 +-
 .../ulist-jaccard-check_01.sqlpp                |  6 +-
 .../ulist-jaccard-check_02.sqlpp                |  6 +-
 .../ulist-jaccard-check_03.sqlpp                |  6 +-
 .../ulist-jaccard-check_04.sqlpp                |  6 +-
 .../inverted-index-join/ulist-jaccard_01.sqlpp  |  6 +-
 .../inverted-index-join/ulist-jaccard_02.sqlpp  |  6 +-
 .../inverted-index-join/ulist-jaccard_03.sqlpp  |  6 +-
 .../inverted-index-join/ulist-jaccard_04.sqlpp  |  6 +-
 .../word-fuzzyeq-jaccard_01.sqlpp               |  6 +-
 .../word-fuzzyeq-jaccard_02.sqlpp               |  6 +-
 .../word-fuzzyeq-jaccard_03.sqlpp               |  4 +-
 .../word-jaccard-check-after-btree-access.sqlpp |  6 +-
 .../word-jaccard-check_01.sqlpp                 |  6 +-
 .../word-jaccard-check_02.sqlpp                 |  6 +-
 .../word-jaccard-check_03.sqlpp                 |  4 +-
 .../word-jaccard-check_04.sqlpp                 |  4 +-
 .../inverted-index-join/word-jaccard_01.sqlpp   |  6 +-
 .../inverted-index-join/word-jaccard_02.sqlpp   |  6 +-
 .../inverted-index-join/word-jaccard_03.sqlpp   |  4 +-
 .../inverted-index-join/word-jaccard_04.sqlpp   |  4 +-
 .../queries_sqlpp/join-super-key_01.sqlpp       | 12 ++--
 .../queries_sqlpp/join-super-key_02.sqlpp       | 12 ++--
 .../queries_sqlpp/limit-issue353.sqlpp          |  4 +-
 .../queries_sqlpp/loj-super-key_01.sqlpp        | 12 ++--
 .../queries_sqlpp/loj-super-key_02.sqlpp        | 12 ++--
 .../queries_sqlpp/nest_aggregate.sqlpp          | 14 ++---
 .../btree-index-join/disjunction-to-join.sqlpp  |  4 +-
 ...oin-probe-pidx-with-join-btree-sidx_01.sqlpp |  8 +--
 ...oin-probe-pidx-with-join-btree-sidx_02.sqlpp |  8 +--
 .../primary-composite-key-join_01.sqlpp         |  6 +-
 .../primary-composite-key-join_02.sqlpp         |  6 +-
 .../primary-composite-key-join_03.sqlpp         |  6 +-
 .../primary-composite-key-prefix-join_01.sqlpp  |  6 +-
 .../primary-composite-key-prefix-join_02.sqlpp  |  6 +-
 .../primary-composite-key-prefix-join_03.sqlpp  |  6 +-
 .../primary-composite-key-prefix-join_04.sqlpp  |  6 +-
 .../primary-composite-key-prefix-join_05.sqlpp  |  6 +-
 .../primary-composite-key-prefix-join_06.sqlpp  |  6 +-
 .../primary-equi-join-multipred.sqlpp           | 12 ++--
 .../primary-equi-join-neg_01.sqlpp              |  6 +-
 .../btree-index-join/primary-equi-join_01.sqlpp |  6 +-
 .../btree-index-join/primary-equi-join_02.sqlpp |  6 +-
 .../btree-index-join/primary-equi-join_03.sqlpp | 12 ++--
 .../btree-index-join/primary-equi-join_04.sqlpp | 12 ++--
 .../btree-index-join/primary-equi-join_05.sqlpp |  8 +--
 .../btree-index-join/primary-ge-join_01.sqlpp   |  6 +-
 .../btree-index-join/primary-gt-join_01.sqlpp   |  6 +-
 .../btree-index-join/primary-le-join_01.sqlpp   |  6 +-
 .../btree-index-join/primary-lt-join_01.sqlpp   |  6 +-
 .../secondary-equi-join-multiindex.sqlpp        | 12 ++--
 .../secondary-equi-join-multipred.sqlpp         | 10 +--
 .../secondary-equi-join_01.sqlpp                | 10 +--
 .../btree-index/btree-primary-01.sqlpp          |  6 +-
 .../btree-index/btree-primary-02.sqlpp          |  6 +-
 .../btree-index/btree-primary-03.sqlpp          |  6 +-
 .../btree-index/btree-primary-04.sqlpp          |  6 +-
 .../btree-index/btree-primary-05.sqlpp          |  6 +-
 .../btree-index/btree-primary-06.sqlpp          |  6 +-
 .../btree-index/btree-primary-07.sqlpp          |  6 +-
 .../btree-index/btree-primary-08.sqlpp          |  6 +-
 .../btree-index/btree-primary-09.sqlpp          |  6 +-
 .../btree-index/btree-primary-10.sqlpp          |  6 +-
 .../btree-index/btree-primary-11.sqlpp          |  6 +-
 .../btree-index/btree-primary-12.sqlpp          |  6 +-
 .../btree-index/btree-primary-13.sqlpp          |  6 +-
 .../btree-index/btree-primary-14.sqlpp          |  6 +-
 .../btree-index/btree-primary-15.sqlpp          |  6 +-
 .../btree-index/btree-primary-16.sqlpp          |  6 +-
 .../btree-index/btree-primary-17.sqlpp          |  6 +-
 .../btree-index/btree-primary-18.sqlpp          |  6 +-
 .../btree-index/btree-primary-19.sqlpp          |  6 +-
 .../btree-index/btree-primary-20.sqlpp          |  6 +-
 .../btree-index/btree-primary-21.sqlpp          |  6 +-
 .../btree-index/btree-primary-22.sqlpp          |  6 +-
 .../btree-index/btree-primary-23.sqlpp          |  6 +-
 .../btree-index/btree-primary-24.sqlpp          |  6 +-
 .../btree-index/btree-primary-25.sqlpp          |  6 +-
 .../btree-index/btree-primary-26.sqlpp          |  6 +-
 .../btree-index/btree-primary-27.sqlpp          |  6 +-
 .../btree-index/btree-primary-28.sqlpp          |  6 +-
 .../btree-index/btree-primary-29.sqlpp          |  6 +-
 .../btree-index/btree-primary-30.sqlpp          |  6 +-
 .../btree-index/btree-primary-31.sqlpp          |  6 +-
 .../btree-index/btree-primary-32.sqlpp          |  6 +-
 .../btree-index/btree-secondary-33.sqlpp        |  6 +-
 .../btree-index/btree-secondary-34.sqlpp        |  6 +-
 .../btree-index/btree-secondary-35.sqlpp        |  6 +-
 .../btree-index/btree-secondary-36.sqlpp        |  6 +-
 .../btree-index/btree-secondary-37.sqlpp        |  6 +-
 .../btree-index/btree-secondary-38.sqlpp        |  6 +-
 .../btree-index/btree-secondary-39.sqlpp        |  6 +-
 .../btree-index/btree-secondary-40.sqlpp        |  6 +-
 .../btree-index/btree-secondary-41.sqlpp        |  6 +-
 .../btree-index/btree-secondary-42.sqlpp        |  6 +-
 .../btree-index/btree-secondary-43.sqlpp        |  6 +-
 .../btree-index/btree-secondary-44.sqlpp        |  6 +-
 .../btree-index/btree-secondary-45.sqlpp        |  6 +-
 .../btree-index/btree-secondary-46.sqlpp        |  6 +-
 .../btree-index/btree-secondary-47.sqlpp        |  6 +-
 .../btree-index/btree-secondary-48.sqlpp        |  6 +-
 .../btree-index/btree-secondary-49.sqlpp        |  6 +-
 .../btree-index/btree-secondary-50.sqlpp        |  6 +-
 .../btree-index/btree-secondary-51.sqlpp        |  6 +-
 .../btree-index/btree-secondary-52.sqlpp        |  6 +-
 .../btree-index/btree-secondary-53.sqlpp        |  6 +-
 .../btree-index/btree-secondary-54.sqlpp        |  6 +-
 .../btree-index/btree-secondary-55.sqlpp        |  6 +-
 .../btree-index/btree-secondary-56.sqlpp        |  6 +-
 .../btree-index/btree-secondary-57.sqlpp        |  6 +-
 .../btree-index/btree-secondary-58.sqlpp        |  6 +-
 .../btree-index/btree-secondary-59.sqlpp        |  6 +-
 .../btree-index/btree-secondary-60.sqlpp        |  6 +-
 .../btree-index/btree-secondary-61.sqlpp        |  6 +-
 .../btree-index/btree-secondary-62.sqlpp        |  6 +-
 .../btree-index/btree-secondary-63.sqlpp        |  6 +-
 .../ngram-contains-panic.sqlpp                  |  6 +-
 .../inverted-index-basic/ngram-contains.sqlpp   |  6 +-
 .../ngram-edit-distance-check-panic.sqlpp       |  6 +-
 .../ngram-edit-distance-check.sqlpp             |  6 +-
 .../ngram-edit-distance-panic.sqlpp             |  6 +-
 .../ngram-edit-distance.sqlpp                   |  6 +-
 .../ngram-fuzzyeq-edit-distance.sqlpp           |  6 +-
 .../ngram-fuzzyeq-jaccard.sqlpp                 |  6 +-
 .../ngram-jaccard-check.sqlpp                   |  6 +-
 .../inverted-index-basic/ngram-jaccard.sqlpp    |  6 +-
 .../olist-edit-distance-check-panic.sqlpp       |  8 +--
 .../olist-edit-distance-check.sqlpp             |  8 +--
 .../olist-edit-distance-panic.sqlpp             |  8 +--
 .../olist-edit-distance.sqlpp                   |  8 +--
 .../olist-fuzzyeq-edit-distance.sqlpp           |  8 +--
 .../olist-fuzzyeq-jaccard.sqlpp                 |  8 +--
 .../olist-jaccard-check.sqlpp                   |  8 +--
 .../inverted-index-basic/olist-jaccard.sqlpp    |  8 +--
 .../ulist-fuzzyeq-jaccard.sqlpp                 |  8 +--
 .../ulist-jaccard-check.sqlpp                   |  8 +--
 .../inverted-index-basic/ulist-jaccard.sqlpp    |  8 +--
 .../inverted-index-basic/word-contains.sqlpp    |  6 +-
 .../word-fuzzyeq-jaccard.sqlpp                  |  6 +-
 .../word-jaccard-check.sqlpp                    |  6 +-
 .../inverted-index-basic/word-jaccard.sqlpp     |  6 +-
 ...it-distance-check-let-panic-nopanic_01.sqlpp |  6 +-
 ...it-distance-check-let-panic-nopanic_02.sqlpp |  6 +-
 .../ngram-edit-distance-check-let-panic.sqlpp   |  6 +-
 .../ngram-edit-distance-check-let.sqlpp         |  6 +-
 .../ngram-edit-distance-check-substring.sqlpp   |  6 +-
 .../ngram-edit-distance-check-word-tokens.sqlpp |  6 +-
 .../ngram-jaccard-check-let.sqlpp               |  6 +-
 .../ngram-jaccard-check-multi-let.sqlpp         |  6 +-
 .../olist-edit-distance-check-let-panic.sqlpp   |  8 +--
 .../olist-edit-distance-check-let.sqlpp         |  8 +--
 .../olist-jaccard-check-let.sqlpp               |  8 +--
 .../ulist-jaccard-check-let.sqlpp               |  8 +--
 .../word-jaccard-check-let.sqlpp                |  6 +-
 .../word-jaccard-check-multi-let.sqlpp          |  6 +-
 ...x-with-join-edit-distance-check-idx_01.sqlpp |  8 +--
 ...be-pidx-with-join-jaccard-check-idx_01.sqlpp |  8 +--
 .../ngram-edit-distance-check_01.sqlpp          | 10 +--
 .../ngram-edit-distance-contains.sqlpp          | 10 +--
 .../ngram-edit-distance-inline.sqlpp            |  6 +-
 .../ngram-edit-distance_01.sqlpp                | 10 +--
 .../ngram-fuzzyeq-edit-distance_01.sqlpp        | 10 +--
 .../ngram-fuzzyeq-jaccard_01.sqlpp              | 10 +--
 .../ngram-jaccard-check_01.sqlpp                | 10 +--
 .../ngram-jaccard-inline.sqlpp                  |  6 +-
 .../inverted-index-join/ngram-jaccard_01.sqlpp  | 10 +--
 .../olist-edit-distance-check_01.sqlpp          |  8 +--
 .../olist-edit-distance-inline.sqlpp            |  8 +--
 .../olist-edit-distance_01.sqlpp                |  8 +--
 .../olist-fuzzyeq-edit-distance_01.sqlpp        |  8 +--
 .../olist-fuzzyeq-jaccard_01.sqlpp              |  8 +--
 .../olist-jaccard-check_01.sqlpp                |  8 +--
 .../olist-jaccard-inline.sqlpp                  |  8 +--
 .../inverted-index-join/olist-jaccard_01.sqlpp  |  8 +--
 .../ulist-fuzzyeq-jaccard_01.sqlpp              |  8 +--
 .../ulist-jaccard-check_01.sqlpp                |  8 +--
 .../ulist-jaccard-inline.sqlpp                  |  8 +--
 .../inverted-index-join/ulist-jaccard_01.sqlpp  |  8 +--
 .../word-fuzzyeq-jaccard_01.sqlpp               | 10 +--
 .../word-jaccard-check-after-btree-access.sqlpp |  8 +--
 .../word-jaccard-check_01.sqlpp                 | 10 +--
 .../word-jaccard-inline.sqlpp                   |  6 +-
 .../inverted-index-join/word-jaccard_01.sqlpp   | 10 +--
 ...oin-probe-pidx-with-join-rtree-sidx_01.sqlpp |  8 +--
 ...oin-probe-pidx-with-join-rtree-sidx_02.sqlpp |  8 +--
 .../spatial-intersect-point_01.sqlpp            |  6 +-
 .../spatial-intersect-point_02.sqlpp            |  6 +-
 .../spatial-intersect-point_03.sqlpp            |  6 +-
 .../btree-index-join/disjunction-to-join.sqlpp  |  4 +-
 ...n-probe-pidx-with-join-btree-sidx_01_1.sqlpp |  8 +--
 ...n-probe-pidx-with-join-btree-sidx_01_2.sqlpp |  8 +--
 ...n-probe-pidx-with-join-btree-sidx_02_1.sqlpp |  8 +--
 ...n-probe-pidx-with-join-btree-sidx_02_2.sqlpp |  8 +--
 .../secondary-composite-key-join_01.sqlpp       |  6 +-
 .../secondary-composite-key-join_02.sqlpp       |  6 +-
 .../secondary-composite-key-join_03.sqlpp       |  6 +-
 ...secondary-composite-key-prefix-join_01.sqlpp |  6 +-
 ...secondary-composite-key-prefix-join_02.sqlpp |  6 +-
 ...secondary-composite-key-prefix-join_03.sqlpp |  6 +-
 ...secondary-composite-key-prefix-join_04.sqlpp |  6 +-
 ...secondary-composite-key-prefix-join_05.sqlpp |  6 +-
 ...secondary-composite-key-prefix-join_06.sqlpp |  6 +-
 .../secondary-equi-join-multiindex.sqlpp        | 12 ++--
 .../secondary-equi-join-multipred.sqlpp         | 10 +--
 .../secondary-equi-join_01.sqlpp                | 10 +--
 .../secondary-equi-join_02.sqlpp                | 10 +--
 .../secondary-equi-join_03.sqlpp                | 10 +--
 .../secondary-equi-join_04.sqlpp                |  6 +-
 .../secondary-equi-join_05.sqlpp                | 10 +--
 .../btree-index/btree-secondary-33.sqlpp        |  6 +-
 .../btree-index/btree-secondary-34.sqlpp        |  6 +-
 .../btree-index/btree-secondary-35.sqlpp        |  6 +-
 .../btree-index/btree-secondary-36.sqlpp        |  6 +-
 .../btree-index/btree-secondary-37.sqlpp        |  6 +-
 .../btree-index/btree-secondary-38.sqlpp        |  6 +-
 .../btree-index/btree-secondary-39.sqlpp        |  6 +-
 .../btree-index/btree-secondary-40.sqlpp        |  6 +-
 .../btree-index/btree-secondary-41.sqlpp        |  6 +-
 .../btree-index/btree-secondary-42.sqlpp        |  6 +-
 .../btree-index/btree-secondary-43.sqlpp        |  6 +-
 .../btree-index/btree-secondary-44.sqlpp        |  6 +-
 .../btree-index/btree-secondary-45.sqlpp        |  6 +-
 .../btree-index/btree-secondary-46.sqlpp        |  6 +-
 .../btree-index/btree-secondary-47.sqlpp        |  6 +-
 .../btree-index/btree-secondary-48.sqlpp        |  6 +-
 .../btree-index/btree-secondary-49.sqlpp        |  6 +-
 .../btree-index/btree-secondary-50.sqlpp        |  6 +-
 .../btree-index/btree-secondary-51.sqlpp        |  6 +-
 .../btree-index/btree-secondary-52.sqlpp        |  6 +-
 .../btree-index/btree-secondary-53.sqlpp        |  6 +-
 .../btree-index/btree-secondary-54.sqlpp        |  6 +-
 .../btree-index/btree-secondary-55.sqlpp        |  6 +-
 .../btree-index/btree-secondary-56.sqlpp        |  6 +-
 .../btree-index/btree-secondary-57.sqlpp        |  6 +-
 .../btree-index/btree-secondary-58.sqlpp        |  6 +-
 .../btree-index/btree-secondary-59.sqlpp        |  6 +-
 .../btree-index/btree-secondary-60.sqlpp        |  6 +-
 .../btree-index/btree-secondary-61.sqlpp        |  6 +-
 .../btree-index/btree-secondary-62.sqlpp        |  6 +-
 .../btree-index/btree-secondary-63.sqlpp        |  6 +-
 .../ngram-contains-panic.sqlpp                  |  6 +-
 .../inverted-index-basic/ngram-contains.sqlpp   |  6 +-
 .../ngram-edit-distance-check-panic.sqlpp       |  6 +-
 .../ngram-edit-distance-check.sqlpp             |  6 +-
 .../ngram-edit-distance-panic.sqlpp             |  6 +-
 .../ngram-edit-distance.sqlpp                   |  6 +-
 .../ngram-fuzzyeq-edit-distance.sqlpp           |  6 +-
 .../ngram-fuzzyeq-jaccard.sqlpp                 |  6 +-
 .../ngram-jaccard-check.sqlpp                   |  6 +-
 .../inverted-index-basic/ngram-jaccard.sqlpp    |  6 +-
 .../inverted-index-basic/word-contains.sqlpp    |  6 +-
 .../word-fuzzyeq-jaccard.sqlpp                  |  6 +-
 .../word-jaccard-check.sqlpp                    |  6 +-
 .../inverted-index-basic/word-jaccard.sqlpp     |  6 +-
 ...it-distance-check-let-panic-nopanic_01.sqlpp |  6 +-
 ...it-distance-check-let-panic-nopanic_02.sqlpp |  6 +-
 .../ngram-edit-distance-check-let-panic.sqlpp   |  6 +-
 .../ngram-edit-distance-check-let.sqlpp         |  6 +-
 .../ngram-edit-distance-check-substring.sqlpp   |  6 +-
 .../ngram-edit-distance-check-word-tokens.sqlpp |  6 +-
 .../ngram-jaccard-check-let.sqlpp               |  6 +-
 .../ngram-jaccard-check-multi-let.sqlpp         |  6 +-
 .../word-jaccard-check-let.sqlpp                |  6 +-
 .../word-jaccard-check-multi-let.sqlpp          |  6 +-
 ...x-with-join-edit-distance-check-idx_01.sqlpp |  8 +--
 .../inverted-index-join/ngram-contains_01.sqlpp |  6 +-
 .../inverted-index-join/ngram-contains_02.sqlpp |  6 +-
 .../inverted-index-join/ngram-contains_03.sqlpp |  4 +-
 .../inverted-index-join/ngram-contains_04.sqlpp |  6 +-
 .../ngram-edit-distance-check_01.sqlpp          | 10 +--
 .../ngram-edit-distance-check_02.sqlpp          | 10 +--
 .../ngram-edit-distance-check_03.sqlpp          |  6 +-
 .../ngram-edit-distance-check_04.sqlpp          | 10 +--
 .../ngram-edit-distance-check_05.sqlpp          | 10 +--
 .../ngram-edit-distance-contains.sqlpp          | 10 +--
 .../ngram-edit-distance-inline.sqlpp            |  6 +-
 .../ngram-edit-distance_01.sqlpp                | 10 +--
 .../ngram-edit-distance_02.sqlpp                | 10 +--
 .../ngram-edit-distance_03.sqlpp                |  6 +-
 .../ngram-edit-distance_04.sqlpp                | 10 +--
 .../ngram-edit-distance_05.sqlpp                | 10 +--
 .../ngram-fuzzyeq-edit-distance_01.sqlpp        | 10 +--
 .../ngram-fuzzyeq-edit-distance_02.sqlpp        | 10 +--
 .../ngram-fuzzyeq-edit-distance_03.sqlpp        |  6 +-
 .../ngram-fuzzyeq-edit-distance_04.sqlpp        | 10 +--
 .../ngram-fuzzyeq-edit-distance_05.sqlpp        | 10 +--
 .../ngram-fuzzyeq-jaccard_01.sqlpp              | 10 +--
 .../ngram-fuzzyeq-jaccard_02.sqlpp              | 10 +--
 .../ngram-fuzzyeq-jaccard_03.sqlpp              |  6 +-
 .../ngram-fuzzyeq-jaccard_04.sqlpp              | 10 +--
 .../ngram-jaccard-check_01.sqlpp                | 10 +--
 .../ngram-jaccard-check_02.sqlpp                | 10 +--
 .../ngram-jaccard-check_03.sqlpp                |  6 +-
 .../ngram-jaccard-check_04.sqlpp                | 10 +--
 .../ngram-jaccard-inline.sqlpp                  |  6 +-
 .../inverted-index-join/ngram-jaccard_01.sqlpp  | 10 +--
 .../inverted-index-join/ngram-jaccard_02.sqlpp  | 10 +--
 .../inverted-index-join/ngram-jaccard_03.sqlpp  |  6 +-
 .../inverted-index-join/ngram-jaccard_04.sqlpp  | 10 +--
 .../word-fuzzyeq-jaccard_01.sqlpp               | 10 +--
 .../word-fuzzyeq-jaccard_02.sqlpp               | 10 +--
 .../word-fuzzyeq-jaccard_03.sqlpp               |  6 +-
 .../word-fuzzyeq-jaccard_04.sqlpp               | 10 +--
 .../word-jaccard-check-after-btree-access.sqlpp |  8 +--
 .../word-jaccard-check_01.sqlpp                 | 10 +--
 .../word-jaccard-check_02.sqlpp                 | 10 +--
 .../word-jaccard-check_03.sqlpp                 |  6 +-
 .../word-jaccard-check_04.sqlpp                 | 10 +--
 .../word-jaccard-inline.sqlpp                   |  6 +-
 .../inverted-index-join/word-jaccard_01.sqlpp   | 10 +--
 .../inverted-index-join/word-jaccard_02.sqlpp   | 10 +--
 .../inverted-index-join/word-jaccard_03.sqlpp   |  6 +-
 .../inverted-index-join/word-jaccard_04.sqlpp   | 10 +--
 ...oin-probe-pidx-with-join-rtree-sidx_01.sqlpp |  8 +--
 ...oin-probe-pidx-with-join-rtree-sidx_02.sqlpp |  8 +--
 .../spatial-intersect-point_01.sqlpp            |  6 +-
 .../spatial-intersect-point_02.sqlpp            |  6 +-
 .../spatial-intersect-point_03.sqlpp            |  6 +-
 .../spatial-intersect-point_04.sqlpp            |  6 +-
 .../spatial-intersect-point_05.sqlpp            |  6 +-
 .../optimizerts/queries_sqlpp/nested_loj2.sqlpp |  8 +--
 .../optimizerts/queries_sqlpp/nested_loj3.sqlpp | 10 +--
 .../btree-index-join/disjunction-to-join.sqlpp  |  2 +-
 ...n-probe-pidx-with-join-btree-sidx_01_1.sqlpp |  6 +-
 ...n-probe-pidx-with-join-btree-sidx_01_2.sqlpp |  6 +-
 ...n-probe-pidx-with-join-btree-sidx_02_1.sqlpp |  6 +-
 ...n-probe-pidx-with-join-btree-sidx_02_2.sqlpp |  6 +-
 .../secondary-composite-key-join_01.sqlpp       |  4 +-
 .../secondary-composite-key-join_02.sqlpp       |  4 +-
 .../secondary-composite-key-join_03.sqlpp       |  4 +-
 ...secondary-composite-key-prefix-join_01.sqlpp |  4 +-
 ...secondary-composite-key-prefix-join_02.sqlpp |  4 +-
 ...secondary-composite-key-prefix-join_03.sqlpp |  4 +-
 ...secondary-composite-key-prefix-join_04.sqlpp |  4 +-
 ...secondary-composite-key-prefix-join_05.sqlpp |  4 +-
 ...secondary-composite-key-prefix-join_06.sqlpp |  4 +-
 .../secondary-equi-join-multiindex.sqlpp        |  8 +--
 .../secondary-equi-join-multipred.sqlpp         |  6 +-
 .../secondary-equi-join_01.sqlpp                |  6 +-
 .../secondary-equi-join_02.sqlpp                |  6 +-
 .../secondary-equi-join_03.sqlpp                |  4 +-
 .../secondary-equi-join_04.sqlpp                |  6 +-
 .../secondary-equi-join_05.sqlpp                |  6 +-
 .../btree-index/btree-secondary-33.sqlpp        |  4 +-
 .../btree-index/btree-secondary-34.sqlpp        |  4 +-
 .../btree-index/btree-secondary-35.sqlpp        |  4 +-
 .../btree-index/btree-secondary-36.sqlpp        |  4 +-
 .../btree-index/btree-secondary-37.sqlpp        |  4 +-
 .../btree-index/btree-secondary-38.sqlpp        |  4 +-
 .../btree-index/btree-secondary-39.sqlpp        |  4 +-
 .../btree-index/btree-secondary-40.sqlpp        |  4 +-
 .../btree-index/btree-secondary-41.sqlpp        |  4 +-
 .../btree-index/btree-secondary-42.sqlpp        |  4 +-
 .../btree-index/btree-secondary-43.sqlpp        |  4 +-
 .../btree-index/btree-secondary-44.sqlpp        |  4 +-
 .../btree-index/btree-secondary-45.sqlpp        |  4 +-
 .../btree-index/btree-secondary-46.sqlpp        |  4 +-
 .../btree-index/btree-secondary-47.sqlpp        |  4 +-
 .../btree-index/btree-secondary-48.sqlpp        |  4 +-
 .../btree-index/btree-secondary-49.sqlpp        |  4 +-
 .../btree-index/btree-secondary-50.sqlpp        |  4 +-
 .../btree-index/btree-secondary-51.sqlpp        |  4 +-
 .../btree-index/btree-secondary-52.sqlpp        |  4 +-
 .../btree-index/btree-secondary-53.sqlpp        |  4 +-
 .../btree-index/btree-secondary-54.sqlpp        |  4 +-
 .../btree-index/btree-secondary-55.sqlpp        |  4 +-
 .../btree-index/btree-secondary-56.sqlpp        |  4 +-
 .../btree-index/btree-secondary-57.sqlpp        |  4 +-
 .../btree-index/btree-secondary-58.sqlpp        |  4 +-
 .../btree-index/btree-secondary-59.sqlpp        |  4 +-
 .../btree-index/btree-secondary-60.sqlpp        |  4 +-
 .../btree-index/btree-secondary-61.sqlpp        |  4 +-
 .../btree-index/btree-secondary-62.sqlpp        |  4 +-
 .../btree-index/btree-secondary-63.sqlpp        |  4 +-
 .../ngram-contains-panic.sqlpp                  |  4 +-
 .../inverted-index-basic/ngram-contains.sqlpp   |  4 +-
 .../ngram-edit-distance-check-panic.sqlpp       |  4 +-
 .../ngram-edit-distance-check.sqlpp             |  4 +-
 .../ngram-edit-distance-panic.sqlpp             |  4 +-
 .../ngram-edit-distance.sqlpp                   |  4 +-
 .../ngram-fuzzyeq-edit-distance.sqlpp           |  4 +-
 .../ngram-fuzzyeq-jaccard.sqlpp                 |  4 +-
 .../ngram-jaccard-check.sqlpp                   |  4 +-
 .../inverted-index-basic/ngram-jaccard.sqlpp    |  4 +-
 .../inverted-index-basic/word-contains.sqlpp    |  4 +-
 .../word-fuzzyeq-jaccard.sqlpp                  |  4 +-
 .../word-jaccard-check.sqlpp                    |  4 +-
 .../inverted-index-basic/word-jaccard.sqlpp     |  4 +-
 ...it-distance-check-let-panic-nopanic_01.sqlpp |  4 +-
 ...it-distance-check-let-panic-nopanic_02.sqlpp |  4 +-
 .../ngram-edit-distance-check-let-panic.sqlpp   |  4 +-
 .../ngram-edit-distance-check-let.sqlpp         |  4 +-
 .../ngram-edit-distance-check-substring.sqlpp   |  4 +-
 .../ngram-edit-distance-check-word-tokens.sqlpp |  4 +-
 .../ngram-jaccard-check-let.sqlpp               |  4 +-
 .../ngram-jaccard-check-multi-let.sqlpp         |  4 +-
 .../word-jaccard-check-let.sqlpp                |  4 +-
 .../word-jaccard-check-multi-let.sqlpp          |  4 +-
 ...x-with-join-edit-distance-check-idx_01.sqlpp |  6 +-
 .../inverted-index-join/ngram-contains_01.sqlpp |  6 +-
 .../inverted-index-join/ngram-contains_02.sqlpp |  6 +-
 .../inverted-index-join/ngram-contains_03.sqlpp |  4 +-
 .../inverted-index-join/ngram-contains_04.sqlpp |  6 +-
 .../ngram-edit-distance-check_01.sqlpp          |  6 +-
 .../ngram-edit-distance-check_02.sqlpp          |  6 +-
 .../ngram-edit-distance-check_03.sqlpp          |  4 +-
 .../ngram-edit-distance-check_04.sqlpp          |  6 +-
 .../ngram-edit-distance-check_05.sqlpp          |  6 +-
 .../ngram-edit-distance-check_inline_03.sqlpp   |  4 +-
 .../ngram-edit-distance-contains.sqlpp          |  6 +-
 .../ngram-edit-distance_01.sqlpp                |  6 +-
 .../ngram-edit-distance_02.sqlpp                |  6 +-
 .../ngram-edit-distance_03.sqlpp                |  4 +-
 .../ngram-edit-distance_04.sqlpp                |  6 +-
 .../ngram-edit-distance_05.sqlpp                |  6 +-
 .../ngram-edit-distance_inline_03.sqlpp         |  4 +-
 .../ngram-fuzzyeq-edit-distance_01.sqlpp        |  6 +-
 .../ngram-fuzzyeq-edit-distance_02.sqlpp        |  6 +-
 .../ngram-fuzzyeq-edit-distance_03.sqlpp        |  4 +-
 .../ngram-fuzzyeq-edit-distance_04.sqlpp        |  6 +-
 .../ngram-fuzzyeq-edit-distance_05.sqlpp        |  6 +-
 .../ngram-fuzzyeq-jaccard_01.sqlpp              |  6 +-
 .../ngram-fuzzyeq-jaccard_02.sqlpp              |  6 +-
 .../ngram-fuzzyeq-jaccard_03.sqlpp              |  4 +-
 .../ngram-fuzzyeq-jaccard_04.sqlpp              |  6 +-
 .../ngram-jaccard-check_01.sqlpp                |  6 +-
 .../ngram-jaccard-check_02.sqlpp                |  6 +-
 .../ngram-jaccard-check_03.sqlpp                |  4 +-
 .../ngram-jaccard-check_04.sqlpp                |  6 +-
 .../ngram-jaccard-check_inline_03.sqlpp         |  4 +-
 .../inverted-index-join/ngram-jaccard_01.sqlpp  |  6 +-
 .../inverted-index-join/ngram-jaccard_02.sqlpp  |  6 +-
 .../inverted-index-join/ngram-jaccard_03.sqlpp  |  4 +-
 .../inverted-index-join/ngram-jaccard_04.sqlpp  |  6 +-
 .../ngram-jaccard_inline_03.sqlpp               |  4 +-
 .../word-fuzzyeq-jaccard_01.sqlpp               |  6 +-
 .../word-fuzzyeq-jaccard_02.sqlpp               |  6 +-
 .../word-fuzzyeq-jaccard_03.sqlpp               |  4 +-
 .../word-fuzzyeq-jaccard_04.sqlpp               |  6 +-
 .../word-jaccard-check-after-btree-access.sqlpp |  6 +-
 .../word-jaccard-check_01.sqlpp                 |  6 +-
 .../word-jaccard-check_02.sqlpp                 |  6 +-
 .../word-jaccard-check_03.sqlpp                 |  4 +-
 .../word-jaccard-check_04.sqlpp                 |  6 +-
 .../word-jaccard-check_inline_03.sqlpp          |  4 +-
 .../inverted-index-join/word-jaccard_01.sqlpp   |  6 +-
 .../inverted-index-join/word-jaccard_02.sqlpp   |  6 +-
 .../inverted-index-join/word-jaccard_03.sqlpp   |  4 +-
 .../inverted-index-join/word-jaccard_04.sqlpp   |  6 +-
 .../word-jaccard_inline_03.sqlpp                |  4 +-
 ...oin-probe-pidx-with-join-rtree-sidx_01.sqlpp |  6 +-
 ...oin-probe-pidx-with-join-rtree-sidx_02.sqlpp |  6 +-
 .../spatial-intersect-point_01.sqlpp            |  6 +-
 .../spatial-intersect-point_02.sqlpp            |  6 +-
 .../spatial-intersect-point_03.sqlpp            |  4 +-
 .../spatial-intersect-point_04.sqlpp            |  4 +-
 .../spatial-intersect-point_05.sqlpp            |  4 +-
 .../queries_sqlpp/orderby-desc-using-gby.sqlpp  |  6 +-
 .../queries_sqlpp/orders-aggreg.sqlpp           |  4 +-
 .../orders-composite-index-search.sqlpp         |  4 +-
 ...rders-index-search-conjunctive-open_01.sqlpp |  4 +-
 ...rders-index-search-conjunctive-open_02.sqlpp |  4 +-
 .../orders-index-search-conjunctive_01.sqlpp    |  4 +-
 .../orders-index-search-conjunctive_02.sqlpp    |  4 +-
 .../orders-index-search-open.sqlpp              |  4 +-
 .../queries_sqlpp/orders-index-search.sqlpp     |  4 +-
 .../queries_sqlpp/prim-idx-search-open.sqlpp    |  4 +-
 .../queries_sqlpp/prim-idx-search.sqlpp         |  4 +-
 .../pull_select_above_eq_join.sqlpp             |  6 +-
 .../push-project-through-group.sqlpp            |  4 +-
 .../optimizerts/queries_sqlpp/push_limit.sqlpp  |  4 +-
 .../q01_pricing_summary_report_nt.sqlpp         |  4 +-
 .../queries_sqlpp/q03_shipping_priority.sqlpp   |  8 +--
 .../q05_local_supplier_volume.sqlpp             | 14 ++---
 .../queries_sqlpp/q08_group_by.sqlpp            | 14 ++---
 .../queries_sqlpp/q09_group_by.sqlpp            | 16 ++---
 .../optimizerts/queries_sqlpp/q1.sqlpp          |  6 +-
 .../optimizerts/queries_sqlpp/q2.sqlpp          |  6 +-
 .../queries_sqlpp/query-issue562.sqlpp          |  6 +-
 .../queries_sqlpp/query-issue601.sqlpp          |  2 +-
 .../queries_sqlpp/query-issue697.sqlpp          |  2 +-
 .../queries_sqlpp/query-issue785.sqlpp          | 10 +--
 .../queries_sqlpp/query-issue810-2.sqlpp        |  2 +-
 .../queries_sqlpp/query-issue810.sqlpp          |  2 +-
 .../queries_sqlpp/query-issue827-2.sqlpp        |  2 +-
 .../queries_sqlpp/query_issue849-2.sqlpp        |  2 +-
 .../queries_sqlpp/query_issue849.sqlpp          |  2 +-
 .../sort-hint-on-closed-numeric-desc.sqlpp      |  2 +-
 .../sort-hint-on-closed-numeric.sqlpp           |  2 +-
 .../sort-hint-on-closed-string-desc.sqlpp       |  2 +-
 .../sort-hint-on-closed-string.sqlpp            |  2 +-
 .../queries_sqlpp/record_access.sqlpp           |  2 +-
 .../rtree-index-join/issue730.sqlpp             |  6 +-
 ...oin-probe-pidx-with-join-rtree-sidx_01.sqlpp |  6 +-
 ...oin-probe-pidx-with-join-rtree-sidx_02.sqlpp |  6 +-
 .../rtree-index-join/query-issue838.sqlpp       |  6 +-
 .../spatial-intersect-point_01.sqlpp            |  4 +-
 .../spatial-intersect-point_02.sqlpp            |  4 +-
 .../spatial-intersect-point_03.sqlpp            |  4 +-
 .../rtree-secondary-index-open.sqlpp            |  4 +-
 .../queries_sqlpp/rtree-secondary-index.sqlpp   |  4 +-
 .../queries_sqlpp/scan-delete-all.sqlpp         |  4 +-
 .../scan-delete-rtree-secondary-index.sqlpp     |  2 +-
 .../optimizerts/queries_sqlpp/scan-delete.sqlpp |  4 +-
 .../scan-insert-secondary-index.sqlpp           |  4 +-
 .../optimizerts/queries_sqlpp/scan-insert.sqlpp |  4 +-
 ...distance-let-to-edit-distance-check_01.sqlpp |  4 +-
 ...distance-let-to-edit-distance-check_02.sqlpp |  4 +-
 ...distance-let-to-edit-distance-check_03.sqlpp |  4 +-
 ...distance-let-to-edit-distance-check_04.sqlpp |  4 +-
 ...distance-let-to-edit-distance-check_05.sqlpp |  4 +-
 ...distance-let-to-edit-distance-check_06.sqlpp |  4 +-
 ...distance-let-to-edit-distance-check_07.sqlpp |  4 +-
 ...distance-let-to-edit-distance-check_08.sqlpp |  4 +-
 ...dit-distance-to-edit-distance-check_01.sqlpp |  4 +-
 ...dit-distance-to-edit-distance-check_02.sqlpp |  4 +-
 ...dit-distance-to-edit-distance-check_03.sqlpp |  4 +-
 ...dit-distance-to-edit-distance-check_04.sqlpp |  4 +-
 ...dit-distance-to-edit-distance-check_05.sqlpp |  4 +-
 ...dit-distance-to-edit-distance-check_06.sqlpp |  4 +-
 ...dit-distance-to-edit-distance-check_07.sqlpp |  4 +-
 ...dit-distance-to-edit-distance-check_08.sqlpp |  4 +-
 .../fuzzyeq-to-edit-distance-check.sqlpp        |  4 +-
 .../similarity/fuzzyeq-to-jaccard-check.sqlpp   |  4 +-
 .../jaccard-let-to-jaccard-check_01.sqlpp       |  4 +-
 .../jaccard-let-to-jaccard-check_02.sqlpp       |  4 +-
 .../jaccard-let-to-jaccard-check_03.sqlpp       |  4 +-
 .../jaccard-let-to-jaccard-check_04.sqlpp       |  4 +-
 .../jaccard-let-to-jaccard-check_05.sqlpp       |  4 +-
 .../jaccard-let-to-jaccard-check_06.sqlpp       |  4 +-
 .../jaccard-let-to-jaccard-check_07.sqlpp       |  4 +-
 .../jaccard-let-to-jaccard-check_08.sqlpp       |  4 +-
 .../jaccard-to-jaccard-check_01.sqlpp           |  4 +-
 .../jaccard-to-jaccard-check_02.sqlpp           |  4 +-
 .../jaccard-to-jaccard-check_03.sqlpp           |  4 +-
 .../jaccard-to-jaccard-check_04.sqlpp           |  4 +-
 .../jaccard-to-jaccard-check_05.sqlpp           |  4 +-
 .../jaccard-to-jaccard-check_06.sqlpp           |  4 +-
 .../jaccard-to-jaccard-check_07.sqlpp           |  4 +-
 .../jaccard-to-jaccard-check_08.sqlpp           |  4 +-
 ...nt-skip-primary-index-search-in-delete.sqlpp |  4 +-
 .../skip-index/dont-skip-primary-index.sqlpp    |  4 +-
 .../skip-ngram-index-search-in-delete.sqlpp     |  2 +-
 .../skip-index/skip-ngram-index.sqlpp           |  4 +-
 .../skip-rtree-index-search-in-delete.sqlpp     |  2 +-
 .../skip-index/skip-rtree-secondary-index.sqlpp |  4 +-
 .../skip-secondary-btree-index-2.sqlpp          |  4 +-
 ...secondary-btree-index-search-in-delete.sqlpp |  4 +-
 .../skip-index/skip-secondary-btree-index.sqlpp |  4 +-
 .../skip-word-index-search-in-delete.sqlpp      |  2 +-
 .../skip-index/skip-word-index.sqlpp            |  4 +-
 .../optimizerts/queries_sqlpp/sort-cust.sqlpp   |  6 +-
 .../split-materialization-above-join.sqlpp      |  2 +-
 .../queries_sqlpp/split-materialization.sqlpp   |  4 +-
 .../queries_sqlpp/unnest-to-join_01.sqlpp       |  2 +-
 .../queries_sqlpp/unnest-to-join_02.sqlpp       |  2 +-
 .../queries_sqlpp/unnest_list_in_subplan.sqlpp  |  6 +-
 .../parserts/queries_sqlpp/del-dataset.sqlpp    |  4 +-
 .../queries_sqlpp/load-del-dataset.sqlpp        |  4 +-
 .../agg_null_rec/agg_null_rec.1.ddl.sqlpp       |  2 +-
 .../agg_null_rec_1/agg_null_rec_1.1.ddl.sqlpp   |  2 +-
 .../agg_number_rec/agg_number_rec.1.ddl.sqlpp   |  2 +-
 .../avg_double_null/avg_double_null.1.ddl.sqlpp |  2 +-
 .../avg_empty_02/avg_empty_02.1.ddl.sqlpp       |  2 +-
 .../avg_float_null/avg_float_nu.1.ddl.sqlpp     |  2 +-
 .../avg_int16_null/avg_int16_null.1.ddl.sqlpp   |  2 +-
 .../avg_int32_null/avg_int32_null.1.ddl.sqlpp   |  2 +-
 .../avg_int64_null/avg_int64_null.1.ddl.sqlpp   |  2 +-
 .../avg_int8_null/avg_int8_null.1.ddl.sqlpp     |  2 +-
 .../count_empty_02/count_empty_02.1.ddl.sqlpp   |  2 +-
 .../count_null/count_null.1.ddl.sqlpp           |  2 +-
 .../aggregate-sql/issue395/issue395.1.ddl.sqlpp |  2 +-
 .../issue531_string_min_max.1.ddl.sqlpp         |  2 +-
 .../max_empty_02/max_empty_02.1.ddl.sqlpp       |  2 +-
 .../min_empty_02/min_empty_02.1.ddl.sqlpp       |  2 +-
 .../sum_double_null/sum_double_null.1.ddl.sqlpp |  2 +-
 .../sum_empty_02/sum_empty_02.1.ddl.sqlpp       |  2 +-
 .../sum_float_null/sum_float_null.1.ddl.sqlpp   |  2 +-
 .../sum_int16_null/sum_int16_null.1.ddl.sqlpp   |  2 +-
 .../sum_int32_null/sum_int32_null.1.ddl.sqlpp   |  2 +-
 .../sum_int64_null/sum_int64_null.1.ddl.sqlpp   |  2 +-
 .../sum_int8_null/sum_int8_null.1.ddl.sqlpp     |  2 +-
 .../sum_null-with-pred.1.ddl.sqlpp              |  2 +-
 .../sum_numeric_null.1.ddl.sqlpp                |  2 +-
 .../agg_null_rec/agg_null_rec.1.ddl.sqlpp       |  2 +-
 .../agg_null_rec_1/agg_null_rec_1.1.ddl.sqlpp   |  2 +-
 .../agg_number_rec/agg_number_rec.1.ddl.sqlpp   |  2 +-
 .../avg_double_null/avg_double_null.1.ddl.sqlpp |  2 +-
 .../avg_empty_02/avg_empty_02.1.ddl.sqlpp       |  2 +-
 .../avg_float_null/avg_float_nu.1.ddl.sqlpp     |  2 +-
 .../avg_int16_null/avg_int16_null.1.ddl.sqlpp   |  2 +-
 .../avg_int32_null/avg_int32_null.1.ddl.sqlpp   |  2 +-
 .../avg_int64_null/avg_int64_null.1.ddl.sqlpp   |  2 +-
 .../avg_int8_null/avg_int8_null.1.ddl.sqlpp     |  2 +-
 .../count_empty_02/count_empty_02.1.ddl.sqlpp   |  2 +-
 .../aggregate/count_null/count_null.1.ddl.sqlpp |  2 +-
 .../aggregate/droptype/droptype.1.ddl.sqlpp     |  4 +-
 .../global-avg_null/global-avg_null.1.ddl.sqlpp |  2 +-
 .../aggregate/issue395/issue395.1.ddl.sqlpp     |  2 +-
 .../issue531_string_min_max.1.ddl.sqlpp         |  2 +-
 .../local-avg_double_null.1.ddl.sqlpp           |  2 +-
 .../local-avg_float_null.1.ddl.sqlpp            |  2 +-
 .../local-avg_int16_null.1.ddl.sqlpp            |  2 +-
 .../local-avg_int32_null.1.ddl.sqlpp            |  2 +-
 .../local-avg_int64_null.1.ddl.sqlpp            |  2 +-
 .../local-avg_int8_null.1.ddl.sqlpp             |  2 +-
 .../max_empty_02/max_empty_02.1.ddl.sqlpp       |  2 +-
 .../min_empty_02/min_empty_02.1.ddl.sqlpp       |  2 +-
 .../sum_double_null/sum_double_null.1.ddl.sqlpp |  2 +-
 .../sum_empty_02/sum_empty_02.1.ddl.sqlpp       |  2 +-
 .../sum_float_null/sum_float_null.1.ddl.sqlpp   |  2 +-
 .../sum_int16_null/sum_int16_null.1.ddl.sqlpp   |  2 +-
 .../sum_int32_null/sum_int32_null.1.ddl.sqlpp   |  2 +-
 .../sum_int64_null/sum_int64_null.1.ddl.sqlpp   |  2 +-
 .../sum_int8_null/sum_int8_null.1.ddl.sqlpp     |  2 +-
 .../sum_null-with-pred.1.ddl.sqlpp              |  2 +-
 .../sum_numeric_null.1.ddl.sqlpp                |  2 +-
 .../big_object_groupby.1.ddl.sqlpp              |  6 +-
 .../big_object_groupby.1.ddl.sqlpp              |  6 +-
 .../big_object_join/big_object_join.1.ddl.sqlpp |  6 +-
 .../big_object_load/big_object_load.1.ddl.sqlpp |  6 +-
 .../big_object_load_20M.1.ddl.sqlpp             |  2 +-
 .../big_object_load_20M.2.update.sqlpp          |  2 +-
 .../big_object_sort/big_object_sort.1.ddl.sqlpp |  6 +-
 .../binary/equal_join/equal_join.1.ddl.sqlpp    |  2 +-
 .../binary/index_join/index_join.1.ddl.sqlpp    |  2 +-
 .../binary/insert/insert.1.ddl.sqlpp            |  4 +-
 .../datetime_range/datetime_range.1.ddl.sqlpp   |  2 +-
 .../datetime_range_between.1.ddl.sqlpp          |  2 +-
 .../cross-dv01/cross-dv01.1.ddl.sqlpp           |  4 +-
 .../cross-dv02/cross-dv02.1.ddl.sqlpp           |  4 +-
 .../cross-dv03/cross-dv03.1.ddl.sqlpp           |  4 +-
 .../cross-dv04/cross-dv04.1.ddl.sqlpp           |  4 +-
 .../cross-dv07/cross-dv07.1.ddl.sqlpp           |  2 +-
 .../cross-dv09/cross-dv09.1.ddl.sqlpp           |  4 +-
 .../cross-dv11/cross-dv11.1.ddl.sqlpp           |  4 +-
 .../cross-dv12/cross-dv12.1.ddl.sqlpp           |  4 +-
 .../cross-dv13/cross-dv13.1.ddl.sqlpp           |  6 +-
 .../cross-dv14/cross-dv14.1.ddl.sqlpp           |  2 +-
 .../cross-dv15/cross-dv15.1.ddl.sqlpp           |  6 +-
 .../cross-dv16/cross-dv16.1.ddl.sqlpp           |  8 +--
 .../cross-dv17/cross-dv17.1.ddl.sqlpp           |  8 +--
 .../cross-dv18/cross-dv18.1.ddl.sqlpp           |  4 +-
 .../cross-dv19/cross-dv19.1.ddl.sqlpp           |  6 +-
 .../cross-dv20/cross-dv20.1.ddl.sqlpp           |  4 +-
 .../drop_dataset/drop_dataset.1.ddl.sqlpp       |  6 +-
 .../insert_across_dataverses.1.ddl.sqlpp        |  8 +--
 .../insert_from_source_dataset.1.ddl.sqlpp      |  2 +-
 .../join_across_dataverses.1.ddl.sqlpp          |  6 +-
 .../csv/basic-types/basic-types.1.ddl.sqlpp     |  2 +-
 .../queries_sqlpp/custord/co/co.1.ddl.sqlpp     | 10 +--
 .../customer_q_01/customer_q_01.1.ddl.sqlpp     |  4 +-
 .../customer_q_02/customer_q_02.1.ddl.sqlpp     |  4 +-
 .../customer_q_03/customer_q_03.1.ddl.sqlpp     |  4 +-
 .../customer_q_04/customer_q_04.1.ddl.sqlpp     |  4 +-
 .../customer_q_05/customer_q_05.1.ddl.sqlpp     |  4 +-
 .../customer_q_06/customer_q_06.1.ddl.sqlpp     |  4 +-
 .../customer_q_07/customer_q_07.1.ddl.sqlpp     |  4 +-
 .../customer_q_08/customer_q_08.1.ddl.sqlpp     |  4 +-
 .../denorm-cust-order_01.1.ddl.sqlpp            | 10 +--
 .../denorm-cust-order_02.1.ddl.sqlpp            |  8 +--
 .../denorm-cust-order_03.1.ddl.sqlpp            |  8 +--
 .../custord/freq-clerk/freq-clerk.1.ddl.sqlpp   |  6 +-
 .../custord/join_q_01/join_q_01.1.ddl.sqlpp     |  6 +-
 .../custord/join_q_02/join_q_02.1.ddl.sqlpp     |  6 +-
 .../custord/join_q_03/join_q_03.1.ddl.sqlpp     |  6 +-
 .../custord/join_q_04/join_q_04.1.ddl.sqlpp     |  6 +-
 .../custord/join_q_05/join_q_05.1.ddl.sqlpp     |  6 +-
 .../custord/join_q_06/join_q_06.1.ddl.sqlpp     |  4 +-
 .../custord/join_q_07/join_q_07.1.ddl.sqlpp     |  4 +-
 .../custord/join_q_08/join_q_08.1.ddl.sqlpp     |  6 +-
 .../custord/join_q_09/join_q_09.1.ddl.sqlpp     |  6 +-
 .../custord/load-test/load-test.1.ddl.sqlpp     |  4 +-
 .../custord/order_q_01/order_q_01.1.ddl.sqlpp   |  2 +-
 .../custord/order_q_02/order_q_02.1.ddl.sqlpp   |  2 +-
 .../custord/order_q_03/order_q_03.1.ddl.sqlpp   |  2 +-
 .../custord/order_q_04/order_q_04.1.ddl.sqlpp   |  2 +-
 .../custord/order_q_05/order_q_05.1.ddl.sqlpp   |  2 +-
 .../custord/order_q_06/order_q_06.1.ddl.sqlpp   |  2 +-
 .../query-ASTERIXDB-1754.1.ddl.sqlpp            |  4 +-
 .../queries_sqlpp/dapd/q1/q1.1.ddl.sqlpp        |  4 +-
 .../queries_sqlpp/dapd/q2-10/q2-10.1.ddl.sqlpp  |  4 +-
 .../queries_sqlpp/dapd/q2-11/q2-11.1.ddl.sqlpp  |  4 +-
 .../queries_sqlpp/dapd/q2-12/q2-12.1.ddl.sqlpp  |  4 +-
 .../q2-2-negative/q2-2-negative.1.ddl.sqlpp     |  4 +-
 .../queries_sqlpp/dapd/q2-2/q2-2.1.ddl.sqlpp    |  4 +-
 .../queries_sqlpp/dapd/q2-3/q2-3.1.ddl.sqlpp    |  4 +-
 .../queries_sqlpp/dapd/q2-4/q2-4.1.ddl.sqlpp    |  4 +-
 .../queries_sqlpp/dapd/q2-5/q2-5.1.ddl.sqlpp    |  4 +-
 .../queries_sqlpp/dapd/q2-6/q2-6.1.ddl.sqlpp    |  4 +-
 .../queries_sqlpp/dapd/q2-7/q2-7.1.ddl.sqlpp    |  4 +-
 .../queries_sqlpp/dapd/q2-8/q2-8.1.ddl.sqlpp    |  4 +-
 .../queries_sqlpp/dapd/q2-9/q2-9.1.ddl.sqlpp    |  4 +-
 .../queries_sqlpp/dapd/q2/q2.1.ddl.sqlpp        |  4 +-
 .../queries_sqlpp/dapd/q3/q3.1.ddl.sqlpp        |  4 +-
 .../compact-dataset-and-its-indexes.1.ddl.sqlpp |  2 +-
 .../create-drop-cltype.1.ddl.sqlpp              |  4 +-
 .../create-drop-opntype.1.ddl.sqlpp             |  4 +-
 ...e-from-loaded-dataset-with-index.1.ddl.sqlpp |  2 +-
 .../delete-from-loaded-dataset.1.ddl.sqlpp      |  2 +-
 .../delete-multi-statement.1.ddl.sqlpp          | 16 ++---
 .../delete-syntax-change.1.ddl.sqlpp            |  2 +-
 .../drop-empty-secondary-indexes.1.ddl.sqlpp    |  6 +-
 .../dml/drop-index/drop-index.1.ddl.sqlpp       |  2 +-
 .../empty-load-with-index.1.ddl.sqlpp           |  2 +-
 ...dataset-with-index-on-open-field.1.ddl.sqlpp |  4 +-
 ...sert-and-scan-dataset-with-index.1.ddl.sqlpp |  2 +-
 .../insert-and-scan-dataset.1.ddl.sqlpp         |  2 +-
 .../insert-and-scan-joined-datasets.1.ddl.sqlpp |  2 +-
 .../insert-duplicated-keys.1.ddl.sqlpp          |  2 +-
 ...rt-into-empty-dataset-with-index.1.ddl.sqlpp |  2 +-
 .../insert-into-empty-dataset.1.ddl.sqlpp       |  2 +-
 ...nto-loaded-dataset-with-index_01.1.ddl.sqlpp |  2 +-
 ...nto-loaded-dataset-with-index_02.1.ddl.sqlpp |  4 +-
 .../insert-into-loaded-dataset_01.1.ddl.sqlpp   |  2 +-
 .../insert-into-loaded-dataset_02.1.ddl.sqlpp   |  2 +-
 .../insert-record-function.1.ddl.sqlpp          |  2 +-
 .../insert-return-records.1.ddl.sqlpp           |  4 +-
 ...ert-returning-fieldname-implicit.1.ddl.sqlpp |  4 +-
 .../insert-returning-fieldname.1.ddl.sqlpp      |  4 +-
 .../insert-returning-udf.1.ddl.sqlpp            |  4 +-
 .../insert-src-dst-01.1.ddl.sqlpp               |  4 +-
 .../dml/insert-syntax/insert-syntax.1.ddl.sqlpp |  2 +-
 ...ert-with-autogenerated-pk_adm_01.1.ddl.sqlpp |  2 +-
 ...ert-with-autogenerated-pk_adm_02.1.ddl.sqlpp |  2 +-
 ...ert-with-autogenerated-pk_adm_03.1.ddl.sqlpp |  2 +-
 .../insert-with-bad-return.1.ddl.sqlpp          |  4 +-
 .../queries_sqlpp/dml/insert/insert.1.ddl.sqlpp |  4 +-
 .../insert_less_nc/insert_less_nc.1.ddl.sqlpp   |  4 +-
 .../load-from-hdfs/load-from-hdfs.1.ddl.sqlpp   |  2 +-
 ...oad-with-autogenerated-pk_adm_01.1.ddl.sqlpp |  2 +-
 ...oad-with-autogenerated-pk_adm_01.1.ddl.sqlpp |  2 +-
 ...oad-with-autogenerated-pk_adm_03.1.ddl.sqlpp |  2 +-
 ...oad-with-autogenerated-pk_adm_04.1.ddl.sqlpp |  2 +-
 ...oad-with-autogenerated-pk_csv_01.1.ddl.sqlpp |  2 +-
 ...oad-with-autogenerated-pk_csv_02.1.ddl.sqlpp |  2 +-
 ...oad-with-autogenerated-pk_txt_01.1.ddl.sqlpp |  2 +-
 .../load-with-index-open.1.ddl.sqlpp            |  4 +-
 .../load-with-index/load-with-index.1.ddl.sqlpp |  2 +-
 .../load-with-ngram-index-open.1.ddl.sqlpp      |  4 +-
 .../load-with-ngram-index.1.ddl.sqlpp           |  2 +-
 .../load-with-rtree-index-open.1.ddl.sqlpp      |  4 +-
 .../load-with-rtree-index.1.ddl.sqlpp           |  2 +-
 .../load-with-word-index-open.1.ddl.sqlpp       |  4 +-
 .../load-with-word-index.1.ddl.sqlpp            |  2 +-
 .../opentype-c2o-recursive.1.ddl.sqlpp          |  8 +--
 .../dml/opentype-c2o/opentype-c2o.1.ddl.sqlpp   |  4 +-
 .../opentype-closed-optional.1.ddl.sqlpp        |  2 +-
 .../opentype-insert/opentype-insert.1.ddl.sqlpp |  2 +-
 .../opentype-insert2.1.ddl.sqlpp                |  2 +-
 .../opentype-noexpand.1.ddl.sqlpp               |  2 +-
 .../opentype-o2c-recursive.1.ddl.sqlpp          |  8 +--
 .../dml/opentype-o2c/opentype-o2c.1.ddl.sqlpp   |  4 +-
 .../dml/opentype-o2o/opentype-o2o.1.ddl.sqlpp   |  4 +-
 .../query-issue205/query-issue205.1.ddl.sqlpp   |  4 +-
 .../query-issue288/query-issue288.1.ddl.sqlpp   |  2 +-
 .../query-issue382/query-issue382.1.ddl.sqlpp   |  4 +-
 .../query-issue433/query-issue433.1.ddl.sqlpp   |  4 +-
 .../recreate-index/recreate-index.1.ddl.sqlpp   |  2 +-
 ...related-secondary-index-nullable.1.ddl.sqlpp |  4 +-
 ...-correlated-secondary-index-open.1.ddl.sqlpp |  6 +-
 ...e-btree-secondary-index-nullable.1.ddl.sqlpp |  4 +-
 ...elete-btree-secondary-index-open.1.ddl.sqlpp |  6 +-
 ...related-secondary-index-nullable.1.ddl.sqlpp |  2 +-
 ...-correlated-secondary-index-open.1.ddl.sqlpp |  4 +-
 ...ngram-correlated-secondary-index.1.ddl.sqlpp |  2 +-
 ...x-ngram-secondary-index-nullable.1.ddl.sqlpp |  2 +-
 ...index-ngram-secondary-index-open.1.ddl.sqlpp |  4 +-
 ...rted-index-ngram-secondary-index.1.ddl.sqlpp |  2 +-
 ...related-secondary-index-nullable.1.ddl.sqlpp |  4 +-
 ...-correlated-secondary-index-open.1.ddl.sqlpp |  4 +-
 ...-word-correlated-secondary-index.1.ddl.sqlpp |  2 +-
 ...ex-word-secondary-index-nullable.1.ddl.sqlpp |  2 +-
 ...-index-word-secondary-index-open.1.ddl.sqlpp |  4 +-
 ...erted-index-word-secondary-index.1.ddl.sqlpp |  2 +-
 ...related-secondary-index-nullable.1.ddl.sqlpp |  2 +-
 ...-correlated-secondary-index-open.1.ddl.sqlpp |  4 +-
 ...rtree-correlated-secondary-index.1.ddl.sqlpp |  2 +-
 ...e-rtree-secondary-index-nullable.1.ddl.sqlpp |  2 +-
 ...elete-rtree-secondary-index-open.1.ddl.sqlpp |  4 +-
 ...can-delete-rtree-secondary-index.1.ddl.sqlpp |  2 +-
 ...related-secondary-index-nullable.1.ddl.sqlpp |  4 +-
 ...-correlated-secondary-index-open.1.ddl.sqlpp |  6 +-
 ...t-btree-secondary-index-nullable.1.ddl.sqlpp |  4 +-
 ...nsert-btree-secondary-index-open.1.ddl.sqlpp |  6 +-
 ...related-secondary-index-nullable.1.ddl.sqlpp |  2 +-
 ...-correlated-secondary-index-open.1.ddl.sqlpp |  4 +-
 ...ngram-correlated-secondary-index.1.ddl.sqlpp |  2 +-
 ...x-ngram-secondary-index-nullable.1.ddl.sqlpp |  2 +-
 ...index-ngram-secondary-index-open.1.ddl.sqlpp |  4 +-
 ...rted-index-ngram-secondary-index.1.ddl.sqlpp |  2 +-
 ...related-secondary-index-nullable.1.ddl.sqlpp |  2 +-
 ...-correlated-secondary-index-open.1.ddl.sqlpp |  4 +-
 ...-word-correlated-secondary-index.1.ddl.sqlpp |  2 +-
 ...ex-word-secondary-index-nullable.1.ddl.sqlpp |  2 +-
 ...-index-word-secondary-index-open.1.ddl.sqlpp |  4 +-
 ...erted-index-word-secondary-index.1.ddl.sqlpp |  2 +-
 ...related-secondary-index-nullable.1.ddl.sqlpp |  4 +-
 ...-correlated-secondary-index-open.1.ddl.sqlpp |  4 +-
 ...rtree-correlated-secondary-index.1.ddl.sqlpp |  4 +-
 ...t-rtree-secondary-index-nullable.1.ddl.sqlpp |  4 +-
 ...nsert-rtree-secondary-index-open.1.ddl.sqlpp |  4 +-
 ...can-insert-rtree-secondary-index.1.ddl.sqlpp |  4 +-
 .../upsert-dataset-with-meta.1.ddl.sqlpp        |  2 +-
 .../upsert-return-custom-result.1.ddl.sqlpp     |  4 +-
 .../using-constant-merge-policy.1.ddl.sqlpp     |  2 +-
 ...ed-prefix-merge-policy-with-feed.1.ddl.sqlpp |  2 +-
 ...g-correlated-prefix-merge-policy.1.ddl.sqlpp |  2 +-
 .../using-no-merge-policy.1.ddl.sqlpp           |  2 +-
 .../using-prefix-merge-policy.1.ddl.sqlpp       |  2 +-
 .../employee/q_01/q_01.1.ddl.sqlpp              |  2 +-
 .../employee/q_02/q_02.1.ddl.sqlpp              |  2 +-
 .../explain_field_access.1.ddl.sqlpp            |  2 +-
 .../explain_field_access_closed.1.ddl.sqlpp     |  2 +-
 .../leftouterjoin-rtree.1.ddl.sqlpp             |  4 +-
 .../leftouterjoin/leftouterjoin.1.ddl.sqlpp     |  4 +-
 .../rc-format/rc-format.1.ddl.sqlpp             |  2 +-
 .../rtree-index/rtree-index.1.ddl.sqlpp         |  2 +-
 .../sequence-format/sequence-format.1.ddl.sqlpp |  2 +-
 .../text-format/text-format.1.ddl.sqlpp         |  2 +-
 .../group_by_failure.1.ddl.sqlpp                |  2 +-
 .../group_by_hash_failure.1.ddl.sqlpp           |  2 +-
 .../order_by_failure.1.ddl.sqlpp                |  2 +-
 ...1_pricing_summary_report_failure.1.ddl.sqlpp |  2 +-
 ...18_large_volume_customer_failure.1.ddl.sqlpp |  6 +-
 .../create-policy-from-file.3.ddl.sqlpp         |  2 +-
 .../feeds/feeds_01/feeds_01.1.ddl.sqlpp         |  4 +-
 .../feeds/feeds_02/feeds_02.1.ddl.sqlpp         |  2 +-
 .../feeds/feeds_03/feeds_03.1.ddl.sqlpp         |  4 +-
 .../feeds/feeds_07/feeds_07.1.ddl.sqlpp         |  4 +-
 .../feeds/feeds_08/feeds_08.1.ddl.sqlpp         |  4 +-
 .../feeds/feeds_09/feeds_09.1.ddl.sqlpp         |  4 +-
 .../feeds/feeds_10/feeds_10.1.ddl.sqlpp         |  2 +-
 .../feeds/feeds_11/feeds_11.1.ddl.sqlpp         |  4 +-
 .../feeds/feeds_12/feeds_12.1.ddl.sqlpp         |  2 +-
 .../issue_230_feeds/issue_230_feeds.1.ddl.sqlpp |  2 +-
 .../feeds/upsert-feed/upsert-feed.1.ddl.sqlpp   |  2 +-
 .../feeds/upsert-feed/upsert-feed.8.ddl.sqlpp   |  2 +-
 .../filters/delete/delete.11.ddl.sqlpp          |  2 +-
 .../equality-predicate.1.ddl.sqlpp              |  2 +-
 ...-with-correlated-secondary-btree.1.ddl.sqlpp |  2 +-
 ...related-secondary-inverted-ngram.1.ddl.sqlpp |  2 +-
 ...rrelated-secondary-inverted-word.1.ddl.sqlpp |  2 +-
 ...-with-correlated-secondary-rtree.1.ddl.sqlpp |  2 +-
 .../insert-with-secondary-btree.1.ddl.sqlpp     |  2 +-
 ...rt-with-secondary-inverted-ngram.1.ddl.sqlpp |  2 +-
 ...ert-with-secondary-inverted-word.1.ddl.sqlpp |  2 +-
 .../insert-with-secondary-rtree.1.ddl.sqlpp     |  2 +-
 .../filters/insert/insert.1.ddl.sqlpp           |  2 +-
 .../load-with-secondary-btree.1.ddl.sqlpp       |  2 +-
 ...ad-with-secondary-inverted-ngram.1.ddl.sqlpp |  2 +-
 ...oad-with-secondary-inverted-word.1.ddl.sqlpp |  2 +-
 .../load-with-secondary-rtree.1.ddl.sqlpp       |  2 +-
 .../queries_sqlpp/filters/load/load.1.ddl.sqlpp |  2 +-
 .../equality-predicate.1.ddl.sqlpp              |  4 +-
 .../filters/upsert/upsert.1.ddl.sqlpp           |  8 +--
 .../filters/upsert/upsert.11.ddl.sqlpp          |  2 +-
 .../queries_sqlpp/flwor/at00/at00.1.ddl.sqlpp   |  2 +-
 .../queries_sqlpp/flwor/at01/at01.1.ddl.sqlpp   |  4 +-
 .../queries_sqlpp/flwor/at02/at02.1.ddl.sqlpp   |  6 +-
 .../queries_sqlpp/flwor/at03/at03.1.ddl.sqlpp   |  4 +-
 .../queries_sqlpp/flwor/at04/at04.1.ddl.sqlpp   |  2 +-
 .../queries_sqlpp/flwor/at05/at05.1.ddl.sqlpp   |  2 +-
 .../queries_sqlpp/flwor/at06/at06.1.ddl.sqlpp   |  2 +-
 .../queries_sqlpp/flwor/let33/let33.1.ddl.sqlpp |  2 +-
 .../query-ASTERIXDB-883.1.ddl.sqlpp             |  6 +-
 .../fulltext-01/fulltext-01.1.ddl.sqlpp         |  2 +-
 .../fulltext-02/fulltext-02.1.ddl.sqlpp         |  2 +-
 .../fulltext-index-01.1.ddl.sqlpp               |  2 +-
 .../fulltext-index-02.1.ddl.sqlpp               |  2 +-
 .../fuzzyjoin/dblp-1_1/dblp-1_1.1.ddl.sqlpp     |  2 +-
 .../dblp-1_2.1.1/dblp-1_2.1.1.1.ddl.sqlpp       |  2 +-
 .../fuzzyjoin/dblp-1_2.1/dblp-1_2.1.1.ddl.sqlpp |  2 +-
 .../fuzzyjoin/dblp-1_2/dblp-1_2.1.ddl.sqlpp     |  2 +-
 .../dblp-2.1_5.3.1/dblp-2.1_5.3.1.1.ddl.sqlpp   |  2 +-
 .../fuzzyjoin/dblp-2.2/dblp-2.2.1.ddl.sqlpp     |  4 +-
 .../fuzzyjoin/dblp-2_1/dblp-2_1.1.ddl.sqlpp     |  2 +-
 .../fuzzyjoin/dblp-2_2/dblp-2_2.1.ddl.sqlpp     |  2 +-
 .../fuzzyjoin/dblp-2_3/dblp-2_3.1.ddl.sqlpp     |  2 +-
 .../fuzzyjoin/dblp-2_4/dblp-2_4.1.ddl.sqlpp     |  2 +-
 .../fuzzyjoin/dblp-2_5.1/dblp-2_5.1.1.ddl.sqlpp |  2 +-
 .../fuzzyjoin/dblp-2_5.2/dblp-2_5.2.1.ddl.sqlpp |  2 +-
 .../dblp-2_5.3.1/dblp-2_5.3.1.1.ddl.sqlpp       |  2 +-
 .../fuzzyjoin/dblp-2_5.3/dblp-2_5.3.1.ddl.sqlpp |  2 +-
 .../fuzzyjoin/dblp-2_5/dblp-2_5.1.ddl.sqlpp     |  2 +-
 .../fuzzyjoin/dblp-3_1.1/dblp-3_1.1.1.ddl.sqlpp |  2 +-
 .../fuzzyjoin/dblp-3_1.2/dblp-3_1.2.1.ddl.sqlpp |  2 +-
 .../fuzzyjoin/dblp-3_1/dblp-3_1.1.ddl.sqlpp     |  2 +-
 .../dblp-aqlplus_1/dblp-aqlplus_1.1.ddl.sqlpp   |  2 +-
 .../dblp-aqlplus_2/dblp-aqlplus_2.1.ddl.sqlpp   |  2 +-
 .../dblp-csx-2_1/dblp-csx-2_1.1.ddl.sqlpp       |  4 +-
 .../dblp-csx-2_2/dblp-csx-2_2.1.ddl.sqlpp       |  4 +-
 .../dblp-csx-2_3/dblp-csx-2_3.1.ddl.sqlpp       |  4 +-
 .../dblp-csx-2_4/dblp-csx-2_4.1.ddl.sqlpp       |  4 +-
 .../dblp-csx-2_5.1/dblp-csx-2_5.1.1.ddl.sqlpp   |  4 +-
 .../dblp-csx-2_5.2/dblp-csx-2_5.2.1.ddl.sqlpp   |  4 +-
 .../dblp-csx-2_5.3.1.1.ddl.sqlpp                |  4 +-
 .../dblp-csx-2_5.3/dblp-csx-2_5.3.1.ddl.sqlpp   |  4 +-
 .../dblp-csx-2_5/dblp-csx-2_5.1.ddl.sqlpp       |  4 +-
 .../dblp-csx-3_1/dblp-csx-3_1.1.ddl.sqlpp       |  4 +-
 .../dblp-csx-3_2/dblp-csx-3_2.1.ddl.sqlpp       |  4 +-
 .../dblp-csx-3_3/dblp-csx-3_3.1.ddl.sqlpp       |  4 +-
 .../dblp-csx-3_4/dblp-csx-3_4.1.ddl.sqlpp       |  4 +-
 .../dblp-csx-3_5.1/dblp-csx-3_5.1.1.ddl.sqlpp   |  4 +-
 .../dblp-csx-3_5.2/dblp-csx-3_5.2.1.ddl.sqlpp   |  4 +-
 .../dblp-csx-3_5.3.1.1.ddl.sqlpp                |  4 +-
 .../dblp-csx-3_5.3/dblp-csx-3_5.3.1.ddl.sqlpp   |  4 +-
 .../dblp-csx-3_5.4.1.1.ddl.sqlpp                |  4 +-
 .../dblp-csx-3_5.4/dblp-csx-3_5.4.1.ddl.sqlpp   |  4 +-
 .../dblp-csx-3_5/dblp-csx-3_5.1.ddl.sqlpp       |  4 +-
 .../dblp-csx-aqlplus_1.1.ddl.sqlpp              |  4 +-
 .../dblp-csx-aqlplus_2.1.ddl.sqlpp              |  4 +-
 .../dblp-csx-aqlplus_3.1.ddl.sqlpp              |  4 +-
 .../dblp-csx-dblp-aqlplus_1.1.ddl.sqlpp         |  4 +-
 .../dblp-lookup_1/dblp-lookup_1.1.ddl.sqlpp     |  2 +-
 .../dblp-splits-3_1/dblp-splits-3_1.1.ddl.sqlpp |  2 +-
 .../events-users-aqlplus_1.1.ddl.sqlpp          |  8 +--
 .../fuzzyjoin/opentype/opentype.1.ddl.sqlpp     |  2 +-
 .../user-int-aqlplus_1.1.ddl.sqlpp              |  4 +-
 .../user-int-aqlplus_2.1.ddl.sqlpp              |  4 +-
 .../user-int-aqlplus_3.1.ddl.sqlpp              |  4 +-
 .../user-lot-aqlplus_1.1.1.ddl.sqlpp            |  4 +-
 .../user-lot-aqlplus_1.1.ddl.sqlpp              |  4 +-
 .../user-lot-aqlplus_2.1.ddl.sqlpp              |  4 +-
 .../user-lot-aqlplus_3.1.ddl.sqlpp              |  4 +-
 .../user-vis-int-3_1.1.ddl.sqlpp                |  8 +--
 .../user-vis-int-aqlplus_1.1.ddl.sqlpp          |  8 +--
 .../user-vis-int-aqlplus_2.1.ddl.sqlpp          |  8 +--
 .../user-vis-int-aqlplus_3.1.ddl.sqlpp          |  8 +--
 ...r-vis-int-vis-user-lot-aqlplus_1.1.ddl.sqlpp |  8 +--
 .../user-vis-lot-3_1.1.ddl.sqlpp                |  8 +--
 .../user-vis-lot-aqlplus_1.1.ddl.sqlpp          |  8 +--
 .../user-vis-lot-aqlplus_2.1.ddl.sqlpp          |  8 +--
 .../user-vis-lot-aqlplus_3.1.ddl.sqlpp          |  8 +--
 .../user-vis-lot-aqlplus_4.1.ddl.sqlpp          |  8 +--
 .../user-vis-lot-aqlplus_5.1.ddl.sqlpp          |  8 +--
 .../user-vis-lot-int-aqlplus_1.1.ddl.sqlpp      |  8 +--
 .../user-vis-lot-int-aqlplus_2.1.ddl.sqlpp      |  8 +--
 .../global-aggregate/q01/q01.1.ddl.sqlpp        |  8 +--
 .../global-aggregate/q02/q02.1.ddl.sqlpp        |  8 +--
 .../global-aggregate/q03/q03.1.ddl.sqlpp        |  8 +--
 .../global-aggregate/q04/q04.1.ddl.sqlpp        |  8 +--
 .../q05_error/q05_error.1.ddl.sqlpp             |  8 +--
 .../q06_error/q06_error.1.ddl.sqlpp             |  8 +--
 .../q07_error/q07_error.1.ddl.sqlpp             |  8 +--
 .../global-aggregate/q08/q08.1.ddl.sqlpp        |  8 +--
 .../global-aggregate/q09/q09.1.ddl.sqlpp        |  8 +--
 .../global-aggregate/q10/q10.1.ddl.sqlpp        |  8 +--
 .../global-aggregate/q11/q11.1.ddl.sqlpp        |  2 +-
 .../q12_error/q12_error.1.ddl.sqlpp             |  2 +-
 .../query-ASTERIXDB-159.1.ddl.sqlpp             |  2 +-
 .../query-ASTERIXDB-159.4.ddl.sqlpp             |  2 +-
 .../query-ASTERIXDB-1626-2.1.ddl.sqlpp          |  2 +-
 .../query-ASTERIXDB-1626-2.4.ddl.sqlpp          |  2 +-
 .../query-ASTERIXDB-1626.1.ddl.sqlpp            |  2 +-
 .../query-ASTERIXDB-1626.4.ddl.sqlpp            |  2 +-
 .../graph/pregel-q01/pregel-q01.1.ddl.sqlpp     | 10 +--
 .../graph/pregel-q02/pregel-q02.1.ddl.sqlpp     |  6 +-
 .../graph/pregel-q03/pregel-q03.1.ddl.sqlpp     |  6 +-
 .../core-01-error/core-01-error.1.ddl.sqlpp     |  2 +-
 .../group-by/core-01/core-01.1.ddl.sqlpp        |  2 +-
 .../core-02-error/core-02-error.1.ddl.sqlpp     |  2 +-
 .../group-by/core-02/core-02.1.ddl.sqlpp        |  6 +-
 .../group-by/core-02/core-02.2.update.sqlpp     |  4 +-
 .../group-by/core-03/core-02.1.ddl.sqlpp        |  6 +-
 .../group-by/core-03/core-02.2.update.sqlpp     |  4 +-
 .../group-by/core-04/core-04.1.ddl.sqlpp        |  6 +-
 .../group-by/core-04/core-04.2.update.sqlpp     |  4 +-
 .../group-by/core-05/core-05.1.ddl.sqlpp        |  4 +-
 .../group-by/core-05/core-05.2.update.sqlpp     |  2 +-
 .../group-by/gby-expr-2/gby-expr-2.1.ddl.sqlpp  |  6 +-
 .../gby-expr-2/gby-expr-2.2.update.sqlpp        |  4 +-
 .../group-by/gby-expr-3/gby-expr-3.1.ddl.sqlpp  |  6 +-
 .../gby-expr-3/gby-expr-3.2.update.sqlpp        |  4 +-
 .../group-by/gby-expr/gby-expr.1.ddl.sqlpp      |  6 +-
 .../group-by/gby-expr/gby-expr.2.update.sqlpp   |  4 +-
 .../group-by/having-2/having-2.1.ddl.sqlpp      |  6 +-
 .../group-by/having-2/having-2.2.update.sqlpp   |  4 +-
 .../group-by/having/having.1.ddl.sqlpp          |  6 +-
 .../group-by/having/having.2.update.sqlpp       |  4 +-
 .../group-by/policy-02/policy-02.1.ddl.sqlpp    |  2 +-
 .../group-by/policy-03/policy-03.1.ddl.sqlpp    |  2 +-
 .../group-by/policy-04/policy-04.1.ddl.sqlpp    |  2 +-
 .../group-by/policy-05/policy-05.1.ddl.sqlpp    |  2 +-
 .../group-by/policy/policy.1.ddl.sqlpp          |  2 +-
 .../group-by/sugar-01-2/sugar-01-2.1.ddl.sqlpp  |  2 +-
 .../sugar-01-negative.1.ddl.sqlpp               |  2 +-
 .../group-by/sugar-01/sugar-01.1.ddl.sqlpp      |  2 +-
 .../group-by/sugar-02-2/sugar-02-2.1.ddl.sqlpp  |  6 +-
 .../sugar-02-2/sugar-02-2.2.update.sqlpp        |  4 +-
 .../group-by/sugar-02/sugar-02.1.ddl.sqlpp      |  6 +-
 .../group-by/sugar-02/sugar-02.2.update.sqlpp   |  4 +-
 .../group-by/sugar-03-2/sugar-03-2.1.ddl.sqlpp  |  6 +-
 .../sugar-03-2/sugar-03-2.2.update.sqlpp        |  4 +-
 .../group-by/sugar-03/sugar-03.1.ddl.sqlpp      |  6 +-
 .../group-by/sugar-03/sugar-03.2.update.sqlpp   |  4 +-
 .../group-by/sugar-04-2/sugar-04-2.1.ddl.sqlpp  |  6 +-
 .../sugar-04-2/sugar-04-2.2.update.sqlpp        |  4 +-
 .../group-by/sugar-04/sugar-04.1.ddl.sqlpp      |  6 +-
 .../group-by/sugar-04/sugar-04.2.update.sqlpp   |  4 +-
 .../group-by/sugar-05-2/sugar-05-2.1.ddl.sqlpp  |  4 +-
 .../group-by/sugar-05/sugar-05.1.ddl.sqlpp      |  4 +-
 .../group-by/sugar-05/sugar-05.2.update.sqlpp   |  2 +-
 .../hdfs/hdfs_02/hdfs_02.1.ddl.sqlpp            |  2 +-
 .../hdfs/hdfs_03/hdfs_03.1.ddl.sqlpp            |  2 +-
 .../hdfs_shortcircuit.1.ddl.sqlpp               |  2 +-
 .../issue_245_hdfs/issue_245_hdfs.1.ddl.sqlpp   |  2 +-
 .../issue_251_dataset_hint_5.1.ddl.sqlpp        |  2 +-
 .../issue_251_dataset_hint_6.1.ddl.sqlpp        |  2 +-
 .../issue_251_dataset_hint_7.1.ddl.sqlpp        |  2 +-
 .../btree-index-nested-loop-join.1.ddl.sqlpp    |  6 +-
 .../btree-primary-equi-join.1.ddl.sqlpp         |  6 +-
 .../btree-secondary-equi-join_01.1.ddl.sqlpp    |  4 +-
 .../btree-secondary-equi-join_02.1.ddl.sqlpp    |  4 +-
 .../btree-secondary-equi-join_03.1.ddl.sqlpp    |  4 +-
 .../rtree-spatial-intersect-point.1.ddl.sqlpp   |  2 +-
 ...probe-pidx-with-join-btree-sidx1.1.ddl.sqlpp |  4 +-
 ...probe-pidx-with-join-btree-sidx2.1.ddl.sqlpp |  4 +-
 ...robe-pidx-with-join-invidx-sidx1.1.ddl.sqlpp |  4 +-
 ...robe-pidx-with-join-invidx-sidx2.1.ddl.sqlpp |  4 +-
 ...probe-pidx-with-join-rtree-sidx1.1.ddl.sqlpp |  4 +-
 ...probe-pidx-with-join-rtree-sidx2.1.ddl.sqlpp |  4 +-
 ...ex-composite-key-mixed-intervals.1.ddl.sqlpp |  2 +-
 .../btree-index-composite-key.1.ddl.sqlpp       |  2 +-
 .../btree-index-rewrite-multiple.1.ddl.sqlpp    |  2 +-
 .../cust-index-age-nullable.1.ddl.sqlpp         |  4 +-
 .../disjunctive-predicate-1.1.ddl.sqlpp         |  2 +-
 .../inverted-index-ngram-contains.1.ddl.sqlpp   |  2 +-
 ...dex-ngram-edit-distance-contains.1.ddl.sqlpp |  2 +-
 ...-index-ngram-edit-distance-panic.1.ddl.sqlpp |  2 +-
 ...-ngram-edit-distance-word-tokens.1.ddl.sqlpp |  2 +-
 ...verted-index-ngram-edit-distance.1.ddl.sqlpp |  2 +-
 .../inverted-index-ngram-jaccard.1.ddl.sqlpp    |  2 +-
 ...-index-olist-edit-distance-panic.1.ddl.sqlpp |  4 +-
 ...verted-index-olist-edit-distance.1.ddl.sqlpp |  4 +-
 .../inverted-index-olist-jaccard.1.ddl.sqlpp    |  4 +-
 .../inverted-index-ulist-jaccard.1.ddl.sqlpp    |  4 +-
 .../inverted-index-word-contains.1.ddl.sqlpp    |  2 +-
 .../inverted-index-word-jaccard.1.ddl.sqlpp     |  2 +-
 ...s-index-custkey-conjunctive-open.1.ddl.sqlpp |  2 +-
 ...orders-index-custkey-conjunctive.1.ddl.sqlpp |  2 +-
 .../orders-index-custkey-open.1.ddl.sqlpp       |  2 +-
 .../orders-index-custkey.1.ddl.sqlpp            |  2 +-
 .../range-search-open.1.ddl.sqlpp               |  2 +-
 .../range-search/range-search.1.ddl.sqlpp       |  2 +-
 ...e-secondary-index-circular-query.1.ddl.sqlpp |  2 +-
 .../rtree-secondary-index-nullable.1.ddl.sqlpp  |  2 +-
 .../rtree-secondary-index-open.1.ddl.sqlpp      |  2 +-
 .../rtree-secondary-index.1.ddl.sqlpp           |  2 +-
 .../ngram-edit-distance-inline.1.ddl.sqlpp      |  4 +-
 .../ngram-edit-distance.1.ddl.sqlpp             |  4 +-
 .../ngram-jaccard-inline.1.ddl.sqlpp            |  4 +-
 .../ngram-jaccard/ngram-jaccard.1.ddl.sqlpp     |  4 +-
 .../olist-edit-distance-inline.1.ddl.sqlpp      |  4 +-
 .../olist-edit-distance.1.ddl.sqlpp             |  4 +-
 .../olist-jaccard-inline.1.ddl.sqlpp            |  4 +-
 .../olist-jaccard/olist-jaccard.1.ddl.sqlpp     |  4 +-
 .../ulist-jaccard-inline.1.ddl.sqlpp            |  4 +-
 .../ulist-jaccard/ulist-jaccard.1.ddl.sqlpp     |  4 +-
 .../word-jaccard-inline.1.ddl.sqlpp             |  4 +-
 .../word-jaccard/word-jaccard.1.ddl.sqlpp       |  4 +-
 .../ngram-edit-distance-inline.1.ddl.sqlpp      |  4 +-
 .../ngram-edit-distance.1.ddl.sqlpp             |  4 +-
 .../ngram-jaccard-inline.1.ddl.sqlpp            |  4 +-
 .../ngram-jaccard/ngram-jaccard.1.ddl.sqlpp     |  4 +-
 .../olist-edit-distance-inline.1.ddl.sqlpp      |  4 +-
 .../olist-edit-distance.1.ddl.sqlpp             |  4 +-
 .../olist-jaccard-inline.1.ddl.sqlpp            |  4 +-
 .../olist-jaccard/olist-jaccard.1.ddl.sqlpp     |  4 +-
 .../ulist-jaccard-inline.1.ddl.sqlpp            |  4 +-
 .../ulist-jaccard/ulist-jaccard.1.ddl.sqlpp     |  4 +-
 .../word-jaccard-inline.1.ddl.sqlpp             |  4 +-
 .../word-jaccard/word-jaccard.1.ddl.sqlpp       |  4 +-
 .../loj-01-core/loj-01.1.ddl.sqlpp              |  4 +-
 .../loj-01-sugar/loj-01.1.ddl.sqlpp             |  4 +-
 .../query_issue285-2.1.ddl.sqlpp                |  4 +-
 .../query_issue285/query_issue285.1.ddl.sqlpp   |  4 +-
 .../query_issue658/query_issue658.1.ddl.sqlpp   |  4 +-
 .../query_issue849-2.1.ddl.sqlpp                |  2 +-
 .../query_issue849/query_issue849.1.ddl.sqlpp   |  2 +-
 .../query-ASTERIXDB-159-2.1.ddl.sqlpp           |  2 +-
 .../query-ASTERIXDB-159-2.4.ddl.sqlpp           |  2 +-
 .../query-ASTERIXDB-159-3.1.ddl.sqlpp           |  2 +-
 .../query-ASTERIXDB-159-3.4.ddl.sqlpp           |  2 +-
 .../load/adm_binary/adm_bianry.1.ddl.sqlpp      |  2 +-
 .../load/csv_01/csv_01.1.ddl.sqlpp              |  2 +-
 .../load/csv_02/csv_02.1.ddl.sqlpp              |  2 +-
 .../load/csv_03/csv_03.1.ddl.sqlpp              |  2 +-
 .../load/csv_04/csv_04.1.ddl.sqlpp              |  2 +-
 .../load/csv_05/csv_05.1.ddl.sqlpp              |  2 +-
 .../load/csv_06/csv_06.1.ddl.sqlpp              |  2 +-
 .../load/csv_07/csv_07.1.ddl.sqlpp              |  2 +-
 .../load/csv_08_header_cr/csv_08.1.ddl.sqlpp    |  2 +-
 .../load/csv_08_header_crlf/csv_08.1.ddl.sqlpp  |  2 +-
 .../load/csv_08_header_lf/csv_08.1.ddl.sqlpp    |  2 +-
 .../duplicate-key-error.1.ddl.sqlpp             |  2 +-
 .../escapes-err-1/escapes-err-1.1.ddl.sqlpp     |  2 +-
 .../load/escapes01/escapes01.1.ddl.sqlpp        |  2 +-
 .../load/escapes02/escapes02.1.ddl.sqlpp        |  2 +-
 .../issue14_query/issue14_query.1.ddl.sqlpp     |  2 +-
 .../issue289_query/issue289_query.1.ddl.sqlpp   |  4 +-
 .../issue315_query/issue315_query.1.ddl.sqlpp   |  2 +-
 ...ssue610_adm_token_end_collection.1.ddl.sqlpp |  2 +-
 .../issue650_query/issue650_query.1.ddl.sqlpp   |  2 +-
 .../type_promotion_0.1.ddl.sqlpp                |  2 +-
 .../assign-reuse/assign-reuse.1.ddl.sqlpp       |  4 +-
 .../dataset_nodegroup.1.ddl.sqlpp               |  2 +-
 .../misc/flushtest/flushtest.1.ddl.sqlpp        |  4 +-
 .../misc/flushtest/flushtest.5.ddl.sqlpp        |  2 +-
 .../groupby-orderby-count.1.ddl.sqlpp           |  2 +-
 .../nested-loop-join_01.1.ddl.sqlpp             |  4 +-
 .../partition-by-nonexistent-field.1.ddl.sqlpp  |  2 +-
 .../prefix-search/prefix-search.1.ddl.sqlpp     |  2 +-
 .../query-ASTERIXDB-1531.1.ddl.sqlpp            |  2 +-
 .../query-ASTERIXDB-1671-2.1.ddl.sqlpp          |  2 +-
 .../query-ASTERIXDB-1671.1.ddl.sqlpp            |  2 +-
 .../query-ASTERIXDB-971.1.ddl.sqlpp             |  2 +-
 .../query-ASTERIXDB-971.2.update.sqlpp          |  4 +-
 .../query_issue267/query_issue267.1.ddl.sqlpp   |  2 +-
 .../misc/stable_sort/stable_sort.1.ddl.sqlpp    |  2 +-
 .../misc/string_eq_01/string_eq_01.1.ddl.sqlpp  |  4 +-
 .../unsupported_parameter.1.query.sqlpp         |  2 +-
 .../unsupported_parameter_value.1.query.sqlpp   |  2 +-
 .../compact-dataset-and-its-indexes.1.ddl.sqlpp |  4 +-
 ...e-from-loaded-dataset-with-index.1.ddl.sqlpp |  4 +-
 .../drop-index/drop-index.1.ddl.sqlpp           |  4 +-
 ...rt-into-empty-dataset-with-index.1.ddl.sqlpp |  4 +-
 ...nto-loaded-dataset-with-index_01.1.ddl.sqlpp |  4 +-
 ...nto-loaded-dataset-with-index_02.1.ddl.sqlpp |  4 +-
 .../load-with-index/load-with-index.1.ddl.sqlpp |  4 +-
 .../load-with-ngram-index.1.ddl.sqlpp           |  4 +-
 .../load-with-rtree-index.1.ddl.sqlpp           |  4 +-
 .../load-with-word-index.1.ddl.sqlpp            |  4 +-
 .../nested-uuid-insert.1.ddl.sqlpp              |  6 +-
 .../nested-uuid-load.1.ddl.sqlpp                |  4 +-
 ...e-btree-secondary-index-nullable.1.ddl.sqlpp |  6 +-
 ...x-ngram-secondary-index-nullable.1.ddl.sqlpp |  4 +-
 ...rted-index-ngram-secondary-index.1.ddl.sqlpp |  4 +-
 ...ex-word-secondary-index-nullable.1.ddl.sqlpp |  4 +-
 ...erted-index-word-secondary-index.1.ddl.sqlpp |  4 +-
 ...e-rtree-secondary-index-nullable.1.ddl.sqlpp |  4 +-
 ...can-delete-rtree-secondary-index.1.ddl.sqlpp |  4 +-
 ...t-btree-secondary-index-nullable.1.ddl.sqlpp |  6 +-
 ...x-ngram-secondary-index-nullable.1.ddl.sqlpp |  4 +-
 ...rted-index-ngram-secondary-index.1.ddl.sqlpp |  4 +-
 ...ex-word-secondary-index-nullable.1.ddl.sqlpp |  4 +-
 ...erted-index-word-secondary-index.1.ddl.sqlpp |  4 +-
 ...t-rtree-secondary-index-nullable.1.ddl.sqlpp |  6 +-
 ...can-insert-rtree-secondary-index.1.ddl.sqlpp |  8 +--
 .../adm-format/adm-format.1.ddl.sqlpp           |  4 +-
 .../leftouterjoin-rtree.1.ddl.sqlpp             |  6 +-
 .../leftouterjoin/leftouterjoin.1.ddl.sqlpp     |  6 +-
 .../rtree-index/rtree-index.1.ddl.sqlpp         |  4 +-
 .../btree-primary-equi-join.1.ddl.sqlpp         | 10 +--
 .../btree-secondary-equi-join.1.ddl.sqlpp       |  8 +--
 .../ngram-edit-distance-inline.1.ddl.sqlpp      |  6 +-
 .../ngram-edit-distance.1.ddl.sqlpp             |  6 +-
 .../ngram-jaccard-inline.1.ddl.sqlpp            |  8 +--
 .../ngram-jaccard/ngram-jaccard.1.ddl.sqlpp     |  8 +--
 .../rtree-spatial-intersect-point.1.ddl.sqlpp   |  4 +-
 .../word-jaccard-inline.1.ddl.sqlpp             |  8 +--
 .../word-jaccard/word-jaccard.1.ddl.sqlpp       |  8 +--
 ...probe-pidx-with-join-btree-sidx1.1.ddl.sqlpp |  6 +-
 ...probe-pidx-with-join-btree-sidx2.1.ddl.sqlpp |  6 +-
 ...robe-pidx-with-join-invidx-sidx1.1.ddl.sqlpp |  6 +-
 ...robe-pidx-with-join-invidx-sidx2.1.ddl.sqlpp |  6 +-
 ...probe-pidx-with-join-rtree-sidx1.1.ddl.sqlpp |  6 +-
 ...probe-pidx-with-join-rtree-sidx2.1.ddl.sqlpp |  6 +-
 ...ex-composite-key-mixed-intervals.1.ddl.sqlpp |  6 +-
 .../btree-index-composite-key.1.ddl.sqlpp       |  6 +-
 .../btree-index-rewrite-multiple.1.ddl.sqlpp    |  6 +-
 .../cust-index-age-nullable.1.ddl.sqlpp         |  6 +-
 .../inverted-index-ngram-contains.1.ddl.sqlpp   |  4 +-
 ...dex-ngram-edit-distance-contains.1.ddl.sqlpp |  4 +-
 ...-index-ngram-edit-distance-panic.1.ddl.sqlpp |  4 +-
 ...-ngram-edit-distance-word-tokens.1.ddl.sqlpp |  4 +-
 ...verted-index-ngram-edit-distance.1.ddl.sqlpp |  4 +-
 .../inverted-index-ngram-jaccard.1.ddl.sqlpp    |  4 +-
 ...-index-olist-edit-distance-panic.1.ddl.sqlpp |  6 +-
 ...verted-index-olist-edit-distance.1.ddl.sqlpp |  6 +-
 .../inverted-index-olist-jaccard.1.ddl.sqlpp    |  6 +-
 .../inverted-index-ulist-jaccard.1.ddl.sqlpp    |  6 +-
 .../inverted-index-word-contains.1.ddl.sqlpp    |  4 +-
 .../inverted-index-word-jaccard.1.ddl.sqlpp     |  4 +-
 ...s-index-custkey-conjunctive-open.1.ddl.sqlpp |  4 +-
 ...orders-index-custkey-conjunctive.1.ddl.sqlpp |  4 +-
 .../orders-index-custkey-open.1.ddl.sqlpp       |  4 +-
 .../orders-index-custkey.1.ddl.sqlpp            |  4 +-
 .../range-search-open.1.ddl.sqlpp               |  4 +-
 .../range-search/range-search.1.ddl.sqlpp       |  4 +-
 .../rtree-secondary-index-nullable.1.ddl.sqlpp  |  4 +-
 .../rtree-secondary-index-open.1.ddl.sqlpp      |  4 +-
 .../rtree-secondary-index.1.ddl.sqlpp           |  4 +-
 .../adm-format/adm-format.1.ddl.sqlpp           |  4 +-
 .../leftouterjoin-rtree.1.ddl.sqlpp             |  6 +-
 .../leftouterjoin/leftouterjoin.1.ddl.sqlpp     |  6 +-
 .../rtree-index/rtree-index.1.ddl.sqlpp         |  4 +-
 .../bottom-closed-top-closed.1.ddl.sqlpp        | 18 +++---
 .../bottom-closed-top-open.1.ddl.sqlpp          | 18 +++---
 .../bottom-open-top-closed.1.ddl.sqlpp          | 18 +++---
 .../bottom-open-top-open.1.ddl.sqlpp            | 18 +++---
 .../btree-secondary-equi-join.1.ddl.sqlpp       | 10 +--
 .../ngram-edit-distance-inline.1.ddl.sqlpp      | 10 +--
 .../ngram-edit-distance.1.ddl.sqlpp             | 10 +--
 .../ngram-jaccard-inline.1.ddl.sqlpp            | 10 +--
 .../ngram-jaccard/ngram-jaccard.1.ddl.sqlpp     | 10 +--
 .../rtree-spatial-intersect-point.1.ddl.sqlpp   |  6 +-
 .../word-jaccard-inline.1.ddl.sqlpp             | 10 +--
 .../word-jaccard/word-jaccard.1.ddl.sqlpp       | 10 +--
 ...probe-pidx-with-join-btree-sidx1.1.ddl.sqlpp |  6 +-
 ...probe-pidx-with-join-btree-sidx2.1.ddl.sqlpp |  6 +-
 ...robe-pidx-with-join-invidx-sidx2.1.ddl.sqlpp |  6 +-
 ...probe-pidx-with-join-rtree-sidx1.1.ddl.sqlpp |  6 +-
 ...probe-pidx-with-join-rtree-sidx2.1.ddl.sqlpp |  6 +-
 ...ex-composite-key-mixed-intervals.1.ddl.sqlpp |  6 +-
 .../btree-index-composite-key.1.ddl.sqlpp       |  6 +-
 .../btree-index-rewrite-multiple.1.ddl.sqlpp    |  6 +-
 .../inverted-index-ngram-contains.1.ddl.sqlpp   |  6 +-
 ...dex-ngram-edit-distance-contains.1.ddl.sqlpp |  6 +-
 ...-index-ngram-edit-distance-panic.1.ddl.sqlpp |  6 +-
 ...-ngram-edit-distance-word-tokens.1.ddl.sqlpp |  6 +-
 ...verted-index-ngram-edit-distance.1.ddl.sqlpp |  6 +-
 .../inverted-index-ngram-jaccard.1.ddl.sqlpp    |  6 +-
 .../inverted-index-word-contains.1.ddl.sqlpp    |  6 +-
 .../inverted-index-word-jaccard.1.ddl.sqlpp     |  6 +-
 ...orders-index-custkey-conjunctive.1.ddl.sqlpp |  6 +-
 .../orders-index-custkey.1.ddl.sqlpp            |  6 +-
 .../range-search/range-search.1.ddl.sqlpp       |  6 +-
 .../rtree-secondary-index.1.ddl.sqlpp           |  4 +-
 .../nestrecord/nestrecord.1.ddl.sqlpp           |  4 +-
 .../group-by-from-dataset.1.ddl.sqlpp           |  2 +-
 .../order-by-from-dataset.1.ddl.sqlpp           |  2 +-
 .../print-ASTERIXDB-1885.1.ddl.sqlpp            |  2 +-
 .../numeric/infinity/infinity.1.ddl.sqlpp       |  2 +-
 .../access-nested-fields.1.ddl.sqlpp            | 18 +++---
 .../field-access-on-open-field.1.ddl.sqlpp      |  2 +-
 .../highly-nested-open.1.ddl.sqlpp              | 18 +++---
 .../highly-nested-mixed.1.ddl.sqlpp             | 18 +++---
 .../highly-nested-open.1.ddl.sqlpp              | 18 +++---
 .../tiny-social-example.1.ddl.sqlpp             | 10 +--
 ...-social-example-no-complex-types.1.ddl.sqlpp | 20 +++---
 .../tiny-social-example-only-lists.1.ddl.sqlpp  | 20 +++---
 ...tiny-social-example-only-records.1.ddl.sqlpp | 20 +++---
 .../tiny-social-example.1.ddl.sqlpp             | 10 +--
 .../object_pairs-2/object_pairs.1.ddl.sqlpp     |  2 +-
 ...osed-fieldname-conflict_issue173.1.ddl.sqlpp |  2 +-
 ...open-fieldname-conflict_issue173.1.ddl.sqlpp |  2 +-
 .../c2c-w-optional/c2c-w-option.1.ddl.sqlpp     |  2 +-
 .../c2c-wo-optional/c2c-wo-optional.1.ddl.sqlpp |  2 +-
 .../open-closed/c2c/c2c.1.ddl.sqlpp             |  2 +-
 .../heterog-list-ordered01.1.ddl.sqlpp          |  4 +-
 .../heterog-list01/heterog-list01.1.ddl.sqlpp   |  4 +-
 .../heterog-list02/heterog-list02.1.ddl.sqlpp   |  4 +-
 .../heterog-list03/heterog-list03.1.ddl.sqlpp   |  4 +-
 .../open-closed-01/open-closed-01.1.ddl.sqlpp   |  2 +-
 .../open-closed-12/open-closed-12.1.ddl.sqlpp   |  4 +-
 .../open-closed-14/open-closed-14.1.ddl.sqlpp   |  4 +-
 .../open-closed-15/open-closed-15.1.ddl.sqlpp   |  2 +-
 .../open-closed-16/open-closed-16.1.ddl.sqlpp   |  2 +-
 .../open-closed-17/open-closed-17.1.ddl.sqlpp   |  2 +-
 .../open-closed-20/open-closed-20.1.ddl.sqlpp   |  4 +-
 .../open-closed-21/open-closed-21.1.ddl.sqlpp   |  4 +-
 .../open-closed-22/open-closed-22.1.ddl.sqlpp   |  2 +-
 .../open-closed-24/open-closed-24.1.ddl.sqlpp   |  2 +-
 .../open-closed-25/open-closed-25.1.ddl.sqlpp   |  2 +-
 .../open-closed-26/open-closed-26.1.ddl.sqlpp   |  2 +-
 .../open-closed-28/open-closed-28.1.ddl.sqlpp   |  4 +-
 .../open-closed-29/open-closed-29.1.ddl.sqlpp   |  4 +-
 .../open-closed-30/open-closed-30.1.ddl.sqlpp   |  4 +-
 .../open-closed-31/open-closed-31.1.ddl.sqlpp   |  4 +-
 .../open-closed-32/open-closed-32.1.ddl.sqlpp   |  4 +-
 .../open-closed-33/open-closed-33.1.ddl.sqlpp   |  4 +-
 .../query-issue196/query-issue196.1.ddl.sqlpp   |  4 +-
 .../query-issue208/query-issue208.1.ddl.sqlpp   |  4 +-
 .../query-issue236/query-issue236.1.ddl.sqlpp   |  4 +-
 .../query-issue258/query-issue258.1.ddl.sqlpp   |  2 +-
 .../query-issue343-2.1.ddl.sqlpp                |  6 +-
 .../query-issue343/query-issue343.1.ddl.sqlpp   |  4 +-
 .../query-issue350-2.1.ddl.sqlpp                |  2 +-
 .../query-issue350/query-issue350.1.ddl.sqlpp   |  2 +-
 .../query-issue377/query-issue377.1.ddl.sqlpp   |  8 +--
 .../query-issue410/query-issue410.1.ddl.sqlpp   |  2 +-
 .../query-issue423-2.1.ddl.sqlpp                |  2 +-
 .../query-issue423/query-issue423.1.ddl.sqlpp   |  2 +-
 .../query-issue453-2.1.ddl.sqlpp                |  2 +-
 .../query-issue453/query-issue453.1.ddl.sqlpp   |  2 +-
 .../query-issue456/query-issue456.1.ddl.sqlpp   |  2 +-
 .../query-issue487/query-issue487.1.ddl.sqlpp   |  2 +-
 .../query-issue592/query-issue592.1.ddl.sqlpp   |  4 +-
 .../query-issue625/query-issue625.1.ddl.sqlpp   |  2 +-
 .../query-issue656/query-issue656.1.ddl.sqlpp   |  2 +-
 .../query-proposal/query-proposal.1.ddl.sqlpp   |  2 +-
 .../query-proposal02.1.ddl.sqlpp                |  2 +-
 .../enforced-field-name-collision.1.ddl.sqlpp   |  2 +-
 .../enforced-field-name-collision.1.ddl.sqlpp   |  2 +-
 .../index-on-closed-type.1.ddl.sqlpp            |  2 +-
 .../missing-enforce-statement.1.ddl.sqlpp       |  2 +-
 .../missing-optionality.1.ddl.sqlpp             |  2 +-
 .../adm-format/adm-format.1.ddl.sqlpp           |  2 +-
 .../leftouterjoin-rtree.1.ddl.sqlpp             |  4 +-
 .../leftouterjoin/leftouterjoin.1.ddl.sqlpp     |  4 +-
 .../rtree-index/rtree-index.1.ddl.sqlpp         |  2 +-
 .../btree-secondary-equi-join.1.ddl.sqlpp       |  6 +-
 .../ngram-edit-distance-inline.1.ddl.sqlpp      |  6 +-
 .../ngram-edit-distance.1.ddl.sqlpp             |  6 +-
 .../ngram-jaccard-inline.1.ddl.sqlpp            |  6 +-
 .../ngram-jaccard/ngram-jaccard.1.ddl.sqlpp     |  6 +-
 .../rtree-spatial-intersect-point.1.ddl.sqlpp   |  4 +-
 .../word-jaccard-inline.1.ddl.sqlpp             |  6 +-
 .../word-jaccard/word-jaccard.1.ddl.sqlpp       |  6 +-
 ...probe-pidx-with-join-btree-sidx1.1.ddl.sqlpp |  4 +-
 ...probe-pidx-with-join-btree-sidx2.1.ddl.sqlpp |  4 +-
 ...robe-pidx-with-join-invidx-sidx2.1.ddl.sqlpp |  4 +-
 ...probe-pidx-with-join-rtree-sidx1.1.ddl.sqlpp |  4 +-
 ...probe-pidx-with-join-rtree-sidx2.1.ddl.sqlpp |  4 +-
 ...ex-composite-key-mixed-intervals.1.ddl.sqlpp |  4 +-
 .../btree-index-composite-key.1.ddl.sqlpp       |  4 +-
 .../btree-index-rewrite-multiple.1.ddl.sqlpp    |  4 +-
 .../inverted-index-ngram-contains.1.ddl.sqlpp   |  4 +-
 ...dex-ngram-edit-distance-contains.1.ddl.sqlpp |  4 +-
 ...-index-ngram-edit-distance-panic.1.ddl.sqlpp |  4 +-
 ...-ngram-edit-distance-word-tokens.1.ddl.sqlpp |  4 +-
 ...verted-index-ngram-edit-distance.1.ddl.sqlpp |  4 +-
 .../inverted-index-ngram-jaccard.1.ddl.sqlpp    |  4 +-
 .../inverted-index-word-contains.1.ddl.sqlpp    |  4 +-
 .../inverted-index-word-jaccard.1.ddl.sqlpp     |  4 +-
 ...orders-index-custkey-conjunctive.1.ddl.sqlpp |  4 +-
 .../orders-index-custkey.1.ddl.sqlpp            |  4 +-
 .../range-search/range-search.1.ddl.sqlpp       |  4 +-
 .../rtree-secondary-index.1.ddl.sqlpp           |  4 +-
 .../enforced-type-delete.1.ddl.sqlpp            |  4 +-
 .../enforced-type-delete.3.ddl.sqlpp            |  2 +-
 .../enforced-type-upsert.1.ddl.sqlpp            |  4 +-
 .../enforced-type-upsert.3.ddl.sqlpp            |  2 +-
 .../btree-index-01/btree-index-01.1.ddl.sqlpp   |  4 +-
 .../btree-equi-join-01.1.ddl.sqlpp              |  2 +-
 .../btree-index-01/btree-index-01.1.ddl.sqlpp   |  4 +-
 .../btree-index-02/btree-index-02.1.ddl.sqlpp   |  4 +-
 .../query-ASTERIXDB-1005.1.ddl.sqlpp            |  6 +-
 .../query-ASTERIXDB-1674.1.ddl.sqlpp            |  4 +-
 .../somesat_02/somesat_02.1.ddl.sqlpp           |  6 +-
 .../order-by-exception_01.1.ddl.sqlpp           |  2 +-
 .../order-by-exception_02.1.ddl.sqlpp           |  2 +-
 .../range-hints/order-by/order-by.1.ddl.sqlpp   |  2 +-
 .../all_datasets/all_datasets.1.ddl.sqlpp       |  4 +-
 .../duplicate_location.1.ddl.sqlpp              |  2 +-
 .../empty_location/empty_location.1.ddl.sqlpp   |  2 +-
 .../identical_location.1.ddl.sqlpp              |  2 +-
 .../miss_dataverse/miss_dataverse.1.ddl.sqlpp   |  2 +-
 .../single_dataset/single_dataset.1.ddl.sqlpp   |  2 +-
 .../single_dataset_with_index.1.ddl.sqlpp       |  2 +-
 .../single_dataverse.1.ddl.sqlpp                |  4 +-
 .../fullyqualified/fullyqualified.4.ddl.sqlpp   |  2 +-
 .../fullyqualified2/fullyqualified2.4.ddl.sqlpp |  2 +-
 .../queries_sqlpp/scan/10/10.1.ddl.sqlpp        |  2 +-
 .../queries_sqlpp/scan/20/20.1.ddl.sqlpp        |  2 +-
 .../queries_sqlpp/scan/30/30.1.ddl.sqlpp        |  2 +-
 .../scan/alltypes_01/alltypes_01.1.ddl.sqlpp    |  4 +-
 .../scan/alltypes_02/alltypes_02.1.ddl.sqlpp    |  4 +-
 .../invalid-scan-syntax.1.ddl.sqlpp             |  2 +-
 .../issue238_query_1.1.ddl.sqlpp                |  2 +-
 .../issue238_query_2.1.ddl.sqlpp                |  2 +-
 .../numeric_types_01.1.ddl.sqlpp                |  2 +-
 .../spatial_types_01.1.ddl.sqlpp                |  2 +-
 .../spatial_types_02.1.ddl.sqlpp                |  2 +-
 .../temp_types_01/temp_types_01.1.ddl.sqlpp     |  2 +-
 .../temp_types_02/temp_types_02.1.ddl.sqlpp     |  2 +-
 .../select-star/from/from.1.ddl.sqlpp           |  6 +-
 .../select-star/group_by/group_by.1.ddl.sqlpp   |  2 +-
 .../select-star/join/join.1.ddl.sqlpp           |  6 +-
 .../select-star/mixed/mixed.1.ddl.sqlpp         |  6 +-
 .../select-star/no_star/no_star.1.ddl.sqlpp     |  6 +-
 .../count-nullable/count-nullable.1.ddl.sqlpp   |  4 +-
 .../cust-filter/cust-filter.1.ddl.sqlpp         |  4 +-
 .../has-param1/has-param1.1.ddl.sqlpp           |  2 +-
 .../fuzzyeq-edit-distance.1.ddl.sqlpp           |  2 +-
 .../fuzzyeq-similarity-jaccard.1.ddl.sqlpp      |  2 +-
 .../similarity-jaccard-check_query.1.ddl.sqlpp  |  2 +-
 ...arity-jaccard-sorted-check_query.1.ddl.sqlpp |  2 +-
 .../similarity-jaccard-sorted_query.1.ddl.sqlpp |  2 +-
 .../similarity-jaccard_query.1.ddl.sqlpp        |  2 +-
 .../cell-aggregation-with-filtering.1.ddl.sqlpp |  2 +-
 .../cell-aggregation.1.ddl.sqlpp                |  2 +-
 .../circle-intersect-circle.1.ddl.sqlpp         |  2 +-
 .../create-rtree-index.1.ddl.sqlpp              |  2 +-
 .../distance-between-points.1.ddl.sqlpp         |  2 +-
 .../line-intersect-circle.1.ddl.sqlpp           |  2 +-
 .../line-intersect-line.1.ddl.sqlpp             |  2 +-
 .../line-intersect-polygon.1.ddl.sqlpp          |  2 +-
 .../line-intersect-rectangle.1.ddl.sqlpp        |  2 +-
 .../point-equals-point.1.ddl.sqlpp              |  2 +-
 .../point-in-circle/point-in-circle.1.ddl.sqlpp |  2 +-
 .../point-in-polygon.1.ddl.sqlpp                |  2 +-
 .../point-in-rectangle.1.ddl.sqlpp              |  2 +-
 .../point-on-line/point-on-line.1.ddl.sqlpp     |  2 +-
 .../polygon-intersect-circle.1.ddl.sqlpp        |  2 +-
 .../polygon-intersect-polygon.1.ddl.sqlpp       |  2 +-
 .../polygon-intersect-rectangle.1.ddl.sqlpp     |  2 +-
 .../rectangle-intersect-circle.1.ddl.sqlpp      |  2 +-
 .../rectangle-intersect-rectangle.1.ddl.sqlpp   |  2 +-
 .../spatial-area/spatial-area.1.ddl.sqlpp       |  2 +-
 .../string/cpttostr01/cpttostr01.1.ddl.sqlpp    |  2 +-
 .../string/ends-with8/ends-with8.1.ddl.sqlpp    |  2 +-
 .../string/matches05/matches05.1.ddl.sqlpp      |  2 +-
 .../starts-with8/starts-with8.1.ddl.sqlpp       |  2 +-
 .../string/strconcat01/strconcat01.1.ddl.sqlpp  |  2 +-
 .../string/strlen03/strlen03.1.ddl.sqlpp        |  2 +-
 .../string/substr05/substr05.1.ddl.sqlpp        |  2 +-
 .../string/substr06/substr06.1.ddl.sqlpp        |  2 +-
 .../toLowerCase03/toLowerCase03.1.ddl.sqlpp     |  2 +-
 .../varlen-encoding.3.query.sqlpp               |  2 +-
 .../aggregate_join_external.1.ddl.sqlpp         |  4 +-
 .../decorrelate_with_unique_id.1.ddl.sqlpp      |  4 +-
 .../decorrelate_with_unique_id_2.1.ddl.sqlpp    |  4 +-
 .../subquery/exists/exists.1.ddl.sqlpp          |  4 +-
 .../subquery/gby_inline/gby_inline.1.ddl.sqlpp  |  4 +-
 .../queries_sqlpp/subquery/in/in.1.ddl.sqlpp    |  4 +-
 .../in_correlated/in_correlated.1.ddl.sqlpp     |  4 +-
 .../subquery/not_exists/not_exists.1.ddl.sqlpp  |  4 +-
 .../subquery/not_in/not_in.1.ddl.sqlpp          |  4 +-
 .../query-ASTERIXDB-1168.1.ddl.sqlpp            |  2 +-
 .../query-ASTERIXDB-1674.1.ddl.sqlpp            |  4 +-
 .../relational_division.1.ddl.sqlpp             |  4 +-
 .../relational_division2.1.ddl.sqlpp            |  4 +-
 .../relational_division3.1.ddl.sqlpp            |  4 +-
 ...e-from-loaded-dataset-with-index.1.ddl.sqlpp |  2 +-
 .../delete-from-loaded-dataset.1.ddl.sqlpp      |  2 +-
 .../drop-empty-secondary-indexes.1.ddl.sqlpp    |  6 +-
 .../drop-index/drop-index.1.ddl.sqlpp           |  2 +-
 .../empty-load-with-index.1.ddl.sqlpp           |  2 +-
 ...an-dataset-with-correlated-index.1.ddl.sqlpp |  2 +-
 ...sert-and-scan-dataset-with-index.1.ddl.sqlpp |  2 +-
 .../insert-and-scan-dataset.1.ddl.sqlpp         |  2 +-
 .../q01_pricing_summary_report_nt.1.ddl.sqlpp   |  2 +-
 ...can-delete-rtree-secondary-index.1.ddl.sqlpp |  2 +-
 .../scan-insert-persistent-to-temp.1.ddl.sqlpp  |  4 +-
 ...can-insert-rtree-secondary-index.1.ddl.sqlpp |  4 +-
 .../scan-insert-temp-to-persistent.1.ddl.sqlpp  |  4 +-
 .../temporal/agg_max/agg_max.1.ddl.sqlpp        |  2 +-
 .../temporal/agg_min/agg_min.1.ddl.sqlpp        |  2 +-
 .../insert_from_ext_ds.1.ddl.sqlpp              |  2 +-
 .../insert_from_ext_ds_2.1.ddl.sqlpp            |  2 +-
 .../interval_bin_gby_0.1.ddl.sqlpp              |  2 +-
 .../interval_bin_gby_1.1.ddl.sqlpp              |  2 +-
 .../overlap_bins_gby_0.1.ddl.sqlpp              |  2 +-
 .../overlap_bins_gby_1.1.ddl.sqlpp              |  2 +-
 .../overlap_bins_gby_3.1.ddl.sqlpp              |  2 +-
 .../tinysocial-suite.1.ddl.sqlpp                |  8 +--
 .../tinysocial-suite.1.ddl.sqlpp                | 10 +--
 .../queries_sqlpp/tpcds/q01/q01.1.ddl.sqlpp     |  8 +--
 .../queries_sqlpp/tpcds/q03/q03.1.ddl.sqlpp     |  6 +-
 .../queries_sqlpp/tpcds/q07/q07.1.ddl.sqlpp     | 10 +--
 .../queries_sqlpp/tpcds/q09/q09.1.ddl.sqlpp     |  6 +-
 .../queries_sqlpp/tpcds/q09/q09.3.query.sqlpp   |  4 +-
 .../queries_sqlpp/tpcds/q15/q15.1.ddl.sqlpp     |  8 +--
 .../queries_sqlpp/tpcds/q19/q19.1.ddl.sqlpp     | 12 ++--
 .../queries_sqlpp/tpcds/q21/q21.1.ddl.sqlpp     |  8 +--
 .../queries_sqlpp/tpcds/q24a/q24a.1.ddl.sqlpp   | 12 ++--
 .../queries_sqlpp/tpcds/q24b/q24b.1.ddl.sqlpp   | 12 ++--
 .../queries_sqlpp/tpcds/q25/q25.1.ddl.sqlpp     | 12 ++--
 .../queries_sqlpp/tpcds/q26/q26.1.ddl.sqlpp     | 10 +--
 .../queries_sqlpp/tpcds/q29/q29.1.ddl.sqlpp     | 12 ++--
 .../queries_sqlpp/tpcds/q30/q30.1.ddl.sqlpp     |  8 +--
 .../queries_sqlpp/tpcds/q31/q31.1.ddl.sqlpp     |  8 +--
 .../queries_sqlpp/tpcds/q34/q34.1.ddl.sqlpp     | 10 +--
 .../queries_sqlpp/tpcds/q37/q37.1.ddl.sqlpp     |  8 +--
 .../queries_sqlpp/tpcds/q41/q41.1.ddl.sqlpp     |  2 +-
 .../queries_sqlpp/tpcds/q42/q42.1.ddl.sqlpp     |  6 +-
 .../queries_sqlpp/tpcds/q43/q43.1.ddl.sqlpp     |  6 +-
 .../queries_sqlpp/tpcds/q45/q45.1.ddl.sqlpp     | 10 +--
 .../queries_sqlpp/tpcds/q46/q46.1.ddl.sqlpp     | 12 ++--
 .../queries_sqlpp/tpcds/q50/q50.1.ddl.sqlpp     |  8 +--
 .../queries_sqlpp/tpcds/q52/q52.1.ddl.sqlpp     |  6 +-
 .../queries_sqlpp/tpcds/q55/q55.1.ddl.sqlpp     |  6 +-
 .../queries_sqlpp/tpcds/q59/q59.1.ddl.sqlpp     |  6 +-
 .../queries_sqlpp/tpcds/q62/q62.1.ddl.sqlpp     | 10 +--
 .../queries_sqlpp/tpcds/q68/q68.1.ddl.sqlpp     | 12 ++--
 .../queries_sqlpp/tpcds/q73/q73.1.ddl.sqlpp     | 10 +--
 .../queries_sqlpp/tpcds/q79/q79.1.ddl.sqlpp     | 10 +--
 .../queries_sqlpp/tpcds/q81/q81.1.ddl.sqlpp     |  8 +--
 .../queries_sqlpp/tpcds/q82/q82.1.ddl.sqlpp     |  8 +--
 .../queries_sqlpp/tpcds/q85/q85.1.ddl.sqlpp     | 16 ++---
 .../queries_sqlpp/tpcds/q88/q88.1.ddl.sqlpp     | 10 +--
 .../queries_sqlpp/tpcds/q90/q90.1.ddl.sqlpp     | 10 +--
 .../queries_sqlpp/tpcds/q91/q91.1.ddl.sqlpp     | 14 ++---
 .../queries_sqlpp/tpcds/q92/q92.1.ddl.sqlpp     |  6 +-
 .../queries_sqlpp/tpcds/q94/q94.1.ddl.sqlpp     | 10 +--
 .../queries_sqlpp/tpcds/q95/q95.1.ddl.sqlpp     | 10 +--
 .../queries_sqlpp/tpcds/q96/q96.1.ddl.sqlpp     | 10 +--
 .../queries_sqlpp/tpcds/q98/q98.1.ddl.sqlpp     |  6 +-
 .../query-ASTERIXDB-1580.1.ddl.sqlpp            | 10 +--
 .../query-ASTERIXDB-1581-2.1.ddl.sqlpp          |  4 +-
 .../query-ASTERIXDB-1581-3.1.ddl.sqlpp          |  4 +-
 .../query-ASTERIXDB-1581-4.1.ddl.sqlpp          |  4 +-
 .../query-ASTERIXDB-1581-5.1.ddl.sqlpp          |  4 +-
 .../query-ASTERIXDB-1581-6.1.ddl.sqlpp          |  4 +-
 ...uery-ASTERIXDB-1581-correlated-2.1.ddl.sqlpp |  4 +-
 .../query-ASTERIXDB-1581-correlated.1.ddl.sqlpp |  4 +-
 .../query-ASTERIXDB-1581.1.ddl.sqlpp            |  4 +-
 .../query-ASTERIXDB-1591.1.ddl.sqlpp            | 16 ++---
 .../query-ASTERIXDB-1596.1.ddl.sqlpp            |  6 +-
 .../query-ASTERIXDB-1602.1.ddl.sqlpp            |  4 +-
 .../q01_pricing_summary_report_nt.1.ddl.sqlpp   |  2 +-
 .../q01_pricing_summary_report_nt.3.query.sqlpp |  2 +-
 .../q02_minimum_cost_supplier.1.ddl.sqlpp       | 16 ++---
 .../q03_shipping_priority_nt.1.ddl.sqlpp        | 16 ++---
 .../q04_order_priority.1.ddl.sqlpp              | 16 ++---
 .../q05_local_supplier_volume.1.ddl.sqlpp       | 16 ++---
 .../q06_forecast_revenue_change.1.ddl.sqlpp     | 16 ++---
 .../q07_volume_shipping.1.ddl.sqlpp             | 16 ++---
 .../q08_national_market_share.1.ddl.sqlpp       | 16 ++---
 .../q09_product_type_profit_nt.1.ddl.sqlpp      | 16 ++---
 .../q10_returned_item.1.ddl.sqlpp               | 16 ++---
 .../q10_returned_item_int64.1.ddl.sqlpp         | 16 ++---
 .../q11_important_stock.1.ddl.sqlpp             | 16 ++---
 .../q12_shipping/q12_shipping.1.ddl.sqlpp       | 16 ++---
 .../q13_customer_distribution.1.ddl.sqlpp       | 16 ++---
 .../q14_promotion_effect.1.ddl.sqlpp            | 16 ++---
 .../q15_top_supplier.1.ddl.sqlpp                | 16 ++---
 .../q16_parts_supplier_relationship.1.ddl.sqlpp | 16 ++---
 .../q17_large_gby_variant.1.ddl.sqlpp           | 16 ++---
 ...q17_small_quantity_order_revenue.1.ddl.sqlpp | 16 ++---
 .../q18_large_volume_customer.1.ddl.sqlpp       | 16 ++---
 .../q19_discounted_revenue.1.ddl.sqlpp          | 16 ++---
 .../q20_potential_part_promotion.1.ddl.sqlpp    | 16 ++---
 ...uppliers_who_kept_orders_waiting.1.ddl.sqlpp | 16 ++---
 .../q22_global_sales_opportunity.1.ddl.sqlpp    | 16 ++---
 .../query-issue601/query-issue601.1.ddl.sqlpp   |  2 +-
 .../query-issue638/query-issue638.1.ddl.sqlpp   | 16 ++---
 .../query-issue785-2.1.ddl.sqlpp                | 10 +--
 .../query-issue785/query-issue785.1.ddl.sqlpp   | 10 +--
 .../query-issue786/query-issue786.1.ddl.sqlpp   | 10 +--
 .../distinct_by/distinct_by.1.ddl.sqlpp         |  2 +-
 .../group_no_agg/group_no_agg.1.ddl.sqlpp       |  2 +-
 .../nest_aggregate/nest_aggregate.1.ddl.sqlpp   | 10 +--
 .../nest_aggregate2/nest_aggregate2.1.ddl.sqlpp | 10 +--
 .../q01_pricing_summary_report_2.1.ddl.sqlpp    |  2 +-
 .../q01_pricing_summary_report_nt.1.ddl.sqlpp   |  2 +-
 ...icing_summary_report_parallelism.1.ddl.sqlpp |  2 +-
 ...ing_summary_report_parallelism.3.query.sqlpp |  2 +-
 ...pricing_summary_report_parameter.1.ddl.sqlpp |  2 +-
 ...icing_summary_report_parameter.3.query.sqlpp |  4 +-
 .../q02_minimum_cost_supplier.1.ddl.sqlpp       | 16 ++---
 .../q03_shipping_priority_nt.1.ddl.sqlpp        | 16 ++---
 .../q04_order_priority.1.ddl.sqlpp              | 16 ++---
 .../q05_local_supplier_volume.1.ddl.sqlpp       | 16 ++---
 .../q06_forecast_revenue_change.1.ddl.sqlpp     | 16 ++---
 .../q07_volume_shipping.1.ddl.sqlpp             | 16 ++---
 .../q08_national_market_share.1.ddl.sqlpp       | 16 ++---
 .../q09_product_type_profit_nt.1.ddl.sqlpp      | 16 ++---
 ...09_product_type_profit_parameter.1.ddl.sqlpp | 16 ++---
 ..._product_type_profit_parameter.3.query.sqlpp |  2 +-
 .../q10_returned_item.1.ddl.sqlpp               | 16 ++---
 .../q10_returned_item_int64.1.ddl.sqlpp         | 16 ++---
 .../q11_important_stock.1.ddl.sqlpp             | 16 ++---
 .../q12_shipping/q12_shipping.1.ddl.sqlpp       | 16 ++---
 .../q12_shipping_broadcast.1.ddl.sqlpp          | 16 ++---
 .../q13_customer_distribution.1.ddl.sqlpp       | 16 ++---
 .../q14_promotion_effect.1.ddl.sqlpp            | 16 ++---
 .../q15_top_supplier.1.ddl.sqlpp                | 16 ++---
 .../q16_parts_supplier_relationship.1.ddl.sqlpp | 16 ++---
 .../q17_large_gby_variant.1.ddl.sqlpp           | 16 ++---
 .../q17_large_gby_variant_parameter.1.ddl.sqlpp | 16 ++---
 ...17_large_gby_variant_parameter.3.query.sqlpp |  2 +-
 ...q17_small_quantity_order_revenue.1.ddl.sqlpp | 16 ++---
 .../q18_large_volume_customer.1.ddl.sqlpp       | 16 ++---
 .../q19_discounted_revenue.1.ddl.sqlpp          | 16 ++---
 .../q20_potential_part_promotion.1.ddl.sqlpp    | 16 ++---
 ...uppliers_who_kept_orders_waiting.1.ddl.sqlpp | 16 ++---
 .../q22_global_sales_opportunity.1.ddl.sqlpp    | 16 ++---
 .../query-issue562/query-issue562.1.ddl.sqlpp   | 16 ++---
 .../query-issue601/query-issue601.1.ddl.sqlpp   |  2 +-
 .../query-issue638/query-issue638.1.ddl.sqlpp   | 16 ++---
 .../query-issue785-2.1.ddl.sqlpp                | 10 +--
 .../query-issue785/query-issue785.1.ddl.sqlpp   | 10 +--
 .../query-issue786/query-issue786.1.ddl.sqlpp   | 10 +--
 .../query-issue810-2.1.ddl.sqlpp                |  2 +-
 .../query-issue810-3.1.ddl.sqlpp                |  2 +-
 .../query-issue810/query-issue810.1.ddl.sqlpp   |  2 +-
 .../distinct_by/distinct_by.1.ddl.sqlpp         |  2 +-
 .../group_no_agg/group_no_agg.1.ddl.sqlpp       |  2 +-
 .../nest_aggregate/nest_aggregate.1.ddl.sqlpp   | 10 +--
 .../nest_aggregate2/nest_aggregate2.1.ddl.sqlpp | 10 +--
 .../q01_pricing_summary_report_nt.1.ddl.sqlpp   |  2 +-
 .../q02_minimum_cost_supplier.1.ddl.sqlpp       | 16 ++---
 .../q03_shipping_priority_nt.1.ddl.sqlpp        | 16 ++---
 .../q04_order_priority.1.ddl.sqlpp              | 16 ++---
 .../q05_local_supplier_volume.1.ddl.sqlpp       | 16 ++---
 .../q06_forecast_revenue_change.1.ddl.sqlpp     | 16 ++---
 .../q07_volume_shipping.1.ddl.sqlpp             | 16 ++---
 .../q07_volume_shipping.3.query.sqlpp           |  2 +-
 .../q08_national_market_share.1.ddl.sqlpp       | 16 ++---
 .../q09_product_type_profit_nt.1.ddl.sqlpp      | 16 ++---
 .../q10_returned_item.1.ddl.sqlpp               | 16 ++---
 .../q10_returned_item_int64.1.ddl.sqlpp         | 16 ++---
 .../q11_important_stock.1.ddl.sqlpp             | 16 ++---
 .../q12_shipping/q12_shipping.1.ddl.sqlpp       | 16 ++---
 .../q13_customer_distribution.1.ddl.sqlpp       | 16 ++---
 .../q14_promotion_effect.1.ddl.sqlpp            | 16 ++---
 .../q15_top_supplier.1.ddl.sqlpp                | 16 ++---
 .../q16_parts_supplier_relationship.1.ddl.sqlpp | 16 ++---
 .../q17_large_gby_variant.1.ddl.sqlpp           | 16 ++---
 ...q17_small_quantity_order_revenue.1.ddl.sqlpp | 16 ++---
 .../q18_large_volume_customer.1.ddl.sqlpp       | 16 ++---
 .../q19_discounted_revenue.1.ddl.sqlpp          | 16 ++---
 .../q20_potential_part_promotion.1.ddl.sqlpp    | 16 ++---
 ...uppliers_who_kept_orders_waiting.1.ddl.sqlpp | 16 ++---
 .../q22_global_sales_opportunity.1.ddl.sqlpp    | 16 ++---
 .../query-issue562/query-issue562.1.ddl.sqlpp   | 16 ++---
 .../query-issue601/query-issue601.1.ddl.sqlpp   |  2 +-
 .../query-issue638/query-issue638.1.ddl.sqlpp   | 16 ++---
 .../query-issue785-2.1.ddl.sqlpp                | 10 +--
 .../query-issue785/query-issue785.1.ddl.sqlpp   | 10 +--
 .../query-issue786/query-issue786.1.ddl.sqlpp   | 10 +--
 .../query-issue810-2.1.ddl.sqlpp                |  2 +-
 .../query-issue810-3.1.ddl.sqlpp                |  2 +-
 .../query-issue810/query-issue810.1.ddl.sqlpp   |  2 +-
 .../distinct_by/distinct_by.1.ddl.sqlpp         |  2 +-
 .../nest_aggregate/nest_aggregate.1.ddl.sqlpp   | 10 +--
 .../nest_aggregate2/nest_aggregate2.1.ddl.sqlpp | 10 +--
 .../q01_pricing_summary_report_nt.1.ddl.sqlpp   |  2 +-
 .../q01_pricing_summary_report_nt.3.query.sqlpp |  2 +-
 .../q02_minimum_cost_supplier.1.ddl.sqlpp       | 16 ++---
 .../q03_shipping_priority_nt.1.ddl.sqlpp        | 16 ++---
 .../q04_order_priority.1.ddl.sqlpp              | 16 ++---
 ...04_order_priority_with_nodegroup.1.ddl.sqlpp | 16 ++---
 ...04_order_priority_with_nodegroup.4.ddl.sqlpp |  2 +-
 .../q05_local_supplier_volume.1.ddl.sqlpp       | 16 ++---
 .../q06_forecast_revenue_change.1.ddl.sqlpp     | 16 ++---
 .../q07_volume_shipping.1.ddl.sqlpp             | 16 ++---
 .../q08_national_market_share.1.ddl.sqlpp       | 16 ++---
 .../q09_product_type_profit_nt.1.ddl.sqlpp      | 16 ++---
 .../q10_returned_item.1.ddl.sqlpp               | 16 ++---
 .../q10_returned_item_int64.1.ddl.sqlpp         | 16 ++---
 .../q11_important_stock.1.ddl.sqlpp             | 16 ++---
 .../q12_shipping/q12_shipping.1.ddl.sqlpp       | 16 ++---
 .../q12_shipping/q12_shipping.3.query.sqlpp     |  2 +-
 .../q13_customer_distribution.1.ddl.sqlpp       | 16 ++---
 .../q14_promotion_effect.1.ddl.sqlpp            | 16 ++---
 .../q15_top_supplier.1.ddl.sqlpp                | 16 ++---
 .../q16_parts_supplier_relationship.1.ddl.sqlpp | 16 ++---
 .../q17_large_gby_variant.1.ddl.sqlpp           | 16 ++---
 ...q17_small_quantity_order_revenue.1.ddl.sqlpp | 16 ++---
 .../q18_large_volume_customer.1.ddl.sqlpp       | 16 ++---
 .../q19_discounted_revenue.1.ddl.sqlpp          | 16 ++---
 .../q20_potential_part_promotion.1.ddl.sqlpp    | 16 ++---
 ...uppliers_who_kept_orders_waiting.1.ddl.sqlpp | 16 ++---
 .../q22_global_sales_opportunity.1.ddl.sqlpp    | 16 ++---
 .../query-issue562/query-issue562.1.ddl.sqlpp   | 16 ++---
 .../query-issue601/query-issue601.1.ddl.sqlpp   |  2 +-
 .../query-issue785-2.1.ddl.sqlpp                | 10 +--
 .../query-issue785/query-issue785.1.ddl.sqlpp   | 10 +--
 .../query-issue786/query-issue786.1.ddl.sqlpp   | 10 +--
 .../query-issue810-2.1.ddl.sqlpp                |  2 +-
 .../query-issue810-3.1.ddl.sqlpp                |  2 +-
 .../query-issue810/query-issue810.1.ddl.sqlpp   |  2 +-
 .../query-issue827-2.1.ddl.sqlpp                |  2 +-
 .../query-issue827/query-issue827.1.ddl.sqlpp   |  2 +-
 .../tpch/distinct_by/distinct_by.1.ddl.sqlpp    |  2 +-
 .../tpch/group_no_agg/group_no_agg.1.ddl.sqlpp  |  2 +-
 .../nest_aggregate/nest_aggregate.1.ddl.sqlpp   | 10 +--
 .../nest_aggregate2/nest_aggregate2.1.ddl.sqlpp | 10 +--
 .../q01_pricing_summary_report_nt.1.ddl.sqlpp   |  2 +-
 .../q01_pricing_summary_report_nt.3.query.sqlpp |  2 +-
 .../q02_minimum_cost_supplier.1.ddl.sqlpp       | 16 ++---
 .../q03_shipping_priority_nt.1.ddl.sqlpp        | 16 ++---
 .../q04_order_priority.1.ddl.sqlpp              | 16 ++---
 .../q05_local_supplier_volume.1.ddl.sqlpp       | 16 ++---
 .../q06_forecast_revenue_change.1.ddl.sqlpp     | 16 ++---
 .../q07_volume_shipping.1.ddl.sqlpp             | 16 ++---
 .../q08_national_market_share.1.ddl.sqlpp       | 16 ++---
 .../q09_product_type_profit_nt.1.ddl.sqlpp      | 16 ++---
 .../q10_returned_item.1.ddl.sqlpp               | 16 ++---
 .../q10_returned_item_int64.1.ddl.sqlpp         | 16 ++---
 .../q11_important_stock.1.ddl.sqlpp             | 16 ++---
 .../tpch/q12_shipping/q12_shipping.1.ddl.sqlpp  | 16 ++---
 .../q13_customer_distribution.1.ddl.sqlpp       | 16 ++---
 .../q14_promotion_effect.1.ddl.sqlpp            | 16 ++---
 .../q15_top_supplier.1.ddl.sqlpp                | 16 ++---
 .../q16_parts_supplier_relationship.1.ddl.sqlpp | 16 ++---
 .../q17_large_gby_variant.1.ddl.sqlpp           | 16 ++---
 ...q17_small_quantity_order_revenue.1.ddl.sqlpp | 16 ++---
 .../q18_large_volume_customer.1.ddl.sqlpp       | 16 ++---
 .../q19_discounted_revenue.1.ddl.sqlpp          | 16 ++---
 .../q20_potential_part_promotion.1.ddl.sqlpp    | 16 ++---
 ...uppliers_who_kept_orders_waiting.1.ddl.sqlpp | 16 ++---
 .../q22_global_sales_opportunity.1.ddl.sqlpp    | 16 ++---
 .../query-issue562/query-issue562.1.ddl.sqlpp   | 16 ++---
 .../query-issue601/query-issue601.1.ddl.sqlpp   |  2 +-
 .../query-issue638/query-issue638.1.ddl.sqlpp   | 16 ++---
 .../query-issue785-2.1.ddl.sqlpp                | 10 +--
 .../query-issue785/query-issue785.1.ddl.sqlpp   | 10 +--
 .../query-issue786/query-issue786.1.ddl.sqlpp   | 10 +--
 .../query-issue810-2.1.ddl.sqlpp                |  2 +-
 .../query-issue810-3.1.ddl.sqlpp                |  2 +-
 .../query-issue810/query-issue810.1.ddl.sqlpp   |  2 +-
 .../query-issue827-2.1.ddl.sqlpp                |  2 +-
 .../query-issue827/query-issue827.1.ddl.sqlpp   |  2 +-
 .../types/any-object/any-object.1.ddl.sqlpp     |  2 +-
 .../types/default/default.1.ddl.sqlpp           |  2 +-
 .../types/default/default.3.ddl.sqlpp           |  2 +-
 .../opentype_orderby_01.1.ddl.sqlpp             |  4 +-
 ...ype_field_vs_closedtype_field_01.1.ddl.sqlpp |  4 +-
 ...ype_field_vs_closedtype_field_02.1.ddl.sqlpp |  4 +-
 ...ype_field_vs_closedtype_field_03.1.ddl.sqlpp |  4 +-
 ...ype_field_vs_closedtype_field_04.1.ddl.sqlpp |  4 +-
 ...ype_field_vs_closedtype_field_05.1.ddl.sqlpp |  4 +-
 ..._closedtype_field_vs_constant_01.1.ddl.sqlpp |  4 +-
 ..._closedtype_field_vs_constant_02.1.ddl.sqlpp |  4 +-
 ..._closedtype_field_vs_constant_03.1.ddl.sqlpp |  4 +-
 ..._closedtype_field_vs_constant_04.1.ddl.sqlpp |  4 +-
 ..._closedtype_field_vs_constant_05.1.ddl.sqlpp |  4 +-
 ..._closedtype_field_vs_constant_06.1.ddl.sqlpp |  4 +-
 ..._closedtype_field_vs_constant_07.1.ddl.sqlpp |  4 +-
 ..._closedtype_field_vs_constant_08.1.ddl.sqlpp |  4 +-
 ..._closedtype_field_vs_constant_09.1.ddl.sqlpp |  4 +-
 ..._closedtype_field_vs_constant_10.1.ddl.sqlpp |  4 +-
 ..._closedtype_field_vs_constant_11.1.ddl.sqlpp |  4 +-
 ...dtype_field_vs_opentype_field_01.1.ddl.sqlpp |  4 +-
 ...dtype_field_vs_opentype_field_02.1.ddl.sqlpp |  4 +-
 ...dtype_field_vs_opentype_field_03.1.ddl.sqlpp |  4 +-
 ...dtype_field_vs_opentype_field_04.1.ddl.sqlpp |  4 +-
 ...on_opentype_field_vs_constant_01.1.ddl.sqlpp |  4 +-
 ...on_opentype_field_vs_constant_02.1.ddl.sqlpp |  4 +-
 ...on_opentype_field_vs_constant_03.1.ddl.sqlpp |  4 +-
 ...on_opentype_field_vs_constant_04.1.ddl.sqlpp |  4 +-
 ...on_opentype_field_vs_constant_05.1.ddl.sqlpp |  4 +-
 ...on_opentype_field_vs_constant_06.1.ddl.sqlpp |  4 +-
 ...on_opentype_field_vs_constant_07.1.ddl.sqlpp |  4 +-
 ...on_opentype_field_vs_constant_08.1.ddl.sqlpp |  4 +-
 ...ntype_field_vs_opentype_field_01.1.ddl.sqlpp |  4 +-
 ...ntype_field_vs_opentype_field_02.1.ddl.sqlpp |  4 +-
 .../types/record01/record01.1.ddl.sqlpp         |  2 +-
 .../type_promotion_0.1.ddl.sqlpp                |  2 +-
 .../type_promotion_1.1.ddl.sqlpp                |  2 +-
 ...pe_promotion_open_index_enforced.1.ddl.sqlpp |  2 +-
 .../query-ASTERIXDB-1354-2.1.ddl.sqlpp          |  4 +-
 .../query-ASTERIXDB-1629.1.ddl.sqlpp            |  2 +-
 .../queries_sqlpp/union/union/union.1.ddl.sqlpp |  4 +-
 .../union_heterogeneous_scalar.1.ddl.sqlpp      |  4 +-
 .../union_negative/union_negative.1.ddl.sqlpp   |  2 +-
 .../union_negative_2.1.ddl.sqlpp                |  4 +-
 .../union_orderby/union_orderby.1.ddl.sqlpp     |  4 +-
 .../union_orderby_2/union_orderby_2.1.ddl.sqlpp |  4 +-
 .../union_orderby_3/union_orderby_3.1.ddl.sqlpp |  4 +-
 .../union_orderby_4/union_orderby_4.1.ddl.sqlpp |  4 +-
 .../filtered-dataset.1.ddl.sqlpp                |  4 +-
 .../issue1587-foreignDataType.1.ddl.sqlpp       |  2 +-
 .../issue1587-foreignDataType.4.ddl.sqlpp       |  2 +-
 .../multiple-correlated-secondaries.1.ddl.sqlpp |  2 +-
 .../multiple-secondaries.1.ddl.sqlpp            |  2 +-
 .../nested-index/nested-index.1.ddl.sqlpp       |  4 +-
 .../nullable-index/nullable-index.1.ddl.sqlpp   |  4 +-
 .../upsert/open-index/open-index.1.ddl.sqlpp    |  4 +-
 .../primary-secondary-btree.1.ddl.sqlpp         |  2 +-
 .../primary-secondary-btree.3.ddl.sqlpp         |  2 +-
 ...ry-correlated-secondary-inverted.1.ddl.sqlpp |  2 +-
 ...ry-correlated-secondary-inverted.3.ddl.sqlpp |  2 +-
 ...imary-correlated-secondary-rtree.1.ddl.sqlpp |  2 +-
 .../primary-index/primary-index.1.ddl.sqlpp     |  2 +-
 .../primary-secondary-btree.1.ddl.sqlpp         |  2 +-
 .../primary-secondary-inverted.1.ddl.sqlpp      |  4 +-
 .../primary-secondary-rtree.1.ddl.sqlpp         |  2 +-
 .../upsert-with-self-read.1.ddl.sqlpp           |  2 +-
 .../query-ASTERIXDB-1298.1.ddl.sqlpp            |  4 +-
 .../query-ASTERIXDB-1652-2.1.ddl.sqlpp          |  2 +-
 .../query-ASTERIXDB-1298.1.ddl.sqlpp            |  2 +-
 .../query-ASTERIXDB-1876.1.ddl.sqlpp            |  4 +-
 .../query-issue218-2.1.ddl.sqlpp                |  2 +-
 .../query-issue218/query-issue218.1.ddl.sqlpp   |  2 +-
 .../query-issue244/query-issue244.1.ddl.sqlpp   |  4 +-
 .../query-issue455/query-issue455.1.ddl.sqlpp   |  2 +-
 .../query-issue489/query-issue489.1.ddl.sqlpp   |  4 +-
 .../single-line-definition.1.ddl.sqlpp          |  2 +-
 .../single-line-definition.3.ddl.sqlpp          |  2 +-
 .../udf01/udf01.1.ddl.sqlpp                     |  2 +-
 .../udf02/udf02.1.ddl.sqlpp                     |  2 +-
 .../udf03/udf03.1.ddl.sqlpp                     |  2 +-
 .../udf04/udf04.1.ddl.sqlpp                     |  2 +-
 .../udf05/udf05.1.ddl.sqlpp                     |  2 +-
 .../udf06/udf06.1.ddl.sqlpp                     |  2 +-
 .../udf07/udf07.1.ddl.sqlpp                     |  2 +-
 .../udf08/udf08.1.ddl.sqlpp                     |  2 +-
 .../udf09/udf09.1.ddl.sqlpp                     |  4 +-
 .../udf10/udf10.1.ddl.sqlpp                     |  2 +-
 .../udf11/udf11.1.ddl.sqlpp                     |  2 +-
 .../udf12/udf12.1.ddl.sqlpp                     |  2 +-
 .../udf13/udf13.1.ddl.sqlpp                     |  2 +-
 .../udf14/udf14.1.ddl.sqlpp                     |  2 +-
 .../udf15/udf15.1.ddl.sqlpp                     |  2 +-
 .../udf16/udf16.1.ddl.sqlpp                     |  2 +-
 .../udf17/udf17.1.ddl.sqlpp                     |  4 +-
 .../udf18/udf18.1.ddl.sqlpp                     |  2 +-
 .../udf19/udf19.1.ddl.sqlpp                     |  4 +-
 .../udf20/udf20.1.ddl.sqlpp                     |  4 +-
 .../udf21/udf21.1.ddl.sqlpp                     |  2 +-
 .../udf22/udf22.1.ddl.sqlpp                     |  2 +-
 .../udf23/udf23.1.ddl.sqlpp                     |  2 +-
 .../udf24/udf24.1.ddl.sqlpp                     |  2 +-
 .../udf25/udf25.1.ddl.sqlpp                     |  2 +-
 .../udf26/udf26.1.ddl.sqlpp                     |  2 +-
 .../udf27/udf27.1.ddl.sqlpp                     |  2 +-
 .../udf31/udf31.1.ddl.sqlpp                     |  4 +-
 .../lang/sqlpp/parser/FunctionParser.java       |  2 +-
 .../asterix-lang-sqlpp/src/main/javacc/SQLPP.jj | 14 +++--
 .../asterix/lang/sqlpp/parser/ParserTest.java   | 64 ++++++++++++++++++--
 2078 files changed, 5592 insertions(+), 5536 deletions(-)
----------------------------------------------------------------------