database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-16 06:01:02 +03:00
Code Activity

Remove useless whitespace at end of lines

Browse Source
This commit is contained in:
Peter Eisentraut
2010-11-23 22:27:50 +02:00
parent 44475e782f
commit fc946c39ae
517 changed files with 3463 additions and 3508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/btree_gist/btree_gist.sql.in
View File

@ -919,7 +919,7 @@ AS
FUNCTION 5 gbt_text_penalty (internal, internal, internal), FUNCTION 5 gbt_text_penalty (internal, internal, internal),
FUNCTION 6 gbt_text_picksplit (internal, internal), FUNCTION 6 gbt_text_picksplit (internal, internal),
FUNCTION 7 gbt_text_same (internal, internal, internal), FUNCTION 7 gbt_text_same (internal, internal, internal),
STORAGE gbtreekey_var; STORAGE gbtreekey_var;
---- Create the operator class ---- Create the operator class
@ -939,7 +939,7 @@ AS
FUNCTION 5 gbt_text_penalty (internal, internal, internal), FUNCTION 5 gbt_text_penalty (internal, internal, internal),
FUNCTION 6 gbt_text_picksplit (internal, internal), FUNCTION 6 gbt_text_picksplit (internal, internal),
FUNCTION 7 gbt_text_same (internal, internal, internal), FUNCTION 7 gbt_text_same (internal, internal, internal),
STORAGE gbtreekey_var; STORAGE gbtreekey_var;
@ -997,7 +997,7 @@ AS
FUNCTION 5 gbt_bytea_penalty (internal, internal, internal), FUNCTION 5 gbt_bytea_penalty (internal, internal, internal),
FUNCTION 6 gbt_bytea_picksplit (internal, internal), FUNCTION 6 gbt_bytea_picksplit (internal, internal),
FUNCTION 7 gbt_bytea_same (internal, internal, internal), FUNCTION 7 gbt_bytea_same (internal, internal, internal),
STORAGE gbtreekey_var; STORAGE gbtreekey_var;
-- --
@ -1055,7 +1055,7 @@ AS
FUNCTION 5 gbt_numeric_penalty (internal, internal, internal), FUNCTION 5 gbt_numeric_penalty (internal, internal, internal),
FUNCTION 6 gbt_numeric_picksplit (internal, internal), FUNCTION 6 gbt_numeric_picksplit (internal, internal),
FUNCTION 7 gbt_numeric_same (internal, internal, internal), FUNCTION 7 gbt_numeric_same (internal, internal, internal),
STORAGE gbtreekey_var; STORAGE gbtreekey_var;
-- --
-- --
@ -1111,7 +1111,7 @@ AS
FUNCTION 5 gbt_bit_penalty (internal, internal, internal), FUNCTION 5 gbt_bit_penalty (internal, internal, internal),
FUNCTION 6 gbt_bit_picksplit (internal, internal), FUNCTION 6 gbt_bit_picksplit (internal, internal),
FUNCTION 7 gbt_bit_same (internal, internal, internal), FUNCTION 7 gbt_bit_same (internal, internal, internal),
STORAGE gbtreekey_var; STORAGE gbtreekey_var;
-- Create the operator class -- Create the operator class
@ -1131,7 +1131,7 @@ AS
FUNCTION 5 gbt_bit_penalty (internal, internal, internal), FUNCTION 5 gbt_bit_penalty (internal, internal, internal),
FUNCTION 6 gbt_bit_picksplit (internal, internal), FUNCTION 6 gbt_bit_picksplit (internal, internal),
FUNCTION 7 gbt_bit_same (internal, internal, internal), FUNCTION 7 gbt_bit_same (internal, internal, internal),
STORAGE gbtreekey_var; STORAGE gbtreekey_var;
@ -1201,7 +1201,7 @@ AS
OPERATOR 3 = (inet, inet) , OPERATOR 3 = (inet, inet) ,
OPERATOR 4 >= (inet, inet) , OPERATOR 4 >= (inet, inet) ,
OPERATOR 5 > (inet, inet) , OPERATOR 5 > (inet, inet) ,
OPERATOR 6 <> (inet, inet) , OPERATOR 6 <> (inet, inet) ,
FUNCTION 1 gbt_inet_consistent (internal, inet, int2, oid, internal), FUNCTION 1 gbt_inet_consistent (internal, inet, int2, oid, internal),
FUNCTION 2 gbt_inet_union (bytea, internal), FUNCTION 2 gbt_inet_union (bytea, internal),
FUNCTION 3 gbt_inet_compress (internal), FUNCTION 3 gbt_inet_compress (internal),

4
contrib/cube/cubescan.l
View File

@ -1,8 +1,8 @@
%{ %{
/* /*
** A scanner for EMP-style numeric ranges * A scanner for EMP-style numeric ranges
* contrib/cube/cubescan.l * contrib/cube/cubescan.l
*/ */
#include "postgres.h" #include "postgres.h"

4
contrib/cube/expected/cube.out
View File

@ -1111,7 +1111,7 @@ SELECT cube_enlarge('(2,-2),(-3,7)'::cube, -3, 2);
CREATE TABLE test_cube (c cube); CREATE TABLE test_cube (c cube);
\copy test_cube from 'data/test_cube.data' \copy test_cube from 'data/test_cube.data'
CREATE INDEX test_cube_ix ON test_cube USING gist (c); CREATE INDEX test_cube_ix ON test_cube USING gist (c);
SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' ORDER BY c; SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' ORDER BY c;
c c
-------------------------- --------------------------
(337, 455),(240, 359) (337, 455),(240, 359)
@ -1122,7 +1122,7 @@ SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' ORDER BY c;
(5 rows) (5 rows)
-- Test sorting -- Test sorting
SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' GROUP BY c ORDER BY c; SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' GROUP BY c ORDER BY c;
c c
-------------------------- --------------------------
(337, 455),(240, 359) (337, 455),(240, 359)

4
contrib/cube/expected/cube_1.out
View File

@ -1111,7 +1111,7 @@ SELECT cube_enlarge('(2,-2),(-3,7)'::cube, -3, 2);
CREATE TABLE test_cube (c cube); CREATE TABLE test_cube (c cube);
\copy test_cube from 'data/test_cube.data' \copy test_cube from 'data/test_cube.data'
CREATE INDEX test_cube_ix ON test_cube USING gist (c); CREATE INDEX test_cube_ix ON test_cube USING gist (c);
SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' ORDER BY c; SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' ORDER BY c;
c c
-------------------------- --------------------------
(337, 455),(240, 359) (337, 455),(240, 359)
@ -1122,7 +1122,7 @@ SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' ORDER BY c;
(5 rows) (5 rows)
-- Test sorting -- Test sorting
SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' GROUP BY c ORDER BY c; SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' GROUP BY c ORDER BY c;
c c
-------------------------- --------------------------
(337, 455),(240, 359) (337, 455),(240, 359)

4
contrib/cube/expected/cube_2.out
View File

@ -1111,7 +1111,7 @@ SELECT cube_enlarge('(2,-2),(-3,7)'::cube, -3, 2);
CREATE TABLE test_cube (c cube); CREATE TABLE test_cube (c cube);
\copy test_cube from 'data/test_cube.data' \copy test_cube from 'data/test_cube.data'
CREATE INDEX test_cube_ix ON test_cube USING gist (c); CREATE INDEX test_cube_ix ON test_cube USING gist (c);
SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' ORDER BY c; SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' ORDER BY c;
c c
-------------------------- --------------------------
(337, 455),(240, 359) (337, 455),(240, 359)
@ -1122,7 +1122,7 @@ SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' ORDER BY c;
(5 rows) (5 rows)
-- Test sorting -- Test sorting
SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' GROUP BY c ORDER BY c; SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' GROUP BY c ORDER BY c;
c c
-------------------------- --------------------------
(337, 455),(240, 359) (337, 455),(240, 359)

4
contrib/cube/sql/cube.sql
View File

@ -281,7 +281,7 @@ CREATE TABLE test_cube (c cube);
\copy test_cube from 'data/test_cube.data' \copy test_cube from 'data/test_cube.data'
CREATE INDEX test_cube_ix ON test_cube USING gist (c); CREATE INDEX test_cube_ix ON test_cube USING gist (c);
SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' ORDER BY c; SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' ORDER BY c;
-- Test sorting -- Test sorting
SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' GROUP BY c ORDER BY c; SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' GROUP BY c ORDER BY c;

10
contrib/intarray/bench/bench.pl
View File

@ -14,16 +14,16 @@ if ( !( scalar %opt && defined $opt{s} ) ) {
print <<EOT; print <<EOT;
Usage: Usage:
$0 -d DATABASE -s SECTIONS [-b NUMBER] [-v] [-e] [-o] [-r] [-a] [-u] $0 -d DATABASE -s SECTIONS [-b NUMBER] [-v] [-e] [-o] [-r] [-a] [-u]
-d DATABASE -DATABASE -d DATABASE -DATABASE
-b NUMBER -number of repeats -b NUMBER -number of repeats
-s SECTIONS -sections, format sid1[,sid2[,sid3[...]]]] -s SECTIONS -sections, format sid1[,sid2[,sid3[...]]]]
-v -verbose (show SQL) -v -verbose (show SQL)
-e -show explain -e -show explain
-r -use RD-tree index -r -use RD-tree index
-a -AND section -a -AND section
-o -show output -o -show output
-u -unique -u -unique
-c -count -c -count
EOT EOT
exit; exit;

2
contrib/intarray/bench/create_test.pl
View File

@ -9,7 +9,7 @@ create table message (
sections int[] sections int[]
); );
create table message_section_map ( create table message_section_map (
mid int not null, mid int not null,
sid int not null sid int not null
); );

2
contrib/pg_buffercache/Makefile
View File

@ -1,7 +1,7 @@
# contrib/pg_buffercache/Makefile # contrib/pg_buffercache/Makefile
MODULE_big = pg_buffercache MODULE_big = pg_buffercache
OBJS = pg_buffercache_pages.o OBJS = pg_buffercache_pages.o
DATA_built = pg_buffercache.sql DATA_built = pg_buffercache.sql
DATA = uninstall_pg_buffercache.sql DATA = uninstall_pg_buffercache.sql

2
contrib/pg_buffercache/pg_buffercache.sql.in
View File

@ -12,7 +12,7 @@ LANGUAGE C;
-- Create a view for convenient access. -- Create a view for convenient access.
CREATE VIEW pg_buffercache AS CREATE VIEW pg_buffercache AS
SELECT P.* FROM pg_buffercache_pages() AS P SELECT P.* FROM pg_buffercache_pages() AS P
(bufferid integer, relfilenode oid, reltablespace oid, reldatabase oid, (bufferid integer, relfilenode oid, reltablespace oid, reldatabase oid,
relforknumber int2, relblocknumber int8, isdirty bool, usagecount int2); relforknumber int2, relblocknumber int8, isdirty bool, usagecount int2);
-- Don't want these to be available at public. -- Don't want these to be available at public.

2
contrib/pg_freespacemap/Makefile
View File

@ -1,7 +1,7 @@
# contrib/pg_freespacemap/Makefile # contrib/pg_freespacemap/Makefile
MODULE_big = pg_freespacemap MODULE_big = pg_freespacemap
OBJS = pg_freespacemap.o OBJS = pg_freespacemap.o
DATA_built = pg_freespacemap.sql DATA_built = pg_freespacemap.sql
DATA = uninstall_pg_freespacemap.sql DATA = uninstall_pg_freespacemap.sql

8
contrib/pg_upgrade/TESTING
View File

@ -35,10 +35,10 @@ Here are the steps needed to create a regression database dump file:
b) For pre-9.0, remove 'regex_flavor' b) For pre-9.0, remove 'regex_flavor'
f) For pre-9.0, adjust extra_float_digits f) For pre-9.0, adjust extra_float_digits
Postgres 9.0 pg_dump uses extra_float_digits=-2 for pre-9.0 Postgres 9.0 pg_dump uses extra_float_digits=-2 for pre-9.0
databases, and extra_float_digits=-3 for >= 9.0 databases. databases, and extra_float_digits=-3 for >= 9.0 databases.
It is necessary to modify 9.0 pg_dump to always use -3, and It is necessary to modify 9.0 pg_dump to always use -3, and
modify the pre-9.0 old server to accept extra_float_digits=-3. modify the pre-9.0 old server to accept extra_float_digits=-3.
Once the dump is created, it can be repeatedly loaded into the old Once the dump is created, it can be repeatedly loaded into the old
database, upgraded, and dumped out of the new database, and then database, upgraded, and dumped out of the new database, and then

6
contrib/pgcrypto/expected/blowfish.out
View File

@ -120,21 +120,21 @@ decode('f0e1d2c3b4a5968778695a4b3c2d1e0f001122334455667704689104c2fd3b2f58402364
-- result: c04504012e4e1f53 -- result: c04504012e4e1f53
-- empty data -- empty data
select encode( encrypt('', 'foo', 'bf'), 'hex'); select encode(encrypt('', 'foo', 'bf'), 'hex');
encode encode
------------------ ------------------
1871949bb2311c8e 1871949bb2311c8e
(1 row) (1 row)
-- 10 bytes key -- 10 bytes key
select encode( encrypt('foo', '0123456789', 'bf'), 'hex'); select encode(encrypt('foo', '0123456789', 'bf'), 'hex');
encode encode
------------------ ------------------
42f58af3b2c03f46 42f58af3b2c03f46
(1 row) (1 row)
-- 22 bytes key -- 22 bytes key
select encode( encrypt('foo', '0123456789012345678901', 'bf'), 'hex'); select encode(encrypt('foo', '0123456789012345678901', 'bf'), 'hex');
encode encode
------------------ ------------------
86ab6f0bc72b5f22 86ab6f0bc72b5f22

6
contrib/pgcrypto/expected/rijndael.out
View File

@ -70,21 +70,21 @@ decode('000102030405060708090a0b0c0d0e0f101112131415161718191a1b', 'hex'),
(1 row) (1 row)
-- empty data -- empty data
select encode( encrypt('', 'foo', 'aes'), 'hex'); select encode(encrypt('', 'foo', 'aes'), 'hex');
encode encode
---------------------------------- ----------------------------------
b48cc3338a2eb293b6007ef72c360d48 b48cc3338a2eb293b6007ef72c360d48
(1 row) (1 row)
-- 10 bytes key -- 10 bytes key
select encode( encrypt('foo', '0123456789', 'aes'), 'hex'); select encode(encrypt('foo', '0123456789', 'aes'), 'hex');
encode encode
---------------------------------- ----------------------------------
f397f03d2819b7172b68d0706fda4693 f397f03d2819b7172b68d0706fda4693
(1 row) (1 row)
-- 22 bytes key -- 22 bytes key
select encode( encrypt('foo', '0123456789012345678901', 'aes'), 'hex'); select encode(encrypt('foo', '0123456789012345678901', 'aes'), 'hex');
encode encode
---------------------------------- ----------------------------------
5c9db77af02b4678117bcd8a71ae7f53 5c9db77af02b4678117bcd8a71ae7f53

6
contrib/pgcrypto/sql/blowfish.sql
View File

@ -74,11 +74,11 @@ decode('f0e1d2c3b4a5968778695a4b3c2d1e0f001122334455667704689104c2fd3b2f58402364
-- result: c04504012e4e1f53 -- result: c04504012e4e1f53
-- empty data -- empty data
select encode( encrypt('', 'foo', 'bf'), 'hex'); select encode(encrypt('', 'foo', 'bf'), 'hex');
-- 10 bytes key -- 10 bytes key
select encode( encrypt('foo', '0123456789', 'bf'), 'hex'); select encode(encrypt('foo', '0123456789', 'bf'), 'hex');
-- 22 bytes key -- 22 bytes key
select encode( encrypt('foo', '0123456789012345678901', 'bf'), 'hex'); select encode(encrypt('foo', '0123456789012345678901', 'bf'), 'hex');
-- decrypt -- decrypt
select decrypt(encrypt('foo', '0123456', 'bf'), '0123456', 'bf'); select decrypt(encrypt('foo', '0123456', 'bf'), '0123456', 'bf');

6
contrib/pgcrypto/sql/rijndael.sql
View File

@ -44,11 +44,11 @@ decode('000102030405060708090a0b0c0d0e0f101112131415161718191a1b', 'hex'),
'aes-cbc'), 'hex'); 'aes-cbc'), 'hex');
-- empty data -- empty data
select encode( encrypt('', 'foo', 'aes'), 'hex'); select encode(encrypt('', 'foo', 'aes'), 'hex');
-- 10 bytes key -- 10 bytes key
select encode( encrypt('foo', '0123456789', 'aes'), 'hex'); select encode(encrypt('foo', '0123456789', 'aes'), 'hex');
-- 22 bytes key -- 22 bytes key
select encode( encrypt('foo', '0123456789012345678901', 'aes'), 'hex'); select encode(encrypt('foo', '0123456789012345678901', 'aes'), 'hex');
-- decrypt -- decrypt
select decrypt(encrypt('foo', '0123456', 'aes'), '0123456', 'aes'); select decrypt(encrypt('foo', '0123456', 'aes'), '0123456', 'aes');

4
contrib/seg/segscan.l
View File

@ -1,7 +1,7 @@
%{ %{
/* /*
** A scanner for EMP-style numeric ranges * A scanner for EMP-style numeric ranges
*/ */
#include "postgres.h" #include "postgres.h"

2
contrib/tsearch2/expected/tsearch2.out
View File

@ -2337,7 +2337,6 @@ Upon a woman s face. E. J. Pratt (1882 1964)
The granite features of this cliff The granite features of this cliff
(1 row) (1 row)
select headline('Erosion It took the sea a thousand years, select headline('Erosion It took the sea a thousand years,
A thousand years to trace A thousand years to trace
The granite features of this cliff The granite features of this cliff
@ -2354,7 +2353,6 @@ Upon a woman s face. E. J. Pratt (1882 1964)
The <b>granite</b> features of this cliff The <b>granite</b> features of this cliff
(1 row) (1 row)
select headline('Erosion It took the sea a thousand years, select headline('Erosion It took the sea a thousand years,
A thousand years to trace A thousand years to trace
The granite features of this cliff The granite features of this cliff

2
contrib/tsearch2/expected/tsearch2_1.out
View File

@ -2337,7 +2337,6 @@ Upon a woman s face. E. J. Pratt (1882 1964)
The granite features of this cliff The granite features of this cliff
(1 row) (1 row)
select headline('Erosion It took the sea a thousand years, select headline('Erosion It took the sea a thousand years,
A thousand years to trace A thousand years to trace
The granite features of this cliff The granite features of this cliff
@ -2354,7 +2353,6 @@ Upon a woman s face. E. J. Pratt (1882 1964)
The <b>granite</b> features of this cliff The <b>granite</b> features of this cliff
(1 row) (1 row)
select headline('Erosion It took the sea a thousand years, select headline('Erosion It took the sea a thousand years,
A thousand years to trace A thousand years to trace
The granite features of this cliff The granite features of this cliff

1
doc/src/sgml/ecpg.sgml
View File

@ -2743,7 +2743,6 @@ timestamp PGTYPEStimestamp_from_asc(char *str, char **endptr);
The function returns the parsed timestamp on success. On error, The function returns the parsed timestamp on success. On error,
<literal>PGTYPESInvalidTimestamp</literal> is returned and <varname>errno</> is <literal>PGTYPESInvalidTimestamp</literal> is returned and <varname>errno</> is
set to <literal>PGTYPES_TS_BAD_TIMESTAMP</>. See <xref linkend="PGTYPESInvalidTimestamp"> for important notes on this value. set to <literal>PGTYPES_TS_BAD_TIMESTAMP</>. See <xref linkend="PGTYPESInvalidTimestamp"> for important notes on this value.
</para> </para>
<para> <para>
In general, the input string can contain any combination of an allowed In general, the input string can contain any combination of an allowed

2
src/backend/access/gist/README
View File

@ -236,4 +236,4 @@ insert(new-key)
Authors: Authors:
Teodor Sigaev <teodor@sigaev.ru> Teodor Sigaev <teodor@sigaev.ru>
Oleg Bartunov <oleg@sai.msu.su> Oleg Bartunov <oleg@sai.msu.su>

12
src/backend/tsearch/wparser_def.c
View File

@ -2187,7 +2187,7 @@ mark_hl_fragments(HeadlineParsedText *prs, TSQuery query, int highlight,
int4 stretch, maxstretch, posmarker; int4 stretch, maxstretch, posmarker;
int4 startpos = 0, int4 startpos = 0,
endpos = 0, endpos = 0,
p = 0, p = 0,
q = 0; q = 0;
@ -2230,7 +2230,7 @@ mark_hl_fragments(HeadlineParsedText *prs, TSQuery query, int highlight,
endpos = q; endpos = q;
} }
/* move p to generate the next cover */ /* move p to generate the next cover */
p++; p++;
} }
/* choose best covers */ /* choose best covers */
@ -2246,7 +2246,7 @@ mark_hl_fragments(HeadlineParsedText *prs, TSQuery query, int highlight,
for (i = 0; i < numcovers; i ++) for (i = 0; i < numcovers; i ++)
{ {
if (!covers[i].in && !covers[i].excluded && if (!covers[i].in && !covers[i].excluded &&
(maxitems < covers[i].poslen || (maxitems == covers[i].poslen (maxitems < covers[i].poslen || (maxitems == covers[i].poslen
&& minwords > covers[i].curlen))) && minwords > covers[i].curlen)))
{ {
maxitems = covers[i].poslen; maxitems = covers[i].poslen;
@ -2269,9 +2269,9 @@ mark_hl_fragments(HeadlineParsedText *prs, TSQuery query, int highlight,
maxstretch = (max_words - curlen)/2; maxstretch = (max_words - curlen)/2;
/* first stretch the startpos /* first stretch the startpos
* stop stretching if * stop stretching if
* 1. we hit the beginning of document * 1. we hit the beginning of document
* 2. exceed maxstretch * 2. exceed maxstretch
* 3. we hit an already marked fragment * 3. we hit an already marked fragment
*/ */
stretch = 0; stretch = 0;
posmarker = startpos; posmarker = startpos;

8
src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.c
View File

@ -55,17 +55,17 @@ main(void)
char *t1 = "2000-7-12 17:34:29"; char *t1 = "2000-7-12 17:34:29";
int i; int i;
ECPGdebug(1, stderr); ECPGdebug(1, stderr);
/* exec sql whenever sqlerror do sqlprint ( ) ; */ /* exec sql whenever sqlerror do sqlprint ( ) ; */
#line 27 "dt_test.pgc" #line 27 "dt_test.pgc"
{ ECPGconnect(__LINE__, 0, "regress1" , NULL, NULL , NULL, 0); { ECPGconnect(__LINE__, 0, "regress1" , NULL, NULL , NULL, 0);
#line 28 "dt_test.pgc" #line 28 "dt_test.pgc"
if (sqlca.sqlcode < 0) sqlprint ( );} if (sqlca.sqlcode < 0) sqlprint ( );}
#line 28 "dt_test.pgc" #line 28 "dt_test.pgc"
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table date_test ( d date , ts timestamp )", ECPGt_EOIT, ECPGt_EORT); { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table date_test ( d date , ts timestamp )", ECPGt_EOIT, ECPGt_EORT);
#line 29 "dt_test.pgc" #line 29 "dt_test.pgc"
if (sqlca.sqlcode < 0) sqlprint ( );} if (sqlca.sqlcode < 0) sqlprint ( );}

2
src/interfaces/ecpg/test/expected/sql-array.c
View File

@ -148,7 +148,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
#line 29 "array.pgc" #line 29 "array.pgc"
{ ECPGtrans(__LINE__, NULL, "begin work"); { ECPGtrans(__LINE__, NULL, "begin work");
#line 31 "array.pgc" #line 31 "array.pgc"
if (sqlca.sqlcode < 0) sqlprint();} if (sqlca.sqlcode < 0) sqlprint();}

8
src/interfaces/ecpg/test/pgtypeslib/dt_test.pgc
View File

@ -23,10 +23,10 @@ main(void)
char *t1 = "2000-7-12 17:34:29"; char *t1 = "2000-7-12 17:34:29";
int i; int i;
ECPGdebug(1, stderr); ECPGdebug(1, stderr);
exec sql whenever sqlerror do sqlprint(); exec sql whenever sqlerror do sqlprint();
exec sql connect to REGRESSDB1; exec sql connect to REGRESSDB1;
exec sql create table date_test (d date, ts timestamp); exec sql create table date_test (d date, ts timestamp);
exec sql set datestyle to iso; exec sql set datestyle to iso;
exec sql set intervalstyle to postgres_verbose; exec sql set intervalstyle to postgres_verbose;

2
src/interfaces/ecpg/test/sql/array.pgc
View File

@ -28,7 +28,7 @@ EXEC SQL END DECLARE SECTION;
EXEC SQL SET AUTOCOMMIT = ON; EXEC SQL SET AUTOCOMMIT = ON;
EXEC SQL BEGIN WORK; EXEC SQL BEGIN WORK;
EXEC SQL CREATE TABLE test (f float, i int, a int[10], text char(10)); EXEC SQL CREATE TABLE test (f float, i int, a int[10], text char(10));

2
src/interfaces/ecpg/test/sql/code100.pgc
View File

@ -32,7 +32,7 @@ int main()
if (sqlca.sqlcode) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); if (sqlca.sqlcode) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc);
exec sql update test exec sql update test
set payload=payload+1 where index=-1; set payload=payload+1 where index=-1;
if (sqlca.sqlcode!=100) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); if (sqlca.sqlcode!=100) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc);
exec sql delete from test where index=-1; exec sql delete from test where index=-1;

2
src/pl/plperl/expected/plperl_plperlu.out
View File

@ -5,12 +5,10 @@ CREATE OR REPLACE FUNCTION bar() RETURNS integer AS $$
# alternative - causes server process to exit(255) # alternative - causes server process to exit(255)
spi_exec_query("invalid sql statement"); spi_exec_query("invalid sql statement");
$$ language plperl; -- compile plperl code $$ language plperl; -- compile plperl code
CREATE OR REPLACE FUNCTION foo() RETURNS integer AS $$ CREATE OR REPLACE FUNCTION foo() RETURNS integer AS $$
spi_exec_query("SELECT * FROM bar()"); spi_exec_query("SELECT * FROM bar()");
return 1; return 1;
$$ LANGUAGE plperlu; -- compile plperlu code $$ LANGUAGE plperlu; -- compile plperlu code
SELECT * FROM bar(); -- throws exception normally (running plperl) SELECT * FROM bar(); -- throws exception normally (running plperl)
ERROR: syntax error at or near "invalid" at line 4. ERROR: syntax error at or near "invalid" at line 4.
CONTEXT: PL/Perl function "bar" CONTEXT: PL/Perl function "bar"

2
src/pl/plperl/expected/plperl_trigger.out
View File

@ -122,7 +122,6 @@ NOTICE: $_TD->{table_schema} = 'public'
CONTEXT: PL/Perl function "trigger_data" CONTEXT: PL/Perl function "trigger_data"
NOTICE: $_TD->{when} = 'BEFORE' NOTICE: $_TD->{when} = 'BEFORE'
CONTEXT: PL/Perl function "trigger_data" CONTEXT: PL/Perl function "trigger_data"
DROP TRIGGER show_trigger_data_trig on trigger_test; DROP TRIGGER show_trigger_data_trig on trigger_test;
insert into trigger_test values(1,'insert'); insert into trigger_test values(1,'insert');
CREATE VIEW trigger_test_view AS SELECT * FROM trigger_test; CREATE VIEW trigger_test_view AS SELECT * FROM trigger_test;
@ -202,7 +201,6 @@ NOTICE: $_TD->{when} = 'INSTEAD OF'
CONTEXT: PL/Perl function "trigger_data" CONTEXT: PL/Perl function "trigger_data"
DROP VIEW trigger_test_view; DROP VIEW trigger_test_view;
delete from trigger_test; delete from trigger_test;
DROP FUNCTION trigger_data(); DROP FUNCTION trigger_data();
CREATE OR REPLACE FUNCTION valid_id() RETURNS trigger AS $$ CREATE OR REPLACE FUNCTION valid_id() RETURNS trigger AS $$

1
src/test/regress/expected/create_index.out
View File

@ -1023,5 +1023,4 @@ SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL AND unique2 IS NOT NUL
RESET enable_seqscan; RESET enable_seqscan;
RESET enable_indexscan; RESET enable_indexscan;
RESET enable_bitmapscan; RESET enable_bitmapscan;
DROP TABLE onek_with_null; DROP TABLE onek_with_null;

20
src/test/regress/expected/errors.out
View File

@ -10,13 +10,11 @@ select 1;
-- --
-- UNSUPPORTED STUFF -- UNSUPPORTED STUFF
-- doesn't work -- doesn't work
-- notify pg_class -- notify pg_class
-- --
-- --
-- SELECT -- SELECT
-- missing relation name -- missing relation name
select; select;
ERROR: syntax error at or near ";" ERROR: syntax error at or near ";"
@ -59,7 +57,6 @@ LINE 1: select distinct on (foobar) * from pg_database;
^ ^
-- --
-- DELETE -- DELETE
-- missing relation name (this had better not wildcard!) -- missing relation name (this had better not wildcard!)
delete from; delete from;
ERROR: syntax error at or near ";" ERROR: syntax error at or near ";"
@ -72,7 +69,6 @@ LINE 1: delete from nonesuch;
^ ^
-- --
-- DROP -- DROP
-- missing relation name (this had better not wildcard!) -- missing relation name (this had better not wildcard!)
drop table; drop table;
ERROR: syntax error at or near ";" ERROR: syntax error at or near ";"
@ -83,7 +79,6 @@ drop table nonesuch;
ERROR: table "nonesuch" does not exist ERROR: table "nonesuch" does not exist
-- --
-- ALTER TABLE -- ALTER TABLE
-- relation renaming -- relation renaming
-- missing relation name -- missing relation name
alter table rename; alter table rename;
@ -117,7 +112,6 @@ alter table emp rename column salary to oid;
ERROR: column "oid" of relation "stud_emp" already exists ERROR: column "oid" of relation "stud_emp" already exists
-- --
-- TRANSACTION STUFF -- TRANSACTION STUFF
-- not in a xact -- not in a xact
abort; abort;
NOTICE: there is no transaction in progress NOTICE: there is no transaction in progress
@ -140,7 +134,6 @@ create aggregate newcnt1 (sfunc = int4inc,
ERROR: aggregate input type must be specified ERROR: aggregate input type must be specified
-- --
-- DROP INDEX -- DROP INDEX
-- missing index name -- missing index name
drop index; drop index;
ERROR: syntax error at or near ";" ERROR: syntax error at or near ";"
@ -156,7 +149,6 @@ drop index nonesuch;
ERROR: index "nonesuch" does not exist ERROR: index "nonesuch" does not exist
-- --
-- DROP AGGREGATE -- DROP AGGREGATE
-- missing aggregate name -- missing aggregate name
drop aggregate; drop aggregate;
ERROR: syntax error at or near ";" ERROR: syntax error at or near ";"
@ -183,7 +175,6 @@ drop aggregate newcnt (float4);
ERROR: aggregate newcnt(real) does not exist ERROR: aggregate newcnt(real) does not exist
-- --
-- DROP FUNCTION -- DROP FUNCTION
-- missing function name -- missing function name
drop function (); drop function ();
ERROR: syntax error at or near "(" ERROR: syntax error at or near "("
@ -199,7 +190,6 @@ drop function nonesuch();
ERROR: function nonesuch() does not exist ERROR: function nonesuch() does not exist
-- --
-- DROP TYPE -- DROP TYPE
-- missing type name -- missing type name
drop type; drop type;
ERROR: syntax error at or near ";" ERROR: syntax error at or near ";"
@ -215,7 +205,6 @@ drop type nonesuch;
ERROR: type "nonesuch" does not exist ERROR: type "nonesuch" does not exist
-- --
-- DROP OPERATOR -- DROP OPERATOR
-- missing everything -- missing everything
drop operator; drop operator;
ERROR: syntax error at or near ";" ERROR: syntax error at or near ";"
@ -279,7 +268,6 @@ LINE 1: drop operator = (int4, );
^ ^
-- --
-- DROP RULE -- DROP RULE
-- missing rule name -- missing rule name
drop rule; drop rule;
ERROR: syntax error at or near ";" ERROR: syntax error at or near ";"
@ -378,8 +366,8 @@ LINE 3: id3 INTEGER NOT NUL,
CREATE TABLE foo(id INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, CREATE TABLE foo(id INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL,
id4 INT4 UNIQUE NOT NULL, id5 TEXT UNIQUE NOT NULL); id4 INT4 UNIQUE NOT NULL, id5 TEXT UNIQUE NOT NULL);
ERROR: syntax error at or near "NUL" ERROR: syntax error at or near "NUL"
LINE 1: ...T NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, LINE 1: ...OT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL,
^ ^
-- long line to be truncated on the right -- long line to be truncated on the right
CREATE TABLE foo( CREATE TABLE foo(
id3 INTEGER NOT NUL, id4 INT4 UNIQUE NOT NULL, id5 TEXT UNIQUE NOT NULL, id INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY); id3 INTEGER NOT NUL, id4 INT4 UNIQUE NOT NULL, id5 TEXT UNIQUE NOT NULL, id INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY);
@ -406,8 +394,8 @@ NOT
NULL) NULL)
; ;
ERROR: syntax error at or near "NUL" ERROR: syntax error at or near "NUL"
LINE 4: ...T NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, LINE 4: ...OT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL,
^ ^
-- long line to be truncated on the right, many lines -- long line to be truncated on the right, many lines
CREATE CREATE
TEMPORARY TEMPORARY

2
src/test/regress/expected/rules.out
View File

@ -1394,14 +1394,12 @@ SELECT * FROM ruletest_tbl2;
create table rule_and_refint_t1 ( create table rule_and_refint_t1 (
id1a integer, id1a integer,
id1b integer, id1b integer,
primary key (id1a, id1b) primary key (id1a, id1b)
); );
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "rule_and_refint_t1_pkey" for table "rule_and_refint_t1" NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "rule_and_refint_t1_pkey" for table "rule_and_refint_t1"
create table rule_and_refint_t2 ( create table rule_and_refint_t2 (
id2a integer, id2a integer,
id2c integer, id2c integer,
primary key (id2a, id2c) primary key (id2a, id2c)
); );
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "rule_and_refint_t2_pkey" for table "rule_and_refint_t2" NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "rule_and_refint_t2_pkey" for table "rule_and_refint_t2"

3
src/test/regress/expected/select.out
View File

@ -80,7 +80,6 @@ SELECT onek.unique1, onek.stringu1 FROM onek
987 | ZLAAAA 987 | ZLAAAA
(19 rows) (19 rows)
-- --
-- awk '{if($1>980){print $1,$16;}else{next;}}' onek.data | -- awk '{if($1>980){print $1,$16;}else{next;}}' onek.data |
-- sort +1d -2 +0nr -1 -- sort +1d -2 +0nr -1
@ -111,7 +110,6 @@ SELECT onek.unique1, onek.string4 FROM onek
984 | VVVVxx 984 | VVVVxx
(19 rows) (19 rows)
-- --
-- awk '{if($1>980){print $1,$16;}else{next;}}' onek.data | -- awk '{if($1>980){print $1,$16;}else{next;}}' onek.data |
-- sort +1dr -2 +0n -1 -- sort +1dr -2 +0n -1
@ -142,7 +140,6 @@ SELECT onek.unique1, onek.string4 FROM onek
999 | AAAAxx 999 | AAAAxx
(19 rows) (19 rows)
-- --
-- awk '{if($1<20){print $1,$16;}else{next;}}' onek.data | -- awk '{if($1<20){print $1,$16;}else{next;}}' onek.data |
-- sort +0nr -1 +1d -2 -- sort +0nr -1 +1d -2

4
src/test/regress/expected/sequence.out
View File

@ -1,16 +1,13 @@
--- ---
--- test creation of SERIAL column --- test creation of SERIAL column
--- ---
CREATE TABLE serialTest (f1 text, f2 serial); CREATE TABLE serialTest (f1 text, f2 serial);
NOTICE: CREATE TABLE will create implicit sequence "serialtest_f2_seq" for serial column "serialtest.f2" NOTICE: CREATE TABLE will create implicit sequence "serialtest_f2_seq" for serial column "serialtest.f2"
INSERT INTO serialTest VALUES ('foo'); INSERT INTO serialTest VALUES ('foo');
INSERT INTO serialTest VALUES ('bar'); INSERT INTO serialTest VALUES ('bar');
INSERT INTO serialTest VALUES ('force', 100); INSERT INTO serialTest VALUES ('force', 100);
INSERT INTO serialTest VALUES ('wrong', NULL); INSERT INTO serialTest VALUES ('wrong', NULL);
ERROR: null value in column "f2" violates not-null constraint ERROR: null value in column "f2" violates not-null constraint
SELECT * FROM serialTest; SELECT * FROM serialTest;
f1 | f2 f1 | f2
-------+----- -------+-----
@ -21,7 +18,6 @@ SELECT * FROM serialTest;
-- basic sequence operations using both text and oid references -- basic sequence operations using both text and oid references
CREATE SEQUENCE sequence_test; CREATE SEQUENCE sequence_test;
SELECT nextval('sequence_test'::text); SELECT nextval('sequence_test'::text);
nextval nextval
--------- ---------

4
src/test/regress/expected/sequence_1.out
View File

@ -1,16 +1,13 @@
--- ---
--- test creation of SERIAL column --- test creation of SERIAL column
--- ---
CREATE TABLE serialTest (f1 text, f2 serial); CREATE TABLE serialTest (f1 text, f2 serial);
NOTICE: CREATE TABLE will create implicit sequence "serialtest_f2_seq" for serial column "serialtest.f2" NOTICE: CREATE TABLE will create implicit sequence "serialtest_f2_seq" for serial column "serialtest.f2"
INSERT INTO serialTest VALUES ('foo'); INSERT INTO serialTest VALUES ('foo');
INSERT INTO serialTest VALUES ('bar'); INSERT INTO serialTest VALUES ('bar');
INSERT INTO serialTest VALUES ('force', 100); INSERT INTO serialTest VALUES ('force', 100);
INSERT INTO serialTest VALUES ('wrong', NULL); INSERT INTO serialTest VALUES ('wrong', NULL);
ERROR: null value in column "f2" violates not-null constraint ERROR: null value in column "f2" violates not-null constraint
SELECT * FROM serialTest; SELECT * FROM serialTest;
f1 | f2 f1 | f2
-------+----- -------+-----
@ -21,7 +18,6 @@ SELECT * FROM serialTest;
-- basic sequence operations using both text and oid references -- basic sequence operations using both text and oid references
CREATE SEQUENCE sequence_test; CREATE SEQUENCE sequence_test;
SELECT nextval('sequence_test'::text); SELECT nextval('sequence_test'::text);
nextval nextval
--------- ---------

1
src/test/regress/expected/timestamp.out
View File

@ -1372,7 +1372,6 @@ SELECT '' AS to_char_8, to_char(d1, 'YYYYTH YYYYth Jth')
| 2001ST 2001st 2451911th | 2001ST 2001st 2451911th
(65 rows) (65 rows)
SELECT '' AS to_char_9, to_char(d1, 'YYYY A.D. YYYY a.d. YYYY bc HH:MI:SS P.M. HH:MI:SS p.m. HH:MI:SS pm') SELECT '' AS to_char_9, to_char(d1, 'YYYY A.D. YYYY a.d. YYYY bc HH:MI:SS P.M. HH:MI:SS p.m. HH:MI:SS pm')
FROM TIMESTAMP_TBL; FROM TIMESTAMP_TBL;
to_char_9 | to_char to_char_9 | to_char

5
src/test/regress/expected/timestamptz.out
View File

@ -955,7 +955,6 @@ SELECT '' AS to_char_1, to_char(d1, 'DAY Day day DY Dy dy MONTH Month month RM M
| MONDAY Monday monday MON Mon mon JANUARY January january I JAN Jan jan | MONDAY Monday monday MON Mon mon JANUARY January january I JAN Jan jan
(66 rows) (66 rows)
SELECT '' AS to_char_2, to_char(d1, 'FMDAY FMDay FMday FMMONTH FMMonth FMmonth FMRM') SELECT '' AS to_char_2, to_char(d1, 'FMDAY FMDay FMday FMMONTH FMMonth FMmonth FMRM')
FROM TIMESTAMPTZ_TBL; FROM TIMESTAMPTZ_TBL;
to_char_2 | to_char to_char_2 | to_char
@ -1100,7 +1099,6 @@ SELECT '' AS to_char_3, to_char(d1, 'Y,YYY YYYY YYY YY Y CC Q MM WW DDD DD D J')
| 2,001 2001 001 01 1 21 1 01 01 001 01 2 2451911 | 2,001 2001 001 01 1 21 1 01 01 001 01 2 2451911
(66 rows) (66 rows)
SELECT '' AS to_char_4, to_char(d1, 'FMY,YYY FMYYYY FMYYY FMYY FMY FMCC FMQ FMMM FMWW FMDDD FMDD FMD FMJ') SELECT '' AS to_char_4, to_char(d1, 'FMY,YYY FMYYYY FMYYY FMYY FMY FMCC FMQ FMMM FMWW FMDDD FMDD FMD FMJ')
FROM TIMESTAMPTZ_TBL; FROM TIMESTAMPTZ_TBL;
to_char_4 | to_char to_char_4 | to_char
@ -1173,7 +1171,6 @@ SELECT '' AS to_char_4, to_char(d1, 'FMY,YYY FMYYYY FMYYY FMYY FMY FMCC FMQ FMMM
| 2,001 2001 1 1 1 21 1 1 1 1 1 2 2451911 | 2,001 2001 1 1 1 21 1 1 1 1 1 2 2451911
(66 rows) (66 rows)
SELECT '' AS to_char_5, to_char(d1, 'HH HH12 HH24 MI SS SSSS') SELECT '' AS to_char_5, to_char(d1, 'HH HH12 HH24 MI SS SSSS')
FROM TIMESTAMPTZ_TBL; FROM TIMESTAMPTZ_TBL;
to_char_5 | to_char to_char_5 | to_char
@ -1318,7 +1315,6 @@ SELECT '' AS to_char_6, to_char(d1, E'"HH:MI:SS is" HH:MI:SS "\\"text between qu
| HH:MI:SS is 05:32:01 "text between quote marks" | HH:MI:SS is 05:32:01 "text between quote marks"
(66 rows) (66 rows)
SELECT '' AS to_char_7, to_char(d1, 'HH24--text--MI--text--SS') SELECT '' AS to_char_7, to_char(d1, 'HH24--text--MI--text--SS')
FROM TIMESTAMPTZ_TBL; FROM TIMESTAMPTZ_TBL;
to_char_7 | to_char to_char_7 | to_char
@ -1463,7 +1459,6 @@ SELECT '' AS to_char_8, to_char(d1, 'YYYYTH YYYYth Jth')
| 2001ST 2001st 2451911th | 2001ST 2001st 2451911th
(66 rows) (66 rows)
SELECT '' AS to_char_9, to_char(d1, 'YYYY A.D. YYYY a.d. YYYY bc HH:MI:SS P.M. HH:MI:SS p.m. HH:MI:SS pm') SELECT '' AS to_char_9, to_char(d1, 'YYYY A.D. YYYY a.d. YYYY bc HH:MI:SS P.M. HH:MI:SS p.m. HH:MI:SS pm')
FROM TIMESTAMPTZ_TBL; FROM TIMESTAMPTZ_TBL;
to_char_9 | to_char to_char_9 | to_char

1
src/test/regress/expected/transactions.out
View File

@ -179,7 +179,6 @@ BEGIN;
ROLLBACK; ROLLBACK;
COMMIT; -- should not be in a transaction block COMMIT; -- should not be in a transaction block
WARNING: there is no transaction in progress WARNING: there is no transaction in progress
SELECT * FROM savepoints; SELECT * FROM savepoints;
a a
--- ---

2
src/test/regress/expected/triggers.out
View File

@ -658,9 +658,7 @@ NOTICE: TG_TABLE_SCHEMA: public
NOTICE: TG_NARGS: 2 NOTICE: TG_NARGS: 2
NOTICE: TG_ARGV: [23, skidoo] NOTICE: TG_ARGV: [23, skidoo]
NOTICE: OLD: (1,update) NOTICE: OLD: (1,update)
DROP TRIGGER show_trigger_data_trig on trigger_test; DROP TRIGGER show_trigger_data_trig on trigger_test;
DROP FUNCTION trigger_data(); DROP FUNCTION trigger_data();
DROP TABLE trigger_test; DROP TABLE trigger_test;
-- --

1
src/test/regress/expected/tsearch.out
View File

@ -188,7 +188,6 @@ SELECT count(*) FROM test_tsvector WHERE a @@ 'w:*|q:*';
494 494
(1 row) (1 row)
RESET enable_seqscan; RESET enable_seqscan;
INSERT INTO test_tsvector VALUES ('???', 'DFG:1A,2B,6C,10 FGH'); INSERT INTO test_tsvector VALUES ('???', 'DFG:1A,2B,6C,10 FGH');
SELECT * FROM ts_stat('SELECT a FROM test_tsvector') ORDER BY ndoc DESC, nentry DESC, word LIMIT 10; SELECT * FROM ts_stat('SELECT a FROM test_tsvector') ORDER BY ndoc DESC, nentry DESC, word LIMIT 10;