open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reduce dependency to money data type in main regression test suite

Browse Source 
Most of these tests have been introduced in 6dd8b00807, to check for
behaviors related to hashing and hash plans, and money is a data type
with btree support but no hash functions.  These tests are switched to
use varbit instead, to provide the same coverage.

Some other tests historically used money but don't really need it for
what they wanted to test (see rules.sql).  Plans and coverage are
unchanged after the modifications done here.

Support for money may be removed a a later point, but this needs more
discussion.

Discussion: https://postgr.es/m/18240-c5da758d7dc1ecf0@postgresql.org
pull/152/head
Michael Paquier 2 years ago
parent 6545ba96cb
commit 31acee4b66
14 changed files with 121 additions and 121 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 18
      src/test/regress/expected/hash_func.out
  2. 8
      src/test/regress/expected/multirangetypes.out
  3. 10
      src/test/regress/expected/rangetypes.out
  4. 98
      src/test/regress/expected/rules.out
  5. 4
      src/test/regress/expected/stats_ext.out
  6. 48
      src/test/regress/expected/union.out
  7. 6
      src/test/regress/expected/with.out
  8. 10
      src/test/regress/sql/hash_func.sql
  9. 2
      src/test/regress/sql/multirangetypes.sql
  10. 4
      src/test/regress/sql/rangetypes.sql
  11. 6
      src/test/regress/sql/rules.sql
  12. 4
      src/test/regress/sql/stats_ext.sql
  13. 18
      src/test/regress/sql/union.sql
  14. 6
      src/test/regress/sql/with.sql

18
src/test/regress/expected/hash_func.out
Unescape View File

@ -179,11 +179,11 @@ WHERE hash_array(v)::bit(32) != hash_array_extended(v, 0)::bit(32)
-- array hashing with non-hashable element type -- array hashing with non-hashable element type
SELECT v as value, hash_array(v)::bit(32) as standard SELECT v as value, hash_array(v)::bit(32) as standard
FROM (VALUES ('{0}'::money[])) x(v); FROM (VALUES ('{101}'::varbit[])) x(v);
ERROR: could not identify a hash function for type money ERROR: could not identify a hash function for type bit varying
SELECT v as value, hash_array_extended(v, 0)::bit(32) as extended0 SELECT v as value, hash_array_extended(v, 0)::bit(32) as extended0
FROM (VALUES ('{0}'::money[])) x(v); FROM (VALUES ('{101}'::varbit[])) x(v);
ERROR: could not identify an extended hash function for type money ERROR: could not identify an extended hash function for type bit varying
SELECT v as value, hashbpchar(v)::bit(32) as standard, SELECT v as value, hashbpchar(v)::bit(32) as standard,
hashbpcharextended(v, 0)::bit(32) as extended0, hashbpcharextended(v, 0)::bit(32) as extended0,
hashbpcharextended(v, 1)::bit(32) as extended1 hashbpcharextended(v, 1)::bit(32) as extended1
@ -331,13 +331,13 @@ WHERE hash_record(v)::bit(32) != hash_record_extended(v, 0)::bit(32)
DROP TYPE hash_test_t1; DROP TYPE hash_test_t1;
-- record hashing with non-hashable field type -- record hashing with non-hashable field type
CREATE TYPE hash_test_t2 AS (a money, b text); CREATE TYPE hash_test_t2 AS (a varbit, b text);
SELECT v as value, hash_record(v)::bit(32) as standard SELECT v as value, hash_record(v)::bit(32) as standard
FROM (VALUES (row(1, 'aaa')::hash_test_t2)) x(v); FROM (VALUES (row('10'::varbit, 'aaa')::hash_test_t2)) x(v);
ERROR: could not identify a hash function for type money ERROR: could not identify a hash function for type bit varying
SELECT v as value, hash_record_extended(v, 0)::bit(32) as extended0 SELECT v as value, hash_record_extended(v, 0)::bit(32) as extended0
FROM (VALUES (row(1, 'aaa')::hash_test_t2)) x(v); FROM (VALUES (row('11'::varbit, 'aaa')::hash_test_t2)) x(v);
ERROR: could not identify an extended hash function for type money ERROR: could not identify an extended hash function for type bit varying
DROP TYPE hash_test_t2; DROP TYPE hash_test_t2;
-- --
-- Check special cases for specific data types -- Check special cases for specific data types

8
src/test/regress/expected/multirangetypes.out
Unescape View File

@ -3273,10 +3273,10 @@ NOTICE: drop cascades to type two_ints_range
-- Check behavior when subtype lacks a hash function -- Check behavior when subtype lacks a hash function
-- --
set enable_sort = off; -- try to make it pick a hash setop implementation set enable_sort = off; -- try to make it pick a hash setop implementation
select '{(2,5)}'::cashmultirange except select '{(5,6)}'::cashmultirange; select '{(01,10)}'::varbitmultirange except select '{(10,11)}'::varbitmultirange;
cashmultirange varbitmultirange
----------------- ------------------
{($2.00,$5.00)} {(01,10)}
(1 row) (1 row)
reset enable_sort; reset enable_sort;

10
src/test/regress/expected/rangetypes.out
Unescape View File

@ -1761,12 +1761,12 @@ NOTICE: drop cascades to type two_ints_range
-- --
-- Check behavior when subtype lacks a hash function -- Check behavior when subtype lacks a hash function
-- --
create type cashrange as range (subtype = money); create type varbitrange as range (subtype = varbit);
set enable_sort = off; -- try to make it pick a hash setop implementation set enable_sort = off; -- try to make it pick a hash setop implementation
select '(2,5)'::cashrange except select '(5,6)'::cashrange; select '(01,10)'::varbitrange except select '(10,11)'::varbitrange;
cashrange varbitrange
--------------- -------------
($2.00,$5.00) (01,10)
(1 row) (1 row)
reset enable_sort; reset enable_sort;

98
src/test/regress/expected/rules.out
Unescape View File

@ -51,9 +51,9 @@ create rule rtest_pers_del as on delete to rtest_person do also
-- --
-- Tables and rules for the logging test -- Tables and rules for the logging test
-- --
create table rtest_emp (ename char(20), salary money); create table rtest_emp (ename char(20), salary numeric);
create table rtest_emplog (ename char(20), who name, action char(10), newsal money, oldsal money); create table rtest_emplog (ename char(20), who name, action char(10), newsal numeric, oldsal numeric);
create table rtest_empmass (ename char(20), salary money); create table rtest_empmass (ename char(20), salary numeric);
create rule rtest_emp_ins as on insert to rtest_emp do create rule rtest_emp_ins as on insert to rtest_emp do
insert into rtest_emplog values (new.ename, current_user, insert into rtest_emplog values (new.ename, current_user,
'hired', new.salary, '0.00'); 'hired', new.salary, '0.00');
@ -410,13 +410,13 @@ update rtest_emp set ename = 'wieck', salary = '6000.00' where ename = 'wiecx';
update rtest_emp set salary = '7000.00' where ename = 'wieck'; update rtest_emp set salary = '7000.00' where ename = 'wieck';
delete from rtest_emp where ename = 'gates'; delete from rtest_emp where ename = 'gates';
select ename, who = current_user as "matches user", action, newsal, oldsal from rtest_emplog order by ename, action, newsal; select ename, who = current_user as "matches user", action, newsal, oldsal from rtest_emplog order by ename, action, newsal;
ename | matches user | action | newsal | oldsal ename | matches user | action | newsal | oldsal
----------------------+--------------+------------+------------+------------ ----------------------+--------------+------------+----------+----------
gates | t | fired | $0.00 | $80,000.00 gates | t | fired | 0.00 | 80000.00
gates | t | hired | $80,000.00 | $0.00 gates | t | hired | 80000.00 | 0.00
wiecc | t | hired | $5,000.00 | $0.00 wiecc | t | hired | 5000.00 | 0.00
wieck | t | honored | $6,000.00 | $5,000.00 wieck | t | honored | 6000.00 | 5000.00
wieck | t | honored | $7,000.00 | $6,000.00 wieck | t | honored | 7000.00 | 6000.00
(5 rows) (5 rows)
insert into rtest_empmass values ('meyer', '4000.00'); insert into rtest_empmass values ('meyer', '4000.00');
@ -424,54 +424,54 @@ insert into rtest_empmass values ('maier', '5000.00');
insert into rtest_empmass values ('mayr', '6000.00'); insert into rtest_empmass values ('mayr', '6000.00');
insert into rtest_emp select * from rtest_empmass; insert into rtest_emp select * from rtest_empmass;
select ename, who = current_user as "matches user", action, newsal, oldsal from rtest_emplog order by ename, action, newsal; select ename, who = current_user as "matches user", action, newsal, oldsal from rtest_emplog order by ename, action, newsal;
ename | matches user | action | newsal | oldsal ename | matches user | action | newsal | oldsal
----------------------+--------------+------------+------------+------------ ----------------------+--------------+------------+----------+----------
gates | t | fired | $0.00 | $80,000.00 gates | t | fired | 0.00 | 80000.00
gates | t | hired | $80,000.00 | $0.00 gates | t | hired | 80000.00 | 0.00
maier | t | hired | $5,000.00 | $0.00 maier | t | hired | 5000.00 | 0.00
mayr | t | hired | $6,000.00 | $0.00 mayr | t | hired | 6000.00 | 0.00
meyer | t | hired | $4,000.00 | $0.00 meyer | t | hired | 4000.00 | 0.00
wiecc | t | hired | $5,000.00 | $0.00 wiecc | t | hired | 5000.00 | 0.00
wieck | t | honored | $6,000.00 | $5,000.00 wieck | t | honored | 6000.00 | 5000.00
wieck | t | honored | $7,000.00 | $6,000.00 wieck | t | honored | 7000.00 | 6000.00
(8 rows) (8 rows)
update rtest_empmass set salary = salary + '1000.00'; update rtest_empmass set salary = salary + '1000.00';
update rtest_emp set salary = rtest_empmass.salary from rtest_empmass where rtest_emp.ename = rtest_empmass.ename; update rtest_emp set salary = rtest_empmass.salary from rtest_empmass where rtest_emp.ename = rtest_empmass.ename;
select ename, who = current_user as "matches user", action, newsal, oldsal from rtest_emplog order by ename, action, newsal; select ename, who = current_user as "matches user", action, newsal, oldsal from rtest_emplog order by ename, action, newsal;
ename | matches user | action | newsal | oldsal ename | matches user | action | newsal | oldsal
----------------------+--------------+------------+------------+------------ ----------------------+--------------+------------+----------+----------
gates | t | fired | $0.00 | $80,000.00 gates | t | fired | 0.00 | 80000.00
gates | t | hired | $80,000.00 | $0.00 gates | t | hired | 80000.00 | 0.00
maier | t | hired | $5,000.00 | $0.00 maier | t | hired | 5000.00 | 0.00
maier | t | honored | $6,000.00 | $5,000.00 maier | t | honored | 6000.00 | 5000.00
mayr | t | hired | $6,000.00 | $0.00 mayr | t | hired | 6000.00 | 0.00
mayr | t | honored | $7,000.00 | $6,000.00 mayr | t | honored | 7000.00 | 6000.00
meyer | t | hired | $4,000.00 | $0.00 meyer | t | hired | 4000.00 | 0.00
meyer | t | honored | $5,000.00 | $4,000.00 meyer | t | honored | 5000.00 | 4000.00
wiecc | t | hired | $5,000.00 | $0.00 wiecc | t | hired | 5000.00 | 0.00
wieck | t | honored | $6,000.00 | $5,000.00 wieck | t | honored | 6000.00 | 5000.00
wieck | t | honored | $7,000.00 | $6,000.00 wieck | t | honored | 7000.00 | 6000.00
(11 rows) (11 rows)
delete from rtest_emp using rtest_empmass where rtest_emp.ename = rtest_empmass.ename; delete from rtest_emp using rtest_empmass where rtest_emp.ename = rtest_empmass.ename;
select ename, who = current_user as "matches user", action, newsal, oldsal from rtest_emplog order by ename, action, newsal; select ename, who = current_user as "matches user", action, newsal, oldsal from rtest_emplog order by ename, action, newsal;
ename | matches user | action | newsal | oldsal ename | matches user | action | newsal | oldsal
----------------------+--------------+------------+------------+------------ ----------------------+--------------+------------+----------+----------
gates | t | fired | $0.00 | $80,000.00 gates | t | fired | 0.00 | 80000.00
gates | t | hired | $80,000.00 | $0.00 gates | t | hired | 80000.00 | 0.00
maier | t | fired | $0.00 | $6,000.00 maier | t | fired | 0.00 | 6000.00
maier | t | hired | $5,000.00 | $0.00 maier | t | hired | 5000.00 | 0.00
maier | t | honored | $6,000.00 | $5,000.00 maier | t | honored | 6000.00 | 5000.00
mayr | t | fired | $0.00 | $7,000.00 mayr | t | fired | 0.00 | 7000.00
mayr | t | hired | $6,000.00 | $0.00 mayr | t | hired | 6000.00 | 0.00
mayr | t | honored | $7,000.00 | $6,000.00 mayr | t | honored | 7000.00 | 6000.00
meyer | t | fired | $0.00 | $5,000.00 meyer | t | fired | 0.00 | 5000.00
meyer | t | hired | $4,000.00 | $0.00 meyer | t | hired | 4000.00 | 0.00
meyer | t | honored | $5,000.00 | $4,000.00 meyer | t | honored | 5000.00 | 4000.00
wiecc | t | hired | $5,000.00 | $0.00 wiecc | t | hired | 5000.00 | 0.00
wieck | t | honored | $6,000.00 | $5,000.00 wieck | t | honored | 6000.00 | 5000.00
wieck | t | honored | $7,000.00 | $6,000.00 wieck | t | honored | 7000.00 | 6000.00
(14 rows) (14 rows)
-- --

4
src/test/regress/expected/stats_ext.out
Unescape View File

@ -359,7 +359,7 @@ CREATE TABLE ndistinct (
WITH (autovacuum_enabled = off); WITH (autovacuum_enabled = off);
-- over-estimates when using only per-column statistics -- over-estimates when using only per-column statistics
INSERT INTO ndistinct (a, b, c, filler1) INSERT INTO ndistinct (a, b, c, filler1)
SELECT i/100, i/100, i/100, cash_words((i/100)::money) SELECT i/100, i/100, i/100, (i/100) || ' dollars and zero cents'
FROM generate_series(1,1000) s(i); FROM generate_series(1,1000) s(i);
ANALYZE ndistinct; ANALYZE ndistinct;
-- Group Aggregate, due to over-estimate of the number of groups -- Group Aggregate, due to over-estimate of the number of groups
@ -499,7 +499,7 @@ TRUNCATE TABLE ndistinct;
-- under-estimates when using only per-column statistics -- under-estimates when using only per-column statistics
INSERT INTO ndistinct (a, b, c, filler1) INSERT INTO ndistinct (a, b, c, filler1)
SELECT mod(i,13), mod(i,17), mod(i,19), SELECT mod(i,13), mod(i,17), mod(i,19),
cash_words(mod(i,23)::int::money) mod(i,23) || ' dollars and zero cents'
FROM generate_series(1,1000) s(i); FROM generate_series(1,1000) s(i);
ANALYZE ndistinct; ANALYZE ndistinct;
SELECT s.stxkind, d.stxdndistinct SELECT s.stxkind, d.stxdndistinct

48
src/test/regress/expected/union.out
Unescape View File

@ -479,7 +479,7 @@ reset enable_hashagg;
-- non-hashable type -- non-hashable type
set enable_hashagg to on; set enable_hashagg to on;
explain (costs off) explain (costs off)
select x from (values (100::money), (200::money)) _(x) union select x from (values (100::money), (300::money)) _(x); select x from (values ('11'::varbit), ('10'::varbit)) _(x) union select x from (values ('11'::varbit), ('10'::varbit)) _(x);
QUERY PLAN QUERY PLAN
----------------------------------------------- -----------------------------------------------
Unique Unique
@ -492,7 +492,7 @@ select x from (values (100::money), (200::money)) _(x) union select x from (valu
set enable_hashagg to off; set enable_hashagg to off;
explain (costs off) explain (costs off)
select x from (values (100::money), (200::money)) _(x) union select x from (values (100::money), (300::money)) _(x); select x from (values ('11'::varbit), ('10'::varbit)) _(x) union select x from (values ('11'::varbit), ('10'::varbit)) _(x);
QUERY PLAN QUERY PLAN
----------------------------------------------- -----------------------------------------------
Unique Unique
@ -563,7 +563,7 @@ select x from (values (array[1, 2]), (array[1, 3])) _(x) except select x from (v
-- non-hashable type -- non-hashable type
explain (costs off) explain (costs off)
select x from (values (array[100::money]), (array[200::money])) _(x) union select x from (values (array[100::money]), (array[300::money])) _(x); select x from (values (array['10'::varbit]), (array['11'::varbit])) _(x) union select x from (values (array['10'::varbit]), (array['01'::varbit])) _(x);
QUERY PLAN QUERY PLAN
----------------------------------------------- -----------------------------------------------
Unique Unique
@ -574,12 +574,12 @@ select x from (values (array[100::money]), (array[200::money])) _(x) union selec
-> Values Scan on "*VALUES*_1" -> Values Scan on "*VALUES*_1"
(6 rows) (6 rows)
select x from (values (array[100::money]), (array[200::money])) _(x) union select x from (values (array[100::money]), (array[300::money])) _(x); select x from (values (array['10'::varbit]), (array['11'::varbit])) _(x) union select x from (values (array['10'::varbit]), (array['01'::varbit])) _(x);
x x
----------- ------
{$100.00} {01}
{$200.00} {10}
{$300.00} {11}
(3 rows) (3 rows)
set enable_hashagg to off; set enable_hashagg to off;
@ -710,7 +710,7 @@ select x from (values (row(1, 2)), (row(1, 3))) _(x) except select x from (value
-- With an anonymous row type, the typcache does not report that the -- With an anonymous row type, the typcache does not report that the
-- type is hashable. (Otherwise, this would fail at execution time.) -- type is hashable. (Otherwise, this would fail at execution time.)
explain (costs off) explain (costs off)
select x from (values (row(100::money)), (row(200::money))) _(x) union select x from (values (row(100::money)), (row(300::money))) _(x); select x from (values (row('10'::varbit)), (row('11'::varbit))) _(x) union select x from (values (row('10'::varbit)), (row('01'::varbit))) _(x);
QUERY PLAN QUERY PLAN
----------------------------------------------- -----------------------------------------------
Unique Unique
@ -721,19 +721,19 @@ select x from (values (row(100::money)), (row(200::money))) _(x) union select x
-> Values Scan on "*VALUES*_1" -> Values Scan on "*VALUES*_1"
(6 rows) (6 rows)
select x from (values (row(100::money)), (row(200::money))) _(x) union select x from (values (row(100::money)), (row(300::money))) _(x); select x from (values (row('10'::varbit)), (row('11'::varbit))) _(x) union select x from (values (row('10'::varbit)), (row('01'::varbit))) _(x);
x x
----------- ------
($100.00) (01)
($200.00) (10)
($300.00) (11)
(3 rows) (3 rows)
-- With a defined row type, the typcache can inspect the type's fields -- With a defined row type, the typcache can inspect the type's fields
-- for hashability. -- for hashability.
create type ct1 as (f1 money); create type ct1 as (f1 varbit);
explain (costs off) explain (costs off)
select x from (values (row(100::money)::ct1), (row(200::money)::ct1)) _(x) union select x from (values (row(100::money)::ct1), (row(300::money)::ct1)) _(x); select x from (values (row('10'::varbit)::ct1), (row('11'::varbit)::ct1)) _(x) union select x from (values (row('10'::varbit)::ct1), (row('01'::varbit)::ct1)) _(x);
QUERY PLAN QUERY PLAN
----------------------------------------------- -----------------------------------------------
Unique Unique
@ -744,12 +744,12 @@ select x from (values (row(100::money)::ct1), (row(200::money)::ct1)) _(x) union
-> Values Scan on "*VALUES*_1" -> Values Scan on "*VALUES*_1"
(6 rows) (6 rows)
select x from (values (row(100::money)::ct1), (row(200::money)::ct1)) _(x) union select x from (values (row(100::money)::ct1), (row(300::money)::ct1)) _(x); select x from (values (row('10'::varbit)::ct1), (row('11'::varbit)::ct1)) _(x) union select x from (values (row('10'::varbit)::ct1), (row('01'::varbit)::ct1)) _(x);
x x
----------- ------
($100.00) (01)
($200.00) (10)
($300.00) (11)
(3 rows) (3 rows)
drop type ct1; drop type ct1;

6
src/test/regress/expected/with.out
Unescape View File

@ -51,11 +51,11 @@ SELECT * FROM t;
-- UNION DISTINCT requires hashable type -- UNION DISTINCT requires hashable type
WITH RECURSIVE t(n) AS ( WITH RECURSIVE t(n) AS (
VALUES (1::money) VALUES ('01'::varbit)
UNION UNION
SELECT n+1::money FROM t WHERE n < 100::money SELECT n || '10'::varbit FROM t WHERE n < '100'::varbit
) )
SELECT sum(n) FROM t; SELECT n FROM t;
ERROR: could not implement recursive UNION ERROR: could not implement recursive UNION
DETAIL: All column datatypes must be hashable. DETAIL: All column datatypes must be hashable.
-- recursive view -- recursive view

10
src/test/regress/sql/hash_func.sql
Unescape View File

@ -132,9 +132,9 @@ WHERE hash_array(v)::bit(32) != hash_array_extended(v, 0)::bit(32)
-- array hashing with non-hashable element type -- array hashing with non-hashable element type
SELECT v as value, hash_array(v)::bit(32) as standard SELECT v as value, hash_array(v)::bit(32) as standard
FROM (VALUES ('{0}'::money[])) x(v); FROM (VALUES ('{101}'::varbit[])) x(v);
SELECT v as value, hash_array_extended(v, 0)::bit(32) as extended0 SELECT v as value, hash_array_extended(v, 0)::bit(32) as extended0
FROM (VALUES ('{0}'::money[])) x(v); FROM (VALUES ('{101}'::varbit[])) x(v);
SELECT v as value, hashbpchar(v)::bit(32) as standard, SELECT v as value, hashbpchar(v)::bit(32) as standard,
hashbpcharextended(v, 0)::bit(32) as extended0, hashbpcharextended(v, 0)::bit(32) as extended0,
@ -247,11 +247,11 @@ WHERE hash_record(v)::bit(32) != hash_record_extended(v, 0)::bit(32)
DROP TYPE hash_test_t1; DROP TYPE hash_test_t1;
-- record hashing with non-hashable field type -- record hashing with non-hashable field type
CREATE TYPE hash_test_t2 AS (a money, b text); CREATE TYPE hash_test_t2 AS (a varbit, b text);
SELECT v as value, hash_record(v)::bit(32) as standard SELECT v as value, hash_record(v)::bit(32) as standard
FROM (VALUES (row(1, 'aaa')::hash_test_t2)) x(v); FROM (VALUES (row('10'::varbit, 'aaa')::hash_test_t2)) x(v);
SELECT v as value, hash_record_extended(v, 0)::bit(32) as extended0 SELECT v as value, hash_record_extended(v, 0)::bit(32) as extended0
FROM (VALUES (row(1, 'aaa')::hash_test_t2)) x(v); FROM (VALUES (row('11'::varbit, 'aaa')::hash_test_t2)) x(v);
DROP TYPE hash_test_t2; DROP TYPE hash_test_t2;
-- --

2
src/test/regress/sql/multirangetypes.sql
Unescape View File

@ -802,7 +802,7 @@ drop type two_ints cascade;
set enable_sort = off; -- try to make it pick a hash setop implementation set enable_sort = off; -- try to make it pick a hash setop implementation
select '{(2,5)}'::cashmultirange except select '{(5,6)}'::cashmultirange; select '{(01,10)}'::varbitmultirange except select '{(10,11)}'::varbitmultirange;
reset enable_sort; reset enable_sort;

4
src/test/regress/sql/rangetypes.sql
Unescape View File

@ -575,11 +575,11 @@ drop type two_ints cascade;
-- Check behavior when subtype lacks a hash function -- Check behavior when subtype lacks a hash function
-- --
create type cashrange as range (subtype = money); create type varbitrange as range (subtype = varbit);
set enable_sort = off; -- try to make it pick a hash setop implementation set enable_sort = off; -- try to make it pick a hash setop implementation
select '(2,5)'::cashrange except select '(5,6)'::cashrange; select '(01,10)'::varbitrange except select '(10,11)'::varbitrange;
reset enable_sort; reset enable_sort;

6
src/test/regress/sql/rules.sql
Unescape View File

@ -57,9 +57,9 @@ create rule rtest_pers_del as on delete to rtest_person do also
-- --
-- Tables and rules for the logging test -- Tables and rules for the logging test
-- --
create table rtest_emp (ename char(20), salary money); create table rtest_emp (ename char(20), salary numeric);
create table rtest_emplog (ename char(20), who name, action char(10), newsal money, oldsal money); create table rtest_emplog (ename char(20), who name, action char(10), newsal numeric, oldsal numeric);
create table rtest_empmass (ename char(20), salary money); create table rtest_empmass (ename char(20), salary numeric);
create rule rtest_emp_ins as on insert to rtest_emp do create rule rtest_emp_ins as on insert to rtest_emp do
insert into rtest_emplog values (new.ename, current_user, insert into rtest_emplog values (new.ename, current_user,

4
src/test/regress/sql/stats_ext.sql
Unescape View File

@ -234,7 +234,7 @@ WITH (autovacuum_enabled = off);
-- over-estimates when using only per-column statistics -- over-estimates when using only per-column statistics
INSERT INTO ndistinct (a, b, c, filler1) INSERT INTO ndistinct (a, b, c, filler1)
SELECT i/100, i/100, i/100, cash_words((i/100)::money) SELECT i/100, i/100, i/100, (i/100) || ' dollars and zero cents'
FROM generate_series(1,1000) s(i); FROM generate_series(1,1000) s(i);
ANALYZE ndistinct; ANALYZE ndistinct;
@ -299,7 +299,7 @@ TRUNCATE TABLE ndistinct;
-- under-estimates when using only per-column statistics -- under-estimates when using only per-column statistics
INSERT INTO ndistinct (a, b, c, filler1) INSERT INTO ndistinct (a, b, c, filler1)
SELECT mod(i,13), mod(i,17), mod(i,19), SELECT mod(i,13), mod(i,17), mod(i,19),
cash_words(mod(i,23)::int::money) mod(i,23) || ' dollars and zero cents'
FROM generate_series(1,1000) s(i); FROM generate_series(1,1000) s(i);
ANALYZE ndistinct; ANALYZE ndistinct;

18
src/test/regress/sql/union.sql
Unescape View File

@ -162,12 +162,12 @@ reset enable_hashagg;
set enable_hashagg to on; set enable_hashagg to on;
explain (costs off) explain (costs off)
select x from (values (100::money), (200::money)) _(x) union select x from (values (100::money), (300::money)) _(x); select x from (values ('11'::varbit), ('10'::varbit)) _(x) union select x from (values ('11'::varbit), ('10'::varbit)) _(x);
set enable_hashagg to off; set enable_hashagg to off;
explain (costs off) explain (costs off)
select x from (values (100::money), (200::money)) _(x) union select x from (values (100::money), (300::money)) _(x); select x from (values ('11'::varbit), ('10'::varbit)) _(x) union select x from (values ('11'::varbit), ('10'::varbit)) _(x);
reset enable_hashagg; reset enable_hashagg;
@ -186,8 +186,8 @@ select x from (values (array[1, 2]), (array[1, 3])) _(x) except select x from (v
-- non-hashable type -- non-hashable type
explain (costs off) explain (costs off)
select x from (values (array[100::money]), (array[200::money])) _(x) union select x from (values (array[100::money]), (array[300::money])) _(x); select x from (values (array['10'::varbit]), (array['11'::varbit])) _(x) union select x from (values (array['10'::varbit]), (array['01'::varbit])) _(x);
select x from (values (array[100::money]), (array[200::money])) _(x) union select x from (values (array[100::money]), (array[300::money])) _(x); select x from (values (array['10'::varbit]), (array['11'::varbit])) _(x) union select x from (values (array['10'::varbit]), (array['01'::varbit])) _(x);
set enable_hashagg to off; set enable_hashagg to off;
@ -221,15 +221,15 @@ select x from (values (row(1, 2)), (row(1, 3))) _(x) except select x from (value
-- With an anonymous row type, the typcache does not report that the -- With an anonymous row type, the typcache does not report that the
-- type is hashable. (Otherwise, this would fail at execution time.) -- type is hashable. (Otherwise, this would fail at execution time.)
explain (costs off) explain (costs off)
select x from (values (row(100::money)), (row(200::money))) _(x) union select x from (values (row(100::money)), (row(300::money))) _(x); select x from (values (row('10'::varbit)), (row('11'::varbit))) _(x) union select x from (values (row('10'::varbit)), (row('01'::varbit))) _(x);
select x from (values (row(100::money)), (row(200::money))) _(x) union select x from (values (row(100::money)), (row(300::money))) _(x); select x from (values (row('10'::varbit)), (row('11'::varbit))) _(x) union select x from (values (row('10'::varbit)), (row('01'::varbit))) _(x);
-- With a defined row type, the typcache can inspect the type's fields -- With a defined row type, the typcache can inspect the type's fields
-- for hashability. -- for hashability.
create type ct1 as (f1 money); create type ct1 as (f1 varbit);
explain (costs off) explain (costs off)
select x from (values (row(100::money)::ct1), (row(200::money)::ct1)) _(x) union select x from (values (row(100::money)::ct1), (row(300::money)::ct1)) _(x); select x from (values (row('10'::varbit)::ct1), (row('11'::varbit)::ct1)) _(x) union select x from (values (row('10'::varbit)::ct1), (row('01'::varbit)::ct1)) _(x);
select x from (values (row(100::money)::ct1), (row(200::money)::ct1)) _(x) union select x from (values (row(100::money)::ct1), (row(300::money)::ct1)) _(x); select x from (values (row('10'::varbit)::ct1), (row('11'::varbit)::ct1)) _(x) union select x from (values (row('10'::varbit)::ct1), (row('01'::varbit)::ct1)) _(x);
drop type ct1; drop type ct1;
set enable_hashagg to off; set enable_hashagg to off;

6
src/test/regress/sql/with.sql
Unescape View File

@ -33,11 +33,11 @@ SELECT * FROM t;
-- UNION DISTINCT requires hashable type -- UNION DISTINCT requires hashable type
WITH RECURSIVE t(n) AS ( WITH RECURSIVE t(n) AS (
VALUES (1::money) VALUES ('01'::varbit)
UNION UNION
SELECT n+1::money FROM t WHERE n < 100::money SELECT n || '10'::varbit FROM t WHERE n < '100'::varbit
) )
SELECT sum(n) FROM t; SELECT n FROM t;
-- recursive view -- recursive view
CREATE RECURSIVE VIEW nums (n) AS CREATE RECURSIVE VIEW nums (n) AS

Write Preview
Loading…
Cancel
Save