diff options
| author | Peter Eisentraut | 2011-06-29 06:26:14 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2011-06-29 06:28:46 +0000 |
| commit | 21f1e15aafb13ab2430e831a3da7d4d4f525d1ce (patch) | |
| tree | 5afdaf08c48c5e29d17590c9db4213d79174f111 /src/test | |
| parent | 465883b0a2b4236ba6b31b648a9eabef3b7cdddb (diff) | |
Unify spelling of "canceled", "canceling", "cancellation"
We had previously (af26857a2775e7ceb0916155e931008c2116632f)
established the U.S. spellings as standard.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/regress/expected/prepared_xacts.out | 2 | ||||
| -rw-r--r-- | src/test/regress/expected/subselect.out | 36 | ||||
| -rw-r--r-- | src/test/regress/sql/subselect.sql | 10 |
3 files changed, 24 insertions, 24 deletions
diff --git a/src/test/regress/expected/prepared_xacts.out b/src/test/regress/expected/prepared_xacts.out index 328cd7426ec..e094476cb4a 100644 --- a/src/test/regress/expected/prepared_xacts.out +++ b/src/test/regress/expected/prepared_xacts.out @@ -135,7 +135,7 @@ INSERT INTO pxtest1 VALUES ('fff'); -- This should fail, because the two transactions have a write-skew anomaly PREPARE TRANSACTION 'foo5'; ERROR: could not serialize access due to read/write dependencies among transactions -DETAIL: Cancelled on commit attempt with conflict in from prepared pivot. +DETAIL: Canceled on commit attempt with conflict in from prepared pivot. HINT: The transaction might succeed if retried. SELECT gid FROM pg_prepared_xacts; gid diff --git a/src/test/regress/expected/subselect.out b/src/test/regress/expected/subselect.out index 8f180b9b19c..e638f0a60c3 100644 --- a/src/test/regress/expected/subselect.out +++ b/src/test/regress/expected/subselect.out @@ -266,7 +266,7 @@ SELECT * FROM foo WHERE id IN CREATE TABLE orderstest ( approver_ref integer, po_ref integer, - ordercancelled boolean + ordercanceled boolean ); INSERT INTO orderstest VALUES (1, 1, false); INSERT INTO orderstest VALUES (66, 5, false); @@ -285,8 +285,8 @@ SELECT *, WHEN ord.approver_ref=1 THEN '---' ELSE 'Approved' END) AS "Approved", (SELECT CASE - WHEN ord.ordercancelled - THEN 'Cancelled' + WHEN ord.ordercanceled + THEN 'Canceled' ELSE (SELECT CASE WHEN ord.po_ref=1 @@ -300,8 +300,8 @@ SELECT *, END) END) AS "Status", (CASE - WHEN ord.ordercancelled - THEN 'Cancelled' + WHEN ord.ordercanceled + THEN 'Canceled' ELSE (CASE WHEN ord.po_ref=1 @@ -316,19 +316,19 @@ END) AS "Status", END) AS "Status_OK" FROM orderstest ord; SELECT * FROM orders_view; - approver_ref | po_ref | ordercancelled | Approved | Status | Status_OK ---------------+--------+----------------+----------+-----------+----------- - 1 | 1 | f | --- | --- | --- - 66 | 5 | f | Approved | PO | PO - 66 | 6 | f | Approved | PO | PO - 66 | 7 | f | Approved | PO | PO - 66 | 1 | t | Approved | Cancelled | Cancelled - 66 | 8 | f | Approved | PO | PO - 66 | 1 | f | Approved | Approved | Approved - 77 | 1 | f | Approved | Approved | Approved - 1 | 1 | f | --- | --- | --- - 66 | 1 | f | Approved | Approved | Approved - 1 | 1 | f | --- | --- | --- + approver_ref | po_ref | ordercanceled | Approved | Status | Status_OK +--------------+--------+---------------+----------+----------+----------- + 1 | 1 | f | --- | --- | --- + 66 | 5 | f | Approved | PO | PO + 66 | 6 | f | Approved | PO | PO + 66 | 7 | f | Approved | PO | PO + 66 | 1 | t | Approved | Canceled | Canceled + 66 | 8 | f | Approved | PO | PO + 66 | 1 | f | Approved | Approved | Approved + 77 | 1 | f | Approved | Approved | Approved + 1 | 1 | f | --- | --- | --- + 66 | 1 | f | Approved | Approved | Approved + 1 | 1 | f | --- | --- | --- (11 rows) DROP TABLE orderstest cascade; diff --git a/src/test/regress/sql/subselect.sql b/src/test/regress/sql/subselect.sql index 0d117c878fa..3cecbc1d41b 100644 --- a/src/test/regress/sql/subselect.sql +++ b/src/test/regress/sql/subselect.sql @@ -136,7 +136,7 @@ SELECT * FROM foo WHERE id IN CREATE TABLE orderstest ( approver_ref integer, po_ref integer, - ordercancelled boolean + ordercanceled boolean ); INSERT INTO orderstest VALUES (1, 1, false); @@ -157,8 +157,8 @@ SELECT *, WHEN ord.approver_ref=1 THEN '---' ELSE 'Approved' END) AS "Approved", (SELECT CASE - WHEN ord.ordercancelled - THEN 'Cancelled' + WHEN ord.ordercanceled + THEN 'Canceled' ELSE (SELECT CASE WHEN ord.po_ref=1 @@ -172,8 +172,8 @@ SELECT *, END) END) AS "Status", (CASE - WHEN ord.ordercancelled - THEN 'Cancelled' + WHEN ord.ordercanceled + THEN 'Canceled' ELSE (CASE WHEN ord.po_ref=1 |