diff options
Diffstat (limited to 'contrib')
89 files changed, 285 insertions, 289 deletions
diff --git a/contrib/README b/contrib/README index a04c04346ed..6d29cfe2b31 100644 --- a/contrib/README +++ b/contrib/README @@ -90,13 +90,13 @@ isn - lo - Large Object maintenance - by Peter Mount <peter@retep.org.uk> + by Peter Mount <peter@retep.org.uk> ltree - Tree-like data structures by Teodor Sigaev <teodor@sigaev.ru> and Oleg Bartunov <oleg@sai.msu.su> -oid2name - +oid2name - Maps numeric files to table names by B Palmer <bpalmer@crimelabs.net> @@ -161,7 +161,7 @@ sslinfo - Functions to get information about SSL certificates by Victor Wagner <vitus@cryptocom.ru> -start-scripts - +start-scripts - Scripts for starting the server at boot time on various platforms. tablefunc - diff --git a/contrib/btree_gin/Makefile b/contrib/btree_gin/Makefile index cba68af5959..8bc53f72daa 100644 --- a/contrib/btree_gin/Makefile +++ b/contrib/btree_gin/Makefile @@ -1,7 +1,7 @@ # contrib/btree_gin/Makefile MODULE_big = btree_gin -OBJS = btree_gin.o +OBJS = btree_gin.o DATA_built = btree_gin.sql DATA = uninstall_btree_gin.sql diff --git a/contrib/btree_gin/expected/cidr.out b/contrib/btree_gin/expected/cidr.out index 28ff9195b16..3d1198a4d74 100644 --- a/contrib/btree_gin/expected/cidr.out +++ b/contrib/btree_gin/expected/cidr.out @@ -2,7 +2,7 @@ set enable_seqscan=off; CREATE TABLE test_cidr ( i cidr ); -INSERT INTO test_cidr VALUES +INSERT INTO test_cidr VALUES ( '1.2.3.4' ), ( '1.2.4.4' ), ( '1.2.5.4' ), diff --git a/contrib/btree_gin/expected/date.out b/contrib/btree_gin/expected/date.out index 8da6ee4843c..40dfa308cf7 100644 --- a/contrib/btree_gin/expected/date.out +++ b/contrib/btree_gin/expected/date.out @@ -2,7 +2,7 @@ set enable_seqscan=off; CREATE TABLE test_date ( i date ); -INSERT INTO test_date VALUES +INSERT INTO test_date VALUES ( '2004-10-23' ), ( '2004-10-24' ), ( '2004-10-25' ), diff --git a/contrib/btree_gin/expected/inet.out b/contrib/btree_gin/expected/inet.out index bb2eaafc7f4..aa6147fb7d3 100644 --- a/contrib/btree_gin/expected/inet.out +++ b/contrib/btree_gin/expected/inet.out @@ -2,7 +2,7 @@ set enable_seqscan=off; CREATE TABLE test_inet ( i inet ); -INSERT INTO test_inet VALUES +INSERT INTO test_inet VALUES ( '1.2.3.4/16' ), ( '1.2.4.4/16' ), ( '1.2.5.4/16' ), diff --git a/contrib/btree_gin/expected/interval.out b/contrib/btree_gin/expected/interval.out index a3b99c1f283..1f6ef54070e 100644 --- a/contrib/btree_gin/expected/interval.out +++ b/contrib/btree_gin/expected/interval.out @@ -2,7 +2,7 @@ set enable_seqscan=off; CREATE TABLE test_interval ( i interval ); -INSERT INTO test_interval VALUES +INSERT INTO test_interval VALUES ( '03:55:08' ), ( '04:55:08' ), ( '05:55:08' ), diff --git a/contrib/btree_gin/expected/macaddr.out b/contrib/btree_gin/expected/macaddr.out index d26d1f9ad37..ebceb01862f 100644 --- a/contrib/btree_gin/expected/macaddr.out +++ b/contrib/btree_gin/expected/macaddr.out @@ -2,7 +2,7 @@ set enable_seqscan=off; CREATE TABLE test_macaddr ( i macaddr ); -INSERT INTO test_macaddr VALUES +INSERT INTO test_macaddr VALUES ( '22:00:5c:03:55:08' ), ( '22:00:5c:04:55:08' ), ( '22:00:5c:05:55:08' ), diff --git a/contrib/btree_gin/expected/time.out b/contrib/btree_gin/expected/time.out index bf65946835f..be6b084038c 100644 --- a/contrib/btree_gin/expected/time.out +++ b/contrib/btree_gin/expected/time.out @@ -2,7 +2,7 @@ set enable_seqscan=off; CREATE TABLE test_time ( i time ); -INSERT INTO test_time VALUES +INSERT INTO test_time VALUES ( '03:55:08' ), ( '04:55:08' ), ( '05:55:08' ), diff --git a/contrib/btree_gin/expected/timestamp.out b/contrib/btree_gin/expected/timestamp.out index 00b0b66106d..a236cdc94a9 100644 --- a/contrib/btree_gin/expected/timestamp.out +++ b/contrib/btree_gin/expected/timestamp.out @@ -2,7 +2,7 @@ set enable_seqscan=off; CREATE TABLE test_timestamp ( i timestamp ); -INSERT INTO test_timestamp VALUES +INSERT INTO test_timestamp VALUES ( '2004-10-26 03:55:08' ), ( '2004-10-26 04:55:08' ), ( '2004-10-26 05:55:08' ), diff --git a/contrib/btree_gin/expected/timestamptz.out b/contrib/btree_gin/expected/timestamptz.out index 8550d6b4d9f..d53963d2a04 100644 --- a/contrib/btree_gin/expected/timestamptz.out +++ b/contrib/btree_gin/expected/timestamptz.out @@ -2,7 +2,7 @@ set enable_seqscan=off; CREATE TABLE test_timestamptz ( i timestamptz ); -INSERT INTO test_timestamptz VALUES +INSERT INTO test_timestamptz VALUES ( '2004-10-26 03:55:08' ), ( '2004-10-26 04:55:08' ), ( '2004-10-26 05:55:08' ), diff --git a/contrib/btree_gin/expected/timetz.out b/contrib/btree_gin/expected/timetz.out index 184bc310f64..45aee71371b 100644 --- a/contrib/btree_gin/expected/timetz.out +++ b/contrib/btree_gin/expected/timetz.out @@ -2,7 +2,7 @@ set enable_seqscan=off; CREATE TABLE test_timetz ( i timetz ); -INSERT INTO test_timetz VALUES +INSERT INTO test_timetz VALUES ( '03:55:08 GMT+2' ), ( '04:55:08 GMT+2' ), ( '05:55:08 GMT+2' ), diff --git a/contrib/btree_gin/sql/cidr.sql b/contrib/btree_gin/sql/cidr.sql index a608a3ec78b..4a76e5f10b0 100644 --- a/contrib/btree_gin/sql/cidr.sql +++ b/contrib/btree_gin/sql/cidr.sql @@ -4,7 +4,7 @@ CREATE TABLE test_cidr ( i cidr ); -INSERT INTO test_cidr VALUES +INSERT INTO test_cidr VALUES ( '1.2.3.4' ), ( '1.2.4.4' ), ( '1.2.5.4' ), diff --git a/contrib/btree_gin/sql/date.sql b/contrib/btree_gin/sql/date.sql index c486f272a42..35086f6b81b 100644 --- a/contrib/btree_gin/sql/date.sql +++ b/contrib/btree_gin/sql/date.sql @@ -4,7 +4,7 @@ CREATE TABLE test_date ( i date ); -INSERT INTO test_date VALUES +INSERT INTO test_date VALUES ( '2004-10-23' ), ( '2004-10-24' ), ( '2004-10-25' ), diff --git a/contrib/btree_gin/sql/inet.sql b/contrib/btree_gin/sql/inet.sql index fadc1c47ec1..e5ec087856b 100644 --- a/contrib/btree_gin/sql/inet.sql +++ b/contrib/btree_gin/sql/inet.sql @@ -4,7 +4,7 @@ CREATE TABLE test_inet ( i inet ); -INSERT INTO test_inet VALUES +INSERT INTO test_inet VALUES ( '1.2.3.4/16' ), ( '1.2.4.4/16' ), ( '1.2.5.4/16' ), diff --git a/contrib/btree_gin/sql/interval.sql b/contrib/btree_gin/sql/interval.sql index f245e4d4b3b..e3851587833 100644 --- a/contrib/btree_gin/sql/interval.sql +++ b/contrib/btree_gin/sql/interval.sql @@ -4,7 +4,7 @@ CREATE TABLE test_interval ( i interval ); -INSERT INTO test_interval VALUES +INSERT INTO test_interval VALUES ( '03:55:08' ), ( '04:55:08' ), ( '05:55:08' ), diff --git a/contrib/btree_gin/sql/macaddr.sql b/contrib/btree_gin/sql/macaddr.sql index e0402869a8c..66566aa604f 100644 --- a/contrib/btree_gin/sql/macaddr.sql +++ b/contrib/btree_gin/sql/macaddr.sql @@ -4,7 +4,7 @@ CREATE TABLE test_macaddr ( i macaddr ); -INSERT INTO test_macaddr VALUES +INSERT INTO test_macaddr VALUES ( '22:00:5c:03:55:08' ), ( '22:00:5c:04:55:08' ), ( '22:00:5c:05:55:08' ), diff --git a/contrib/btree_gin/sql/time.sql b/contrib/btree_gin/sql/time.sql index afb1e16ebf4..62d709a8460 100644 --- a/contrib/btree_gin/sql/time.sql +++ b/contrib/btree_gin/sql/time.sql @@ -4,7 +4,7 @@ CREATE TABLE test_time ( i time ); -INSERT INTO test_time VALUES +INSERT INTO test_time VALUES ( '03:55:08' ), ( '04:55:08' ), ( '05:55:08' ), diff --git a/contrib/btree_gin/sql/timestamp.sql b/contrib/btree_gin/sql/timestamp.sql index 6e00cd7e40d..56727e81c4a 100644 --- a/contrib/btree_gin/sql/timestamp.sql +++ b/contrib/btree_gin/sql/timestamp.sql @@ -4,7 +4,7 @@ CREATE TABLE test_timestamp ( i timestamp ); -INSERT INTO test_timestamp VALUES +INSERT INTO test_timestamp VALUES ( '2004-10-26 03:55:08' ), ( '2004-10-26 04:55:08' ), ( '2004-10-26 05:55:08' ), diff --git a/contrib/btree_gin/sql/timestamptz.sql b/contrib/btree_gin/sql/timestamptz.sql index 26c01ef8047..e6cfdb1b074 100644 --- a/contrib/btree_gin/sql/timestamptz.sql +++ b/contrib/btree_gin/sql/timestamptz.sql @@ -4,7 +4,7 @@ CREATE TABLE test_timestamptz ( i timestamptz ); -INSERT INTO test_timestamptz VALUES +INSERT INTO test_timestamptz VALUES ( '2004-10-26 03:55:08' ), ( '2004-10-26 04:55:08' ), ( '2004-10-26 05:55:08' ), diff --git a/contrib/btree_gin/sql/timetz.sql b/contrib/btree_gin/sql/timetz.sql index a72b105fc15..ca947b753e4 100644 --- a/contrib/btree_gin/sql/timetz.sql +++ b/contrib/btree_gin/sql/timetz.sql @@ -4,7 +4,7 @@ CREATE TABLE test_timetz ( i timetz ); -INSERT INTO test_timetz VALUES +INSERT INTO test_timetz VALUES ( '03:55:08 GMT+2' ), ( '04:55:08 GMT+2' ), ( '05:55:08 GMT+2' ), diff --git a/contrib/btree_gist/btree_gist.sql.in b/contrib/btree_gist/btree_gist.sql.in index 339087018a6..01cd30f2def 100644 --- a/contrib/btree_gist/btree_gist.sql.in +++ b/contrib/btree_gist/btree_gist.sql.in @@ -136,7 +136,7 @@ LANGUAGE C IMMUTABLE STRICT; -- Create the operator class CREATE OPERATOR CLASS gist_oid_ops -DEFAULT FOR TYPE oid USING gist +DEFAULT FOR TYPE oid USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -194,7 +194,7 @@ LANGUAGE C IMMUTABLE STRICT; -- Create the operator class CREATE OPERATOR CLASS gist_int2_ops -DEFAULT FOR TYPE int2 USING gist +DEFAULT FOR TYPE int2 USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -251,7 +251,7 @@ LANGUAGE C IMMUTABLE STRICT; -- Create the operator class CREATE OPERATOR CLASS gist_int4_ops -DEFAULT FOR TYPE int4 USING gist +DEFAULT FOR TYPE int4 USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -308,7 +308,7 @@ LANGUAGE C IMMUTABLE STRICT; -- Create the operator class CREATE OPERATOR CLASS gist_int8_ops -DEFAULT FOR TYPE int8 USING gist +DEFAULT FOR TYPE int8 USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -366,7 +366,7 @@ LANGUAGE C IMMUTABLE STRICT; -- Create the operator class CREATE OPERATOR CLASS gist_float4_ops -DEFAULT FOR TYPE float4 USING gist +DEFAULT FOR TYPE float4 USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -426,7 +426,7 @@ LANGUAGE C IMMUTABLE STRICT; -- Create the operator class CREATE OPERATOR CLASS gist_float8_ops -DEFAULT FOR TYPE float8 USING gist +DEFAULT FOR TYPE float8 USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -448,7 +448,7 @@ AS -- -- -- timestamp ops --- +-- -- -- @@ -461,7 +461,7 @@ CREATE OR REPLACE FUNCTION gbt_tstz_consistent(internal,timestamptz,int2,oid,int RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; - + CREATE OR REPLACE FUNCTION gbt_ts_compress(internal) RETURNS internal AS 'MODULE_PATHNAME' @@ -476,12 +476,12 @@ CREATE OR REPLACE FUNCTION gbt_ts_penalty(internal,internal,internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; - + CREATE OR REPLACE FUNCTION gbt_ts_picksplit(internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; - + CREATE OR REPLACE FUNCTION gbt_ts_union(bytea, internal) RETURNS gbtreekey16 AS 'MODULE_PATHNAME' @@ -494,7 +494,7 @@ LANGUAGE C IMMUTABLE STRICT; -- Create the operator class CREATE OPERATOR CLASS gist_timestamp_ops -DEFAULT FOR TYPE timestamp USING gist +DEFAULT FOR TYPE timestamp USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -514,7 +514,7 @@ AS -- Create the operator class CREATE OPERATOR CLASS gist_timestamptz_ops -DEFAULT FOR TYPE timestamptz USING gist +DEFAULT FOR TYPE timestamptz USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -536,7 +536,7 @@ AS -- -- -- time ops --- +-- -- -- @@ -564,12 +564,12 @@ CREATE OR REPLACE FUNCTION gbt_time_penalty(internal,internal,internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; - + CREATE OR REPLACE FUNCTION gbt_time_picksplit(internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; - + CREATE OR REPLACE FUNCTION gbt_time_union(bytea, internal) RETURNS gbtreekey16 AS 'MODULE_PATHNAME' @@ -582,7 +582,7 @@ LANGUAGE C IMMUTABLE STRICT; -- Create the operator class CREATE OPERATOR CLASS gist_time_ops -DEFAULT FOR TYPE time USING gist +DEFAULT FOR TYPE time USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -600,7 +600,7 @@ AS STORAGE gbtreekey16; CREATE OPERATOR CLASS gist_timetz_ops -DEFAULT FOR TYPE timetz USING gist +DEFAULT FOR TYPE timetz USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -622,7 +622,7 @@ AS -- -- -- date ops --- +-- -- -- @@ -640,12 +640,12 @@ CREATE OR REPLACE FUNCTION gbt_date_penalty(internal,internal,internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; - + CREATE OR REPLACE FUNCTION gbt_date_picksplit(internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; - + CREATE OR REPLACE FUNCTION gbt_date_union(bytea, internal) RETURNS gbtreekey8 AS 'MODULE_PATHNAME' @@ -658,7 +658,7 @@ LANGUAGE C IMMUTABLE STRICT; -- Create the operator class CREATE OPERATOR CLASS gist_date_ops -DEFAULT FOR TYPE date USING gist +DEFAULT FOR TYPE date USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -680,7 +680,7 @@ AS -- -- -- interval ops --- +-- -- -- @@ -703,12 +703,12 @@ CREATE OR REPLACE FUNCTION gbt_intv_penalty(internal,internal,internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; - + CREATE OR REPLACE FUNCTION gbt_intv_picksplit(internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; - + CREATE OR REPLACE FUNCTION gbt_intv_union(bytea, internal) RETURNS gbtreekey32 AS 'MODULE_PATHNAME' @@ -721,7 +721,7 @@ LANGUAGE C IMMUTABLE STRICT; -- Create the operator class CREATE OPERATOR CLASS gist_interval_ops -DEFAULT FOR TYPE interval USING gist +DEFAULT FOR TYPE interval USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -778,7 +778,7 @@ LANGUAGE C IMMUTABLE STRICT; -- Create the operator class CREATE OPERATOR CLASS gist_cash_ops -DEFAULT FOR TYPE money USING gist +DEFAULT FOR TYPE money USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -835,7 +835,7 @@ LANGUAGE C IMMUTABLE STRICT; -- Create the operator class CREATE OPERATOR CLASS gist_macaddr_ops -DEFAULT FOR TYPE macaddr USING gist +DEFAULT FOR TYPE macaddr USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -904,7 +904,7 @@ LANGUAGE C IMMUTABLE STRICT; -- Create the operator class CREATE OPERATOR CLASS gist_text_ops -DEFAULT FOR TYPE text USING gist +DEFAULT FOR TYPE text USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -919,12 +919,12 @@ AS FUNCTION 5 gbt_text_penalty (internal, internal, internal), FUNCTION 6 gbt_text_picksplit (internal, internal), FUNCTION 7 gbt_text_same (internal, internal, internal), - STORAGE gbtreekey_var; + STORAGE gbtreekey_var; ---- Create the operator class CREATE OPERATOR CLASS gist_bpchar_ops -DEFAULT FOR TYPE bpchar USING gist +DEFAULT FOR TYPE bpchar USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -939,7 +939,7 @@ AS FUNCTION 5 gbt_text_penalty (internal, internal, internal), FUNCTION 6 gbt_text_picksplit (internal, internal), FUNCTION 7 gbt_text_same (internal, internal, internal), - STORAGE gbtreekey_var; + STORAGE gbtreekey_var; @@ -982,7 +982,7 @@ LANGUAGE C IMMUTABLE STRICT; -- Create the operator class CREATE OPERATOR CLASS gist_bytea_ops -DEFAULT FOR TYPE bytea USING gist +DEFAULT FOR TYPE bytea USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -997,7 +997,7 @@ AS FUNCTION 5 gbt_bytea_penalty (internal, internal, internal), FUNCTION 6 gbt_bytea_picksplit (internal, internal), FUNCTION 7 gbt_bytea_same (internal, internal, internal), - STORAGE gbtreekey_var; + STORAGE gbtreekey_var; -- @@ -1040,7 +1040,7 @@ LANGUAGE C IMMUTABLE STRICT; -- Create the operator class CREATE OPERATOR CLASS gist_numeric_ops -DEFAULT FOR TYPE numeric USING gist +DEFAULT FOR TYPE numeric USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -1055,7 +1055,7 @@ AS FUNCTION 5 gbt_numeric_penalty (internal, internal, internal), FUNCTION 6 gbt_numeric_picksplit (internal, internal), FUNCTION 7 gbt_numeric_same (internal, internal, internal), - STORAGE gbtreekey_var; + STORAGE gbtreekey_var; -- -- @@ -1096,7 +1096,7 @@ LANGUAGE C IMMUTABLE STRICT; -- Create the operator class CREATE OPERATOR CLASS gist_bit_ops -DEFAULT FOR TYPE bit USING gist +DEFAULT FOR TYPE bit USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -1111,12 +1111,12 @@ AS FUNCTION 5 gbt_bit_penalty (internal, internal, internal), FUNCTION 6 gbt_bit_picksplit (internal, internal), FUNCTION 7 gbt_bit_same (internal, internal, internal), - STORAGE gbtreekey_var; + STORAGE gbtreekey_var; -- Create the operator class CREATE OPERATOR CLASS gist_vbit_ops -DEFAULT FOR TYPE varbit USING gist +DEFAULT FOR TYPE varbit USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -1131,7 +1131,7 @@ AS FUNCTION 5 gbt_bit_penalty (internal, internal, internal), FUNCTION 6 gbt_bit_picksplit (internal, internal), FUNCTION 7 gbt_bit_same (internal, internal, internal), - STORAGE gbtreekey_var; + STORAGE gbtreekey_var; @@ -1175,7 +1175,7 @@ LANGUAGE C IMMUTABLE STRICT; -- Create the operator class CREATE OPERATOR CLASS gist_inet_ops -DEFAULT FOR TYPE inet USING gist +DEFAULT FOR TYPE inet USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -1194,14 +1194,14 @@ AS -- Create the operator class CREATE OPERATOR CLASS gist_cidr_ops -DEFAULT FOR TYPE cidr USING gist +DEFAULT FOR TYPE cidr USING gist AS OPERATOR 1 < (inet, inet) , OPERATOR 2 <= (inet, inet) , OPERATOR 3 = (inet, inet) , OPERATOR 4 >= (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 2 gbt_inet_union (bytea, internal), FUNCTION 3 gbt_inet_compress (internal), diff --git a/contrib/btree_gist/uninstall_btree_gist.sql b/contrib/btree_gist/uninstall_btree_gist.sql index 4163730e85a..30b9da4c73c 100644 --- a/contrib/btree_gist/uninstall_btree_gist.sql +++ b/contrib/btree_gist/uninstall_btree_gist.sql @@ -116,9 +116,9 @@ DROP OPERATOR CLASS gist_interval_ops USING gist; DROP FUNCTION gbt_intv_same(internal, internal, internal); DROP FUNCTION gbt_intv_union(bytea, internal); - + DROP FUNCTION gbt_intv_picksplit(internal, internal); - + DROP FUNCTION gbt_intv_penalty(internal,internal,internal); DROP FUNCTION gbt_intv_decompress(internal); @@ -132,9 +132,9 @@ DROP OPERATOR CLASS gist_date_ops USING gist; DROP FUNCTION gbt_date_same(internal, internal, internal); DROP FUNCTION gbt_date_union(bytea, internal); - + DROP FUNCTION gbt_date_picksplit(internal, internal); - + DROP FUNCTION gbt_date_penalty(internal,internal,internal); DROP FUNCTION gbt_date_compress(internal); @@ -148,9 +148,9 @@ DROP OPERATOR CLASS gist_time_ops USING gist; DROP FUNCTION gbt_time_same(internal, internal, internal); DROP FUNCTION gbt_time_union(bytea, internal); - + DROP FUNCTION gbt_time_picksplit(internal, internal); - + DROP FUNCTION gbt_time_penalty(internal,internal,internal); DROP FUNCTION gbt_timetz_compress(internal); @@ -168,15 +168,15 @@ DROP OPERATOR CLASS gist_timestamp_ops USING gist; DROP FUNCTION gbt_ts_same(internal, internal, internal); DROP FUNCTION gbt_ts_union(bytea, internal); - + DROP FUNCTION gbt_ts_picksplit(internal, internal); - + DROP FUNCTION gbt_ts_penalty(internal,internal,internal); DROP FUNCTION gbt_tstz_compress(internal); DROP FUNCTION gbt_ts_compress(internal); - + DROP FUNCTION gbt_tstz_consistent(internal,timestamptz,int2,oid,internal); DROP FUNCTION gbt_ts_consistent(internal,timestamp,int2,oid,internal); diff --git a/contrib/citext/citext.sql.in b/contrib/citext/citext.sql.in index 0aef0ad947a..1e75b55397a 100644 --- a/contrib/citext/citext.sql.in +++ b/contrib/citext/citext.sql.in @@ -343,7 +343,7 @@ CREATE OPERATOR !~~* ( ); -- --- Matching citext to text. +-- Matching citext to text. -- CREATE OR REPLACE FUNCTION texticlike(citext, text) diff --git a/contrib/citext/expected/citext.out b/contrib/citext/expected/citext.out index 21e73be2d75..66ea5ee6ff5 100644 --- a/contrib/citext/expected/citext.out +++ b/contrib/citext/expected/citext.out @@ -1046,7 +1046,7 @@ CREATE TABLE caster ( bpchar bpchar, char char, chr "char", - name name, + name name, bytea bytea, boolean boolean, float4 float4, @@ -1055,7 +1055,7 @@ CREATE TABLE caster ( int8 int8, int4 int4, int2 int2, - cidr cidr, + cidr cidr, inet inet, macaddr macaddr, money money, diff --git a/contrib/citext/expected/citext_1.out b/contrib/citext/expected/citext_1.out index 5fa537bc198..c5ca1f6c541 100644 --- a/contrib/citext/expected/citext_1.out +++ b/contrib/citext/expected/citext_1.out @@ -1046,7 +1046,7 @@ CREATE TABLE caster ( bpchar bpchar, char char, chr "char", - name name, + name name, bytea bytea, boolean boolean, float4 float4, @@ -1055,7 +1055,7 @@ CREATE TABLE caster ( int8 int8, int4 int4, int2 int2, - cidr cidr, + cidr cidr, inet inet, macaddr macaddr, money money, diff --git a/contrib/citext/sql/citext.sql b/contrib/citext/sql/citext.sql index 9014e5d931a..2f9b46665c8 100644 --- a/contrib/citext/sql/citext.sql +++ b/contrib/citext/sql/citext.sql @@ -302,7 +302,7 @@ CREATE TABLE caster ( bpchar bpchar, char char, chr "char", - name name, + name name, bytea bytea, boolean boolean, float4 float4, @@ -311,7 +311,7 @@ CREATE TABLE caster ( int8 int8, int4 int4, int2 int2, - cidr cidr, + cidr cidr, inet inet, macaddr macaddr, money money, diff --git a/contrib/cube/CHANGES b/contrib/cube/CHANGES index d3eca90f6d8..7c5590c16f7 100644 --- a/contrib/cube/CHANGES +++ b/contrib/cube/CHANGES @@ -6,10 +6,10 @@ Code Cleanup: Update the calling convention for all external facing functions. By external facing, I mean all functions that are directly referenced in cube.sql. Prior -to my update, all functions used the older V0 calling convention. They now +to my update, all functions used the older V0 calling convention. They now use V1. -New Functions: +New Functions: cube(float[]), which makes a zero volume cube from a float array diff --git a/contrib/cube/cube.sql.in b/contrib/cube/cube.sql.in index 3cd199530ab..a7e6b1d2b97 100644 --- a/contrib/cube/cube.sql.in +++ b/contrib/cube/cube.sql.in @@ -4,7 +4,7 @@ SET search_path = public; -- Create the user-defined type for N-dimensional boxes --- +-- CREATE OR REPLACE FUNCTION cube_in(cstring) RETURNS cube @@ -268,12 +268,12 @@ AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; CREATE OR REPLACE FUNCTION g_cube_compress(internal) -RETURNS internal +RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; CREATE OR REPLACE FUNCTION g_cube_decompress(internal) -RETURNS internal +RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; @@ -288,12 +288,12 @@ AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; CREATE OR REPLACE FUNCTION g_cube_union(internal, internal) -RETURNS cube +RETURNS cube AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; CREATE OR REPLACE FUNCTION g_cube_same(cube, cube, internal) -RETURNS internal +RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; diff --git a/contrib/cube/cubeparse.y b/contrib/cube/cubeparse.y index d02941dd8ca..9e7c87e9036 100644 --- a/contrib/cube/cubeparse.y +++ b/contrib/cube/cubeparse.y @@ -51,7 +51,7 @@ box: O_BRACKET paren_list COMMA paren_list C_BRACKET { int dim; - + dim = delim_count($2, ',') + 1; if ( (delim_count($4, ',') + 1) != dim ) { ereport(ERROR, @@ -69,16 +69,16 @@ box: CUBE_MAX_DIM))); YYABORT; } - + *((void **)result) = write_box( dim, $2, $4 ); - + } | paren_list COMMA paren_list { int dim; dim = delim_count($1, ',') + 1; - + if ( (delim_count($3, ',') + 1) != dim ) { ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), @@ -95,7 +95,7 @@ box: CUBE_MAX_DIM))); YYABORT; } - + *((void **)result) = write_box( dim, $1, $3 ); } | @@ -146,7 +146,7 @@ list: $$ = palloc(scanbuflen + 1); strcpy($$, $1); } - | + | list COMMA CUBEFLOAT { $$ = $1; strcat($$, ","); @@ -169,31 +169,31 @@ delim_count(char *s, char delim) return (ndelim); } -static NDBOX * +static NDBOX * write_box(unsigned int dim, char *str1, char *str2) { NDBOX * bp; char * s; - int i; + int i; int size = offsetof(NDBOX, x[0]) + sizeof(double) * dim * 2; - + bp = palloc0(size); SET_VARSIZE(bp, size); bp->dim = dim; - + s = str1; bp->x[i=0] = strtod(s, NULL); while ((s = strchr(s, ',')) != NULL) { s++; i++; bp->x[i] = strtod(s, NULL); - } - + } + s = str2; bp->x[i=dim] = strtod(s, NULL); while ((s = strchr(s, ',')) != NULL) { s++; i++; bp->x[i] = strtod(s, NULL); - } + } return(bp); } @@ -206,13 +206,13 @@ write_point_as_box(char *str, int dim) int i, size; double x; char * s = str; - + size = offsetof(NDBOX, x[0]) + sizeof(double) * dim * 2; bp = palloc0(size); SET_VARSIZE(bp, size); bp->dim = dim; - + i = 0; x = strtod(s, NULL); bp->x[0] = x; @@ -222,7 +222,7 @@ write_point_as_box(char *str, int dim) x = strtod(s, NULL); bp->x[i] = x; bp->x[i+dim] = x; - } + } return(bp); } diff --git a/contrib/cube/cubescan.l b/contrib/cube/cubescan.l index b0e477bf1e6..eb71b11adff 100644 --- a/contrib/cube/cubescan.l +++ b/contrib/cube/cubescan.l @@ -1,8 +1,8 @@ %{ -/* -** A scanner for EMP-style numeric ranges +/* + * A scanner for EMP-style numeric ranges * contrib/cube/cubescan.l -*/ + */ #include "postgres.h" diff --git a/contrib/cube/expected/cube.out b/contrib/cube/expected/cube.out index 101a63b7236..ae7b5b22c2f 100644 --- a/contrib/cube/expected/cube.out +++ b/contrib/cube/expected/cube.out @@ -473,13 +473,13 @@ SELECT cube('{0,1,2}'::float[]); (0, 1, 2) (1 row) -SELECT cube_subset(cube('(1,3,5),(6,7,8)'), ARRAY[3,2,1,1]); +SELECT cube_subset(cube('(1,3,5),(6,7,8)'), ARRAY[3,2,1,1]); cube_subset --------------------------- (5, 3, 1, 1),(8, 7, 6, 6) (1 row) -SELECT cube_subset(cube('(1,3,5),(6,7,8)'), ARRAY[4,0]); +SELECT cube_subset(cube('(1,3,5),(6,7,8)'), ARRAY[4,0]); ERROR: Index out of bounds -- -- Testing limit of CUBE_MAX_DIM dimensions check in cube_in. @@ -1107,11 +1107,11 @@ SELECT cube_enlarge('(2,-2),(-3,7)'::cube, -3, 2); (1 row) -- Load some example data and build the index --- +-- CREATE TABLE test_cube (c cube); \copy test_cube from 'data/test_cube.data' 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 -------------------------- (337, 455),(240, 359) @@ -1121,8 +1121,8 @@ SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' ORDER BY c; (2424, 160),(2424, 81) (5 rows) --- Test sorting -SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' GROUP BY c ORDER BY c; +-- Test sorting +SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' GROUP BY c ORDER BY c; c -------------------------- (337, 455),(240, 359) diff --git a/contrib/cube/expected/cube_1.out b/contrib/cube/expected/cube_1.out index 55f6861dafb..f27e832d631 100644 --- a/contrib/cube/expected/cube_1.out +++ b/contrib/cube/expected/cube_1.out @@ -473,13 +473,13 @@ SELECT cube('{0,1,2}'::float[]); (0, 1, 2) (1 row) -SELECT cube_subset(cube('(1,3,5),(6,7,8)'), ARRAY[3,2,1,1]); +SELECT cube_subset(cube('(1,3,5),(6,7,8)'), ARRAY[3,2,1,1]); cube_subset --------------------------- (5, 3, 1, 1),(8, 7, 6, 6) (1 row) -SELECT cube_subset(cube('(1,3,5),(6,7,8)'), ARRAY[4,0]); +SELECT cube_subset(cube('(1,3,5),(6,7,8)'), ARRAY[4,0]); ERROR: Index out of bounds -- -- Testing limit of CUBE_MAX_DIM dimensions check in cube_in. @@ -1107,11 +1107,11 @@ SELECT cube_enlarge('(2,-2),(-3,7)'::cube, -3, 2); (1 row) -- Load some example data and build the index --- +-- CREATE TABLE test_cube (c cube); \copy test_cube from 'data/test_cube.data' 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 -------------------------- (337, 455),(240, 359) @@ -1121,8 +1121,8 @@ SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' ORDER BY c; (2424, 160),(2424, 81) (5 rows) --- Test sorting -SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' GROUP BY c ORDER BY c; +-- Test sorting +SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' GROUP BY c ORDER BY c; c -------------------------- (337, 455),(240, 359) diff --git a/contrib/cube/expected/cube_2.out b/contrib/cube/expected/cube_2.out index c4493958180..f534ccf0b53 100644 --- a/contrib/cube/expected/cube_2.out +++ b/contrib/cube/expected/cube_2.out @@ -473,13 +473,13 @@ SELECT cube('{0,1,2}'::float[]); (0, 1, 2) (1 row) -SELECT cube_subset(cube('(1,3,5),(6,7,8)'), ARRAY[3,2,1,1]); +SELECT cube_subset(cube('(1,3,5),(6,7,8)'), ARRAY[3,2,1,1]); cube_subset --------------------------- (5, 3, 1, 1),(8, 7, 6, 6) (1 row) -SELECT cube_subset(cube('(1,3,5),(6,7,8)'), ARRAY[4,0]); +SELECT cube_subset(cube('(1,3,5),(6,7,8)'), ARRAY[4,0]); ERROR: Index out of bounds -- -- Testing limit of CUBE_MAX_DIM dimensions check in cube_in. @@ -1107,11 +1107,11 @@ SELECT cube_enlarge('(2,-2),(-3,7)'::cube, -3, 2); (1 row) -- Load some example data and build the index --- +-- CREATE TABLE test_cube (c cube); \copy test_cube from 'data/test_cube.data' 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 -------------------------- (337, 455),(240, 359) @@ -1121,8 +1121,8 @@ SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' ORDER BY c; (2424, 160),(2424, 81) (5 rows) --- Test sorting -SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' GROUP BY c ORDER BY c; +-- Test sorting +SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' GROUP BY c ORDER BY c; c -------------------------- (337, 455),(240, 359) diff --git a/contrib/cube/sql/cube.sql b/contrib/cube/sql/cube.sql index 1931dfbc803..5c12183dfd7 100644 --- a/contrib/cube/sql/cube.sql +++ b/contrib/cube/sql/cube.sql @@ -119,8 +119,8 @@ SELECT cube('{0,1,2}'::float[], '{3,4,5}'::float[]); SELECT cube('{0,1,2}'::float[], '{3}'::float[]); SELECT cube(NULL::float[], '{3}'::float[]); SELECT cube('{0,1,2}'::float[]); -SELECT cube_subset(cube('(1,3,5),(6,7,8)'), ARRAY[3,2,1,1]); -SELECT cube_subset(cube('(1,3,5),(6,7,8)'), ARRAY[4,0]); +SELECT cube_subset(cube('(1,3,5),(6,7,8)'), ARRAY[3,2,1,1]); +SELECT cube_subset(cube('(1,3,5),(6,7,8)'), ARRAY[4,0]); -- -- Testing limit of CUBE_MAX_DIM dimensions check in cube_in. @@ -275,13 +275,13 @@ SELECT cube_enlarge('(2,-2),(-3,7)'::cube, -1, 2); SELECT cube_enlarge('(2,-2),(-3,7)'::cube, -3, 2); -- Load some example data and build the index --- +-- CREATE TABLE test_cube (c cube); \copy test_cube from 'data/test_cube.data' 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 -SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' GROUP BY c ORDER BY c; +-- Test sorting +SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' GROUP BY c ORDER BY c; diff --git a/contrib/dblink/Makefile b/contrib/dblink/Makefile index cc59128cb2a..fdfd03a4cf7 100644 --- a/contrib/dblink/Makefile +++ b/contrib/dblink/Makefile @@ -6,8 +6,8 @@ OBJS = dblink.o SHLIB_LINK = $(libpq) SHLIB_PREREQS = submake-libpq -DATA_built = dblink.sql -DATA = uninstall_dblink.sql +DATA_built = dblink.sql +DATA = uninstall_dblink.sql REGRESS = dblink diff --git a/contrib/dblink/dblink.sql.in b/contrib/dblink/dblink.sql.in index acad2c94d0f..3c9d66e7df1 100644 --- a/contrib/dblink/dblink.sql.in +++ b/contrib/dblink/dblink.sql.in @@ -207,7 +207,7 @@ CREATE OR REPLACE FUNCTION dblink_get_notify( OUT notify_name TEXT, OUT be_pid INT4, OUT extra TEXT -) +) RETURNS setof record AS 'MODULE_PATHNAME', 'dblink_get_notify' LANGUAGE C STRICT; @@ -217,7 +217,7 @@ CREATE OR REPLACE FUNCTION dblink_get_notify( OUT notify_name TEXT, OUT be_pid INT4, OUT extra TEXT -) +) RETURNS setof record AS 'MODULE_PATHNAME', 'dblink_get_notify' LANGUAGE C STRICT; diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out index c59a67c7374..15848dd9229 100644 --- a/contrib/dblink/expected/dblink.out +++ b/contrib/dblink/expected/dblink.out @@ -668,7 +668,7 @@ SELECT dblink_connect('dtest1', 'dbname=contrib_regression'); OK (1 row) -SELECT * from +SELECT * from dblink_send_query('dtest1', 'select * from foo where f1 < 3') as t1; t1 ---- @@ -681,7 +681,7 @@ SELECT dblink_connect('dtest2', 'dbname=contrib_regression'); OK (1 row) -SELECT * from +SELECT * from dblink_send_query('dtest2', 'select * from foo where f1 > 2 and f1 < 7') as t1; t1 ---- @@ -694,7 +694,7 @@ SELECT dblink_connect('dtest3', 'dbname=contrib_regression'); OK (1 row) -SELECT * from +SELECT * from dblink_send_query('dtest3', 'select * from foo where f1 > 6') as t1; t1 ---- @@ -768,7 +768,7 @@ SELECT dblink_connect('dtest1', 'dbname=contrib_regression'); OK (1 row) -SELECT * from +SELECT * from dblink_send_query('dtest1', 'select * from foo where f1 < 3') as t1; t1 ---- diff --git a/contrib/dblink/sql/dblink.sql b/contrib/dblink/sql/dblink.sql index a6d7811bfc8..062bc9ee0ee 100644 --- a/contrib/dblink/sql/dblink.sql +++ b/contrib/dblink/sql/dblink.sql @@ -327,15 +327,15 @@ SELECT dblink_disconnect('myconn'); -- test asynchronous queries SELECT dblink_connect('dtest1', 'dbname=contrib_regression'); -SELECT * from +SELECT * from dblink_send_query('dtest1', 'select * from foo where f1 < 3') as t1; SELECT dblink_connect('dtest2', 'dbname=contrib_regression'); -SELECT * from +SELECT * from dblink_send_query('dtest2', 'select * from foo where f1 > 2 and f1 < 7') as t1; SELECT dblink_connect('dtest3', 'dbname=contrib_regression'); -SELECT * from +SELECT * from dblink_send_query('dtest3', 'select * from foo where f1 > 6') as t1; CREATE TEMPORARY TABLE result AS @@ -364,7 +364,7 @@ SELECT dblink_disconnect('dtest3'); SELECT * from result; SELECT dblink_connect('dtest1', 'dbname=contrib_regression'); -SELECT * from +SELECT * from dblink_send_query('dtest1', 'select * from foo where f1 < 3') as t1; SELECT dblink_cancel_query('dtest1'); diff --git a/contrib/earthdistance/earthdistance.sql.in b/contrib/earthdistance/earthdistance.sql.in index a4799914bd0..a4ce8125846 100644 --- a/contrib/earthdistance/earthdistance.sql.in +++ b/contrib/earthdistance/earthdistance.sql.in @@ -35,7 +35,7 @@ CREATE DOMAIN earth AS cube CONSTRAINT on_surface check(abs(cube_distance(value, '(0)'::cube) / earth() - 1) < '10e-7'::float8); -CREATE OR REPLACE FUNCTION sec_to_gc(float8) +CREATE OR REPLACE FUNCTION sec_to_gc(float8) RETURNS float8 LANGUAGE SQL IMMUTABLE STRICT @@ -76,7 +76,7 @@ RETURNS cube LANGUAGE SQL IMMUTABLE STRICT AS 'SELECT cube_enlarge($1, gc_to_sec($2), 3)'; - + --------------- geo_distance CREATE OR REPLACE FUNCTION geo_distance (point, point) diff --git a/contrib/fuzzystrmatch/fuzzystrmatch.sql.in b/contrib/fuzzystrmatch/fuzzystrmatch.sql.in index 0e75491cbe3..0f2ea85e489 100644 --- a/contrib/fuzzystrmatch/fuzzystrmatch.sql.in +++ b/contrib/fuzzystrmatch/fuzzystrmatch.sql.in @@ -35,10 +35,10 @@ CREATE OR REPLACE FUNCTION difference(text,text) RETURNS int AS 'MODULE_PATHNAME', 'difference' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION dmetaphone (text) RETURNS text +CREATE OR REPLACE FUNCTION dmetaphone (text) RETURNS text AS 'MODULE_PATHNAME', 'dmetaphone' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION dmetaphone_alt (text) RETURNS text +CREATE OR REPLACE FUNCTION dmetaphone_alt (text) RETURNS text AS 'MODULE_PATHNAME', 'dmetaphone_alt' LANGUAGE C IMMUTABLE STRICT; diff --git a/contrib/hstore/expected/hstore.out b/contrib/hstore/expected/hstore.out index 0ed109203cf..19dd299af75 100644 --- a/contrib/hstore/expected/hstore.out +++ b/contrib/hstore/expected/hstore.out @@ -438,7 +438,7 @@ select hstore 'a=>NULL, b=>qq' ?& '{}'::text[]; f (1 row) --- delete +-- delete select delete('a=>1 , b=>2, c=>3'::hstore, 'a'); delete -------------------- diff --git a/contrib/hstore/sql/hstore.sql b/contrib/hstore/sql/hstore.sql index 76f742299ea..58a79675267 100644 --- a/contrib/hstore/sql/hstore.sql +++ b/contrib/hstore/sql/hstore.sql @@ -97,7 +97,7 @@ select hstore 'a=>NULL, b=>qq' ?& ARRAY['c','a']; select hstore 'a=>NULL, b=>qq' ?& ARRAY['c','d']; select hstore 'a=>NULL, b=>qq' ?& '{}'::text[]; --- delete +-- delete select delete('a=>1 , b=>2, c=>3'::hstore, 'a'); select delete('a=>null , b=>2, c=>3'::hstore, 'a'); diff --git a/contrib/intarray/Makefile b/contrib/intarray/Makefile index 18340f9d71b..a10d7c6b1f9 100644 --- a/contrib/intarray/Makefile +++ b/contrib/intarray/Makefile @@ -1,7 +1,7 @@ # contrib/intarray/Makefile MODULE_big = _int -OBJS = _int_bool.o _int_gist.o _int_op.o _int_tool.o _intbig_gist.o _int_gin.o +OBJS = _int_bool.o _int_gist.o _int_op.o _int_tool.o _intbig_gist.o _int_gin.o DATA_built = _int.sql DATA = uninstall__int.sql REGRESS = _int diff --git a/contrib/intarray/bench/bench.pl b/contrib/intarray/bench/bench.pl index 18872119899..4e18624b9c2 100755 --- a/contrib/intarray/bench/bench.pl +++ b/contrib/intarray/bench/bench.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/perl use strict; # make sure we are in a sane environment. @@ -14,16 +14,16 @@ if ( !( scalar %opt && defined $opt{s} ) ) { print <<EOT; Usage: $0 -d DATABASE -s SECTIONS [-b NUMBER] [-v] [-e] [-o] [-r] [-a] [-u] --d DATABASE -DATABASE --b NUMBER -number of repeats --s SECTIONS -sections, format sid1[,sid2[,sid3[...]]]] --v -verbose (show SQL) +-d DATABASE -DATABASE +-b NUMBER -number of repeats +-s SECTIONS -sections, format sid1[,sid2[,sid3[...]]]] +-v -verbose (show SQL) -e -show explain -r -use RD-tree index -a -AND section -o -show output -u -unique --c -count +-c -count EOT exit; @@ -87,19 +87,19 @@ if ( $opt{o} ) { foreach ( @a ) { print "$_->{mid}\t$_->{sections}\n"; } -} +} print sprintf("total: %.02f sec; number: %d; for one: %.03f sec; found %d docs\n", $elapsed, $b, $elapsed/$b, $count+1 ); $dbi -> disconnect; sub exec_sql { my ($dbi, $sql, @keys) = @_; my $sth=$dbi->prepare($sql) || die; - $sth->execute( @keys ) || die; - my $r; + $sth->execute( @keys ) || die; + my $r; my @row; while ( defined ( $r=$sth->fetchrow_hashref ) ) { push @row, $r; - } - $sth->finish; + } + $sth->finish; return @row; } diff --git a/contrib/intarray/bench/create_test.pl b/contrib/intarray/bench/create_test.pl index 3a5e96301bf..67394f87b70 100755 --- a/contrib/intarray/bench/create_test.pl +++ b/contrib/intarray/bench/create_test.pl @@ -9,7 +9,7 @@ create table message ( sections int[] ); create table message_section_map ( - mid int not null, + mid int not null, sid int not null ); @@ -66,7 +66,7 @@ unlink 'message.tmp', 'message_section_map.tmp'; sub copytable { my $t = shift; - + print "COPY $t from stdin;\n"; open( FFF, "$t.tmp") || die; while(<FFF>) { print; } diff --git a/contrib/isn/ISBN.h b/contrib/isn/ISBN.h index 6e6d95b09fa..c0301ced1e0 100644 --- a/contrib/isn/ISBN.h +++ b/contrib/isn/ISBN.h @@ -32,7 +32,7 @@ * For ISBN with prefix 978 * Range Table as of 2010-Jul-29 */ - + /* where the digit set begins, and how many of them are in the table */ const unsigned ISBN_index[10][2] = { {0, 6}, diff --git a/contrib/ltree/ltree.sql.in b/contrib/ltree/ltree.sql.in index 4ea6277c576..1b985a7a995 100644 --- a/contrib/ltree/ltree.sql.in +++ b/contrib/ltree/ltree.sql.in @@ -482,18 +482,18 @@ CREATE OR REPLACE FUNCTION ltree_gist_in(cstring) RETURNS ltree_gist AS 'MODULE_PATHNAME' LANGUAGE C STRICT; - + CREATE OR REPLACE FUNCTION ltree_gist_out(ltree_gist) RETURNS cstring AS 'MODULE_PATHNAME' LANGUAGE C STRICT; - + CREATE TYPE ltree_gist ( internallength = -1, input = ltree_gist_in, output = ltree_gist_out, storage = plain -); +); CREATE OR REPLACE FUNCTION ltree_consistent(internal,internal,int2,oid,internal) diff --git a/contrib/ltree/uninstall_ltree.sql b/contrib/ltree/uninstall_ltree.sql index 07ce1189b5f..2e10b10e97e 100644 --- a/contrib/ltree/uninstall_ltree.sql +++ b/contrib/ltree/uninstall_ltree.sql @@ -110,7 +110,7 @@ DROP FUNCTION ltree_compress(internal); DROP FUNCTION ltree_consistent(internal,internal,int2,oid,internal); DROP TYPE ltree_gist CASCADE; - + DROP OPERATOR ^@ (ltxtquery, ltree); DROP OPERATOR ^@ (ltree, ltxtquery); diff --git a/contrib/pg_buffercache/Makefile b/contrib/pg_buffercache/Makefile index 6a47a2241ee..ffcf0c3b928 100644 --- a/contrib/pg_buffercache/Makefile +++ b/contrib/pg_buffercache/Makefile @@ -1,10 +1,10 @@ # contrib/pg_buffercache/Makefile MODULE_big = pg_buffercache -OBJS = pg_buffercache_pages.o +OBJS = pg_buffercache_pages.o -DATA_built = pg_buffercache.sql -DATA = uninstall_pg_buffercache.sql +DATA_built = pg_buffercache.sql +DATA = uninstall_pg_buffercache.sql ifdef USE_PGXS PG_CONFIG = pg_config diff --git a/contrib/pg_buffercache/pg_buffercache.sql.in b/contrib/pg_buffercache/pg_buffercache.sql.in index b23e94ed124..88b5e643acd 100644 --- a/contrib/pg_buffercache/pg_buffercache.sql.in +++ b/contrib/pg_buffercache/pg_buffercache.sql.in @@ -12,9 +12,9 @@ LANGUAGE C; -- Create a view for convenient access. CREATE VIEW pg_buffercache AS 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); - + -- Don't want these to be available at public. REVOKE ALL ON FUNCTION pg_buffercache_pages() FROM PUBLIC; REVOKE ALL ON pg_buffercache FROM PUBLIC; diff --git a/contrib/pg_freespacemap/Makefile b/contrib/pg_freespacemap/Makefile index da335a86ca9..65539d5d716 100644 --- a/contrib/pg_freespacemap/Makefile +++ b/contrib/pg_freespacemap/Makefile @@ -1,10 +1,10 @@ # contrib/pg_freespacemap/Makefile MODULE_big = pg_freespacemap -OBJS = pg_freespacemap.o +OBJS = pg_freespacemap.o -DATA_built = pg_freespacemap.sql -DATA = uninstall_pg_freespacemap.sql +DATA_built = pg_freespacemap.sql +DATA = uninstall_pg_freespacemap.sql ifdef USE_PGXS PG_CONFIG = pg_config diff --git a/contrib/pg_trgm/pg_trgm.sql.in b/contrib/pg_trgm/pg_trgm.sql.in index b1f094ab407..cce6cd9872f 100644 --- a/contrib/pg_trgm/pg_trgm.sql.in +++ b/contrib/pg_trgm/pg_trgm.sql.in @@ -59,7 +59,7 @@ CREATE OR REPLACE FUNCTION gtrgm_consistent(internal,text,int,oid,internal) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; - + CREATE OR REPLACE FUNCTION gtrgm_compress(internal) RETURNS internal AS 'MODULE_PATHNAME' diff --git a/contrib/pg_trgm/uninstall_pg_trgm.sql b/contrib/pg_trgm/uninstall_pg_trgm.sql index 239cd85b5b0..6706dd133e1 100644 --- a/contrib/pg_trgm/uninstall_pg_trgm.sql +++ b/contrib/pg_trgm/uninstall_pg_trgm.sql @@ -16,7 +16,7 @@ DROP FUNCTION gtrgm_penalty(internal,internal,internal); DROP FUNCTION gtrgm_decompress(internal); DROP FUNCTION gtrgm_compress(internal); - + DROP FUNCTION gtrgm_consistent(internal,text,int,oid,internal); DROP TYPE gtrgm CASCADE; diff --git a/contrib/pg_upgrade/IMPLEMENTATION b/contrib/pg_upgrade/IMPLEMENTATION index bbd36ac9e92..a0cfcf15dac 100644 --- a/contrib/pg_upgrade/IMPLEMENTATION +++ b/contrib/pg_upgrade/IMPLEMENTATION @@ -13,7 +13,7 @@ old data. If you have a lot of data, that can take a considerable amount of time. If you have too much data, you may have to buy more storage since you need enough room to hold the original data plus the exported data. pg_upgrade can reduce the amount of time and disk space required -for many upgrades. +for many upgrades. The URL http://momjian.us/main/writings/pgsql/pg_upgrade.pdf contains a presentation about pg_upgrade internals that mirrors the text diff --git a/contrib/pg_upgrade/TESTING b/contrib/pg_upgrade/TESTING index 88adfea276f..85de8da7f7e 100644 --- a/contrib/pg_upgrade/TESTING +++ b/contrib/pg_upgrade/TESTING @@ -35,10 +35,10 @@ Here are the steps needed to create a regression database dump file: b) For pre-9.0, remove 'regex_flavor' f) For pre-9.0, adjust extra_float_digits - Postgres 9.0 pg_dump uses extra_float_digits=-2 for pre-9.0 - databases, and extra_float_digits=-3 for >= 9.0 databases. - 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. + Postgres 9.0 pg_dump uses extra_float_digits=-2 for pre-9.0 + databases, and extra_float_digits=-3 for >= 9.0 databases. + 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. Once the dump is created, it can be repeatedly loaded into the old database, upgraded, and dumped out of the new database, and then @@ -52,7 +52,7 @@ steps: 3) Create the regression database in the old server. -4) Load the dump file created above into the regression database; +4) Load the dump file created above into the regression database; check for errors while loading. 5) Upgrade the old database to the new major version, as outlined in diff --git a/contrib/pg_upgrade/relfilenode.c b/contrib/pg_upgrade/relfilenode.c index 7b73b5e91f5..4ded5d9d996 100644 --- a/contrib/pg_upgrade/relfilenode.c +++ b/contrib/pg_upgrade/relfilenode.c @@ -171,7 +171,7 @@ transfer_single_new_db(pageCnvCtx *pageConverter, namelist[fileno]->d_name); snprintf(new_file, sizeof(new_file), "%s/%u%s", maps[mapnum].new_dir, maps[mapnum].new_relfilenode, strchr(namelist[fileno]->d_name, '_')); - + unlink(new_file); transfer_relfile(pageConverter, old_file, new_file, maps[mapnum].old_nspname, maps[mapnum].old_relname, diff --git a/contrib/pgcrypto/expected/blowfish.out b/contrib/pgcrypto/expected/blowfish.out index 86c3244cece..72557ea1613 100644 --- a/contrib/pgcrypto/expected/blowfish.out +++ b/contrib/pgcrypto/expected/blowfish.out @@ -108,7 +108,7 @@ decode('37363534333231204e6f77206973207468652074696d6520666f722000', 'hex'), 3ea6357a0ee7fad6d0c4b63464f2aafa40c2e91b4b7e1bba8114932fd92b5c8f111e7e50e7b2e541 (1 row) --- blowfish-448 +-- blowfish-448 SELECT encode(encrypt( decode('fedcba9876543210', 'hex'), decode('f0e1d2c3b4a5968778695a4b3c2d1e0f001122334455667704689104c2fd3b2f584023641aba61761f1f1f1f0e0e0e0effffffffffffffff', 'hex'), @@ -120,21 +120,21 @@ decode('f0e1d2c3b4a5968778695a4b3c2d1e0f001122334455667704689104c2fd3b2f58402364 -- result: c04504012e4e1f53 -- empty data -select encode( encrypt('', 'foo', 'bf'), 'hex'); +select encode(encrypt('', 'foo', 'bf'), 'hex'); encode ------------------ 1871949bb2311c8e (1 row) -- 10 bytes key -select encode( encrypt('foo', '0123456789', 'bf'), 'hex'); +select encode(encrypt('foo', '0123456789', 'bf'), 'hex'); encode ------------------ 42f58af3b2c03f46 (1 row) -- 22 bytes key -select encode( encrypt('foo', '0123456789012345678901', 'bf'), 'hex'); +select encode(encrypt('foo', '0123456789012345678901', 'bf'), 'hex'); encode ------------------ 86ab6f0bc72b5f22 diff --git a/contrib/pgcrypto/expected/crypt-blowfish.out b/contrib/pgcrypto/expected/crypt-blowfish.out index 8a8b0071810..329d78f6254 100644 --- a/contrib/pgcrypto/expected/crypt-blowfish.out +++ b/contrib/pgcrypto/expected/crypt-blowfish.out @@ -17,7 +17,7 @@ CREATE TABLE ctest (data text, res text, salt text); INSERT INTO ctest VALUES ('password', '', ''); UPDATE ctest SET salt = gen_salt('bf', 8); UPDATE ctest SET res = crypt(data, salt); -SELECT res = crypt(data, res) AS "worked" +SELECT res = crypt(data, res) AS "worked" FROM ctest; worked -------- diff --git a/contrib/pgcrypto/expected/rijndael.out b/contrib/pgcrypto/expected/rijndael.out index 106181ef224..14b2650c324 100644 --- a/contrib/pgcrypto/expected/rijndael.out +++ b/contrib/pgcrypto/expected/rijndael.out @@ -70,21 +70,21 @@ decode('000102030405060708090a0b0c0d0e0f101112131415161718191a1b', 'hex'), (1 row) -- empty data -select encode( encrypt('', 'foo', 'aes'), 'hex'); +select encode(encrypt('', 'foo', 'aes'), 'hex'); encode ---------------------------------- b48cc3338a2eb293b6007ef72c360d48 (1 row) -- 10 bytes key -select encode( encrypt('foo', '0123456789', 'aes'), 'hex'); +select encode(encrypt('foo', '0123456789', 'aes'), 'hex'); encode ---------------------------------- f397f03d2819b7172b68d0706fda4693 (1 row) -- 22 bytes key -select encode( encrypt('foo', '0123456789012345678901', 'aes'), 'hex'); +select encode(encrypt('foo', '0123456789012345678901', 'aes'), 'hex'); encode ---------------------------------- 5c9db77af02b4678117bcd8a71ae7f53 @@ -105,7 +105,7 @@ select encode(encrypt_iv('foo', '0123456', 'abcd', 'aes'), 'hex'); (1 row) select decrypt_iv(decode('2c24cb7da91d6d5699801268b0f5adad', 'hex'), - '0123456', 'abcd', 'aes'); + '0123456', 'abcd', 'aes'); decrypt_iv ------------ foo diff --git a/contrib/pgcrypto/rijndael.tbl b/contrib/pgcrypto/rijndael.tbl index 8ea62eae1b1..c7610c01346 100644 --- a/contrib/pgcrypto/rijndael.tbl +++ b/contrib/pgcrypto/rijndael.tbl @@ -1133,6 +1133,6 @@ static const u4byte il_tab[4][256] = { }; static const u4byte rco_tab[10] = { - 0x00000001, 0x00000002, 0x00000004, 0x00000008, 0x00000010, + 0x00000001, 0x00000002, 0x00000004, 0x00000008, 0x00000010, 0x00000020, 0x00000040, 0x00000080, 0x0000001b, 0x00000036 }; diff --git a/contrib/pgcrypto/sql/blowfish.sql b/contrib/pgcrypto/sql/blowfish.sql index 951cbc05197..ba8df41c68e 100644 --- a/contrib/pgcrypto/sql/blowfish.sql +++ b/contrib/pgcrypto/sql/blowfish.sql @@ -66,7 +66,7 @@ decode('6b77b4d63006dee605b156e27403979358deb9e7154616d959f1652bd5ff92cc', 'hex' decode('37363534333231204e6f77206973207468652074696d6520666f722000', 'hex'), 'bf-cbc'), 'hex'); --- blowfish-448 +-- blowfish-448 SELECT encode(encrypt( decode('fedcba9876543210', 'hex'), decode('f0e1d2c3b4a5968778695a4b3c2d1e0f001122334455667704689104c2fd3b2f584023641aba61761f1f1f1f0e0e0e0effffffffffffffff', 'hex'), @@ -74,11 +74,11 @@ decode('f0e1d2c3b4a5968778695a4b3c2d1e0f001122334455667704689104c2fd3b2f58402364 -- result: c04504012e4e1f53 -- empty data -select encode( encrypt('', 'foo', 'bf'), 'hex'); +select encode(encrypt('', 'foo', 'bf'), 'hex'); -- 10 bytes key -select encode( encrypt('foo', '0123456789', 'bf'), 'hex'); +select encode(encrypt('foo', '0123456789', 'bf'), 'hex'); -- 22 bytes key -select encode( encrypt('foo', '0123456789012345678901', 'bf'), 'hex'); +select encode(encrypt('foo', '0123456789012345678901', 'bf'), 'hex'); -- decrypt select decrypt(encrypt('foo', '0123456', 'bf'), '0123456', 'bf'); diff --git a/contrib/pgcrypto/sql/crypt-blowfish.sql b/contrib/pgcrypto/sql/crypt-blowfish.sql index b89dfd22b7b..60c11400555 100644 --- a/contrib/pgcrypto/sql/crypt-blowfish.sql +++ b/contrib/pgcrypto/sql/crypt-blowfish.sql @@ -11,7 +11,7 @@ INSERT INTO ctest VALUES ('password', '', ''); UPDATE ctest SET salt = gen_salt('bf', 8); UPDATE ctest SET res = crypt(data, salt); -SELECT res = crypt(data, res) AS "worked" +SELECT res = crypt(data, res) AS "worked" FROM ctest; DROP TABLE ctest; diff --git a/contrib/pgcrypto/sql/rijndael.sql b/contrib/pgcrypto/sql/rijndael.sql index 41595074bc6..bfbf95d39b8 100644 --- a/contrib/pgcrypto/sql/rijndael.sql +++ b/contrib/pgcrypto/sql/rijndael.sql @@ -44,11 +44,11 @@ decode('000102030405060708090a0b0c0d0e0f101112131415161718191a1b', 'hex'), 'aes-cbc'), 'hex'); -- empty data -select encode( encrypt('', 'foo', 'aes'), 'hex'); +select encode(encrypt('', 'foo', 'aes'), 'hex'); -- 10 bytes key -select encode( encrypt('foo', '0123456789', 'aes'), 'hex'); +select encode(encrypt('foo', '0123456789', 'aes'), 'hex'); -- 22 bytes key -select encode( encrypt('foo', '0123456789012345678901', 'aes'), 'hex'); +select encode(encrypt('foo', '0123456789012345678901', 'aes'), 'hex'); -- decrypt select decrypt(encrypt('foo', '0123456', 'aes'), '0123456', 'aes'); @@ -56,7 +56,7 @@ select decrypt(encrypt('foo', '0123456', 'aes'), '0123456', 'aes'); -- iv select encode(encrypt_iv('foo', '0123456', 'abcd', 'aes'), 'hex'); select decrypt_iv(decode('2c24cb7da91d6d5699801268b0f5adad', 'hex'), - '0123456', 'abcd', 'aes'); + '0123456', 'abcd', 'aes'); -- long message select encode(encrypt('Lets try a longer message.', '0123456789', 'aes'), 'hex'); diff --git a/contrib/seg/expected/seg.out b/contrib/seg/expected/seg.out index bd099a222ca..17c803e50e4 100644 --- a/contrib/seg/expected/seg.out +++ b/contrib/seg/expected/seg.out @@ -924,7 +924,7 @@ SELECT '1'::seg <@ '-1 .. 1'::seg AS bool; (1 row) -- Load some example data and build the index --- +-- CREATE TABLE test_seg (s seg); \copy test_seg from 'data/test_seg.data' CREATE INDEX test_seg_ix ON test_seg USING gist (s); @@ -934,7 +934,7 @@ SELECT count(*) FROM test_seg WHERE s @> '11..11.3'; 143 (1 row) --- Test sorting +-- Test sorting SELECT * FROM test_seg WHERE s @> '11..11.3' GROUP BY s; s ----------------- diff --git a/contrib/seg/expected/seg_1.out b/contrib/seg/expected/seg_1.out index c92cd835100..a4cca8b3917 100644 --- a/contrib/seg/expected/seg_1.out +++ b/contrib/seg/expected/seg_1.out @@ -924,7 +924,7 @@ SELECT '1'::seg <@ '-1 .. 1'::seg AS bool; (1 row) -- Load some example data and build the index --- +-- CREATE TABLE test_seg (s seg); \copy test_seg from 'data/test_seg.data' CREATE INDEX test_seg_ix ON test_seg USING gist (s); @@ -934,7 +934,7 @@ SELECT count(*) FROM test_seg WHERE s @> '11..11.3'; 143 (1 row) --- Test sorting +-- Test sorting SELECT * FROM test_seg WHERE s @> '11..11.3' GROUP BY s; s ----------------- diff --git a/contrib/seg/seg.sql.in b/contrib/seg/seg.sql.in index 2713c4a8dc6..9bd747656c8 100644 --- a/contrib/seg/seg.sql.in +++ b/contrib/seg/seg.sql.in @@ -4,7 +4,7 @@ SET search_path = public; -- Create the user-defined type for 1-D floating point intervals (seg) --- +-- CREATE OR REPLACE FUNCTION seg_in(cstring) RETURNS seg @@ -333,12 +333,12 @@ AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; CREATE OR REPLACE FUNCTION gseg_compress(internal) -RETURNS internal +RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; CREATE OR REPLACE FUNCTION gseg_decompress(internal) -RETURNS internal +RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; @@ -353,12 +353,12 @@ AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; CREATE OR REPLACE FUNCTION gseg_union(internal, internal) -RETURNS seg +RETURNS seg AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; CREATE OR REPLACE FUNCTION gseg_same(seg, seg, internal) -RETURNS internal +RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; @@ -375,7 +375,7 @@ CREATE OPERATOR CLASS seg_ops FUNCTION 1 seg_cmp(seg, seg); CREATE OPERATOR CLASS gist_seg_ops -DEFAULT FOR TYPE seg USING gist +DEFAULT FOR TYPE seg USING gist AS OPERATOR 1 << , OPERATOR 2 &< , diff --git a/contrib/seg/segparse.y b/contrib/seg/segparse.y index ca351c661b3..1f5f0affe8b 100644 --- a/contrib/seg/segparse.y +++ b/contrib/seg/segparse.y @@ -1,6 +1,6 @@ %{ #define YYPARSE_PARAM result /* need this to pass a pointer (void *) to yyparse */ - + #include "postgres.h" #include <math.h> @@ -23,7 +23,7 @@ extern int seg_yylex(void); extern int significant_digits(char *str); /* defined in seg.c */ - + void seg_yyerror(const char *message); int seg_yyparse(void *result); @@ -126,7 +126,7 @@ boundary: $$.sigd = significant_digits($1); $$.val = val; } - | + | EXTENSION SEGFLOAT { /* temp variable avoids a gcc 3.3.x bug on Sparc64 */ float val = seg_atof($2); diff --git a/contrib/seg/segscan.l b/contrib/seg/segscan.l index 36da5fa3957..c2b5ca87896 100644 --- a/contrib/seg/segscan.l +++ b/contrib/seg/segscan.l @@ -1,7 +1,7 @@ %{ -/* -** A scanner for EMP-style numeric ranges -*/ +/* + * A scanner for EMP-style numeric ranges + */ #include "postgres.h" diff --git a/contrib/seg/sort-segments.pl b/contrib/seg/sort-segments.pl index 1205d3b9722..62cdfb1ffd7 100755 --- a/contrib/seg/sort-segments.pl +++ b/contrib/seg/sort-segments.pl @@ -7,7 +7,7 @@ while (<>) { push @rows, $_; } -foreach ( sort { +foreach ( sort { @ar = split("\t", $a); $valA = pop @ar; $valA =~ s/[~<> ]+//g; diff --git a/contrib/seg/sql/seg.sql b/contrib/seg/sql/seg.sql index 61ad519613e..b8a29d659a5 100644 --- a/contrib/seg/sql/seg.sql +++ b/contrib/seg/sql/seg.sql @@ -213,7 +213,7 @@ SELECT '-1'::seg <@ '-1 .. 1'::seg AS bool; SELECT '1'::seg <@ '-1 .. 1'::seg AS bool; -- Load some example data and build the index --- +-- CREATE TABLE test_seg (s seg); \copy test_seg from 'data/test_seg.data' @@ -221,7 +221,7 @@ CREATE TABLE test_seg (s seg); CREATE INDEX test_seg_ix ON test_seg USING gist (s); SELECT count(*) FROM test_seg WHERE s @> '11..11.3'; --- Test sorting +-- Test sorting SELECT * FROM test_seg WHERE s @> '11..11.3' GROUP BY s; -- Test functions diff --git a/contrib/spi/autoinc.example b/contrib/spi/autoinc.example index a2f470dc2de..08880ce5fad 100644 --- a/contrib/spi/autoinc.example +++ b/contrib/spi/autoinc.example @@ -8,9 +8,9 @@ CREATE TABLE ids ( idesc text ); -CREATE TRIGGER ids_nextid +CREATE TRIGGER ids_nextid BEFORE INSERT OR UPDATE ON ids - FOR EACH ROW + FOR EACH ROW EXECUTE PROCEDURE autoinc (id, next_id); INSERT INTO ids VALUES (0, 'first (-2 ?)'); @@ -19,11 +19,11 @@ INSERT INTO ids(idesc) VALUES ('third (1 ?!)'); SELECT * FROM ids; -UPDATE ids SET id = null, idesc = 'first: -2 --> 2' +UPDATE ids SET id = null, idesc = 'first: -2 --> 2' WHERE idesc = 'first (-2 ?)'; -UPDATE ids SET id = 0, idesc = 'second: -1 --> 3' +UPDATE ids SET id = 0, idesc = 'second: -1 --> 3' WHERE id = -1; -UPDATE ids SET id = 4, idesc = 'third: 1 --> 4' +UPDATE ids SET id = 4, idesc = 'third: 1 --> 4' WHERE id = 1; SELECT * FROM ids; diff --git a/contrib/spi/autoinc.sql.in b/contrib/spi/autoinc.sql.in index d38c9df2d4d..1fa322f9c77 100644 --- a/contrib/spi/autoinc.sql.in +++ b/contrib/spi/autoinc.sql.in @@ -3,7 +3,7 @@ -- Adjust this setting to control where the objects get created. SET search_path = public; -CREATE OR REPLACE FUNCTION autoinc() -RETURNS trigger +CREATE OR REPLACE FUNCTION autoinc() +RETURNS trigger AS 'MODULE_PATHNAME' LANGUAGE C; diff --git a/contrib/spi/insert_username.example b/contrib/spi/insert_username.example index a9d23fb2adc..2c1eeb0e0dd 100644 --- a/contrib/spi/insert_username.example +++ b/contrib/spi/insert_username.example @@ -7,7 +7,7 @@ CREATE TABLE username_test ( CREATE TRIGGER insert_usernames BEFORE INSERT OR UPDATE ON username_test - FOR EACH ROW + FOR EACH ROW EXECUTE PROCEDURE insert_username (username); INSERT INTO username_test VALUES ('nothing'); diff --git a/contrib/spi/insert_username.sql.in b/contrib/spi/insert_username.sql.in index f06cc0cb5ab..bdc2deb340b 100644 --- a/contrib/spi/insert_username.sql.in +++ b/contrib/spi/insert_username.sql.in @@ -3,7 +3,7 @@ -- Adjust this setting to control where the objects get created. SET search_path = public; -CREATE OR REPLACE FUNCTION insert_username() -RETURNS trigger +CREATE OR REPLACE FUNCTION insert_username() +RETURNS trigger AS 'MODULE_PATHNAME' LANGUAGE C; diff --git a/contrib/spi/moddatetime.example b/contrib/spi/moddatetime.example index e4a713c12a1..65af388214d 100644 --- a/contrib/spi/moddatetime.example +++ b/contrib/spi/moddatetime.example @@ -8,7 +8,7 @@ CREATE TABLE mdt ( CREATE TRIGGER mdt_moddatetime BEFORE UPDATE ON mdt - FOR EACH ROW + FOR EACH ROW EXECUTE PROCEDURE moddatetime (moddate); INSERT INTO mdt VALUES (1, 'first'); diff --git a/contrib/spi/refint.example b/contrib/spi/refint.example index 1300e816549..d0ff7441642 100644 --- a/contrib/spi/refint.example +++ b/contrib/spi/refint.example @@ -20,11 +20,11 @@ CREATE INDEX CI ON C (REFC); --Trigger for table A: CREATE TRIGGER AT BEFORE DELETE OR UPDATE ON A FOR EACH ROW -EXECUTE PROCEDURE +EXECUTE PROCEDURE check_foreign_key (2, 'cascade', 'ID', 'B', 'REFB', 'C', 'REFC'); /* 2 - means that check must be performed for foreign keys of 2 tables. -cascade - defines that corresponding keys must be deleted. +cascade - defines that corresponding keys must be deleted. ID - name of primary key column in triggered table (A). You may use as many columns as you need. B - name of (first) table with foreign keys. @@ -38,11 +38,11 @@ REFC - name of foreign key column in this table. --Trigger for table B: CREATE TRIGGER BT BEFORE INSERT OR UPDATE ON B FOR EACH ROW -EXECUTE PROCEDURE +EXECUTE PROCEDURE check_primary_key ('REFB', 'A', 'ID'); /* -REFB - name of foreign key column in triggered (B) table. You may use as +REFB - name of foreign key column in triggered (B) table. You may use as many columns as you need, but number of key columns in referenced table must be the same. A - referenced table name. @@ -52,7 +52,7 @@ ID - name of primary key column in referenced table. --Trigger for table C: CREATE TRIGGER CT BEFORE INSERT OR UPDATE ON C FOR EACH ROW -EXECUTE PROCEDURE +EXECUTE PROCEDURE check_primary_key ('REFC', 'A', 'ID'); -- Now try diff --git a/contrib/spi/timetravel.example b/contrib/spi/timetravel.example index 1769e48154a..35a7f654085 100644 --- a/contrib/spi/timetravel.example +++ b/contrib/spi/timetravel.example @@ -1,8 +1,8 @@ drop table tttest; create table tttest ( - price_id int4, - price_val int4, + price_id int4, + price_val int4, price_on abstime, price_off abstime ); @@ -12,17 +12,17 @@ alter table tttest add column q1 text; alter table tttest add column q2 int; alter table tttest drop column q1; -create trigger timetravel +create trigger timetravel before insert or delete or update on tttest - for each row - execute procedure + for each row + execute procedure timetravel (price_on, price_off); insert into tttest values (1, 1, null, null); insert into tttest(price_id, price_val) values (2, 2); insert into tttest(price_id, price_val,price_off) values (3, 3, 'infinity'); -insert into tttest(price_id, price_val,price_off) values (4, 4, +insert into tttest(price_id, price_val,price_off) values (4, 4, abstime('now'::timestamp - '100 days'::interval)); insert into tttest(price_id, price_val,price_on) values (3, 3, 'infinity'); -- duplicate key @@ -62,7 +62,7 @@ select set_timetravel('tttest', 1); -- turn TT ON! select get_timetravel('tttest'); -- check status -- we want to correct some date -update tttest set price_on = 'Jan-01-1990 00:00:01' where price_id = 5 and +update tttest set price_on = 'Jan-01-1990 00:00:01' where price_id = 5 and price_off <> 'infinity'; -- but this doesn't work @@ -71,11 +71,11 @@ select set_timetravel('tttest', 0); -- turn TT OFF! select get_timetravel('tttest'); -- check status -update tttest set price_on = '01-Jan-1990 00:00:01' where price_id = 5 and +update tttest set price_on = '01-Jan-1990 00:00:01' where price_id = 5 and price_off <> 'infinity'; select * from tttest; -- isn't it what we need ? -- get price for price_id == 5 as it was '10-Jan-1990' -select * from tttest where price_id = 5 and +select * from tttest where price_id = 5 and price_on <= '10-Jan-1990' and price_off > '10-Jan-1990'; diff --git a/contrib/spi/timetravel.sql.in b/contrib/spi/timetravel.sql.in index 4c64f211d93..83dc958a88b 100644 --- a/contrib/spi/timetravel.sql.in +++ b/contrib/spi/timetravel.sql.in @@ -3,17 +3,17 @@ -- Adjust this setting to control where the objects get created. SET search_path = public; -CREATE OR REPLACE FUNCTION timetravel() -RETURNS trigger +CREATE OR REPLACE FUNCTION timetravel() +RETURNS trigger AS 'MODULE_PATHNAME' LANGUAGE C; -CREATE OR REPLACE FUNCTION set_timetravel(name, int4) -RETURNS int4 +CREATE OR REPLACE FUNCTION set_timetravel(name, int4) +RETURNS int4 AS 'MODULE_PATHNAME' LANGUAGE C RETURNS NULL ON NULL INPUT; -CREATE OR REPLACE FUNCTION get_timetravel(name) -RETURNS int4 +CREATE OR REPLACE FUNCTION get_timetravel(name) +RETURNS int4 AS 'MODULE_PATHNAME' LANGUAGE C RETURNS NULL ON NULL INPUT; diff --git a/contrib/start-scripts/osx/PostgreSQL b/contrib/start-scripts/osx/PostgreSQL index 65150d0fd56..58e69bc784f 100755 --- a/contrib/start-scripts/osx/PostgreSQL +++ b/contrib/start-scripts/osx/PostgreSQL @@ -30,9 +30,9 @@ # # Created by David Wheeler, 2002. -# modified by Ray Aspeitia 12-03-2003 : +# modified by Ray Aspeitia 12-03-2003 : # added log rotation script to db startup -# modified StartupParameters.plist "Provides" parameter to make it easier to +# modified StartupParameters.plist "Provides" parameter to make it easier to # start and stop with the SystemStarter utitlity # use the below command in order to correctly start/stop/restart PG with log rotation script: diff --git a/contrib/test_parser/expected/test_parser.out b/contrib/test_parser/expected/test_parser.out index 600086c4ae7..3d0fd4210f7 100644 --- a/contrib/test_parser/expected/test_parser.out +++ b/contrib/test_parser/expected/test_parser.out @@ -41,7 +41,7 @@ SELECT to_tsquery('testcfg', 'star'); 'star' (1 row) -SELECT ts_headline('testcfg','Supernovae stars are the brightest phenomena in galaxies', +SELECT ts_headline('testcfg','Supernovae stars are the brightest phenomena in galaxies', to_tsquery('testcfg', 'stars')); ts_headline ----------------------------------------------------------------- diff --git a/contrib/test_parser/sql/test_parser.sql b/contrib/test_parser/sql/test_parser.sql index f43d4c7e09b..97c2cb5a5d3 100644 --- a/contrib/test_parser/sql/test_parser.sql +++ b/contrib/test_parser/sql/test_parser.sql @@ -22,5 +22,5 @@ SELECT to_tsvector('testcfg','That''s my first own parser'); SELECT to_tsquery('testcfg', 'star'); -SELECT ts_headline('testcfg','Supernovae stars are the brightest phenomena in galaxies', +SELECT ts_headline('testcfg','Supernovae stars are the brightest phenomena in galaxies', to_tsquery('testcfg', 'stars')); diff --git a/contrib/tsearch2/expected/tsearch2.out b/contrib/tsearch2/expected/tsearch2.out index 8674337e52d..18b591e0aaa 100644 --- a/contrib/tsearch2/expected/tsearch2.out +++ b/contrib/tsearch2/expected/tsearch2.out @@ -815,13 +815,13 @@ SELECT length(to_tsvector('english', '345 qwe@efd.r '' http://www.com/ http://ae 53 (1 row) -select to_tsquery('english', 'qwe & sKies '); +select to_tsquery('english', 'qwe & sKies '); to_tsquery --------------- 'qwe' & 'sky' (1 row) -select to_tsquery('simple', 'qwe & sKies '); +select to_tsquery('simple', 'qwe & sKies '); to_tsquery ----------------- 'qwe' & 'skies' @@ -2337,7 +2337,6 @@ Upon a woman s face. E. J. Pratt (1882 1964) The granite features of this cliff (1 row) - select headline('Erosion It took the sea a thousand years, A thousand years to trace 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 (1 row) - select headline('Erosion It took the sea a thousand years, A thousand years to trace The granite features of this cliff @@ -2382,7 +2380,7 @@ ff-bg document.write(15); </script> </body> -</html>', +</html>', to_tsquery('sea&foo'), 'HighlightAll=true'); headline ----------------------------------------------------------------------------- diff --git a/contrib/tsearch2/expected/tsearch2_1.out b/contrib/tsearch2/expected/tsearch2_1.out index a26c5162d1d..f7cb0963b86 100644 --- a/contrib/tsearch2/expected/tsearch2_1.out +++ b/contrib/tsearch2/expected/tsearch2_1.out @@ -815,13 +815,13 @@ SELECT length(to_tsvector('english', '345 qwe@efd.r '' http://www.com/ http://ae 53 (1 row) -select to_tsquery('english', 'qwe & sKies '); +select to_tsquery('english', 'qwe & sKies '); to_tsquery --------------- 'qwe' & 'sky' (1 row) -select to_tsquery('simple', 'qwe & sKies '); +select to_tsquery('simple', 'qwe & sKies '); to_tsquery ----------------- 'qwe' & 'skies' @@ -2337,7 +2337,6 @@ Upon a woman s face. E. J. Pratt (1882 1964) The granite features of this cliff (1 row) - select headline('Erosion It took the sea a thousand years, A thousand years to trace 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 (1 row) - select headline('Erosion It took the sea a thousand years, A thousand years to trace The granite features of this cliff @@ -2382,7 +2380,7 @@ ff-bg document.write(15); </script> </body> -</html>', +</html>', to_tsquery('sea&foo'), 'HighlightAll=true'); headline ----------------------------------------------------------------------------- diff --git a/contrib/tsearch2/sql/tsearch2.sql b/contrib/tsearch2/sql/tsearch2.sql index bbae7b45dbc..99d808a1b39 100644 --- a/contrib/tsearch2/sql/tsearch2.sql +++ b/contrib/tsearch2/sql/tsearch2.sql @@ -168,8 +168,8 @@ SELECT length(to_tsvector('english', '345 qwe@efd.r '' http://www.com/ http://ae <i <b> wow < jqw <> qwerty')); -select to_tsquery('english', 'qwe & sKies '); -select to_tsquery('simple', 'qwe & sKies '); +select to_tsquery('english', 'qwe & sKies '); +select to_tsquery('simple', 'qwe & sKies '); select to_tsquery('english', '''the wether'':dc & '' sKies '':BC '); select to_tsquery('english', 'asd&(and|fghj)'); select to_tsquery('english', '(asd&and)|fghj'); @@ -288,7 +288,7 @@ An hour of storm to place The sculpture of these granite seams, Upon a woman s face. E. J. Pratt (1882 1964) ', to_tsquery('sea&thousand&years')); - + select headline('Erosion It took the sea a thousand years, A thousand years to trace The granite features of this cliff @@ -298,7 +298,7 @@ An hour of storm to place The sculpture of these granite seams, Upon a woman s face. E. J. Pratt (1882 1964) ', to_tsquery('granite&sea')); - + select headline('Erosion It took the sea a thousand years, A thousand years to trace The granite features of this cliff @@ -321,7 +321,7 @@ ff-bg document.write(15); </script> </body> -</html>', +</html>', to_tsquery('sea&foo'), 'HighlightAll=true'); --check debug select * from public.ts_debug('Tsearch module for PostgreSQL 7.3.3'); diff --git a/contrib/tsearch2/tsearch2.sql.in b/contrib/tsearch2/tsearch2.sql.in index 739d57eaa9e..1df2908285a 100644 --- a/contrib/tsearch2/tsearch2.sql.in +++ b/contrib/tsearch2/tsearch2.sql.in @@ -11,7 +11,7 @@ CREATE DOMAIN gtsvector AS pg_catalog.gtsvector; CREATE DOMAIN gtsq AS pg_catalog.text; --dict interface -CREATE FUNCTION lexize(oid, text) +CREATE FUNCTION lexize(oid, text) RETURNS _text as 'ts_lexize' LANGUAGE INTERNAL @@ -44,7 +44,7 @@ CREATE FUNCTION set_curdict(text) --built-in dictionaries CREATE FUNCTION dex_init(internal) RETURNS internal - as 'MODULE_PATHNAME', 'tsa_dex_init' + as 'MODULE_PATHNAME', 'tsa_dex_init' LANGUAGE C; CREATE FUNCTION dex_lexize(internal,internal,int4) @@ -66,7 +66,7 @@ CREATE FUNCTION snb_lexize(internal,internal,int4) CREATE FUNCTION snb_ru_init_koi8(internal) RETURNS internal - as 'MODULE_PATHNAME', 'tsa_snb_ru_init_koi8' + as 'MODULE_PATHNAME', 'tsa_snb_ru_init_koi8' LANGUAGE C; CREATE FUNCTION snb_ru_init_utf8(internal) @@ -81,7 +81,7 @@ CREATE FUNCTION snb_ru_init(internal) CREATE FUNCTION spell_init(internal) RETURNS internal - as 'MODULE_PATHNAME', 'tsa_spell_init' + as 'MODULE_PATHNAME', 'tsa_spell_init' LANGUAGE C; CREATE FUNCTION spell_lexize(internal,internal,int4) @@ -92,7 +92,7 @@ CREATE FUNCTION spell_lexize(internal,internal,int4) CREATE FUNCTION syn_init(internal) RETURNS internal - as 'MODULE_PATHNAME', 'tsa_syn_init' + as 'MODULE_PATHNAME', 'tsa_syn_init' LANGUAGE C; CREATE FUNCTION syn_lexize(internal,internal,int4) @@ -113,8 +113,8 @@ CREATE FUNCTION thesaurus_lexize(internal,internal,int4,internal) RETURNS NULL ON NULL INPUT; --sql-level interface -CREATE TYPE tokentype - as (tokid int4, alias text, descr text); +CREATE TYPE tokentype + as (tokid int4, alias text, descr text); CREATE FUNCTION token_type(int4) RETURNS setof tokentype @@ -149,7 +149,7 @@ CREATE FUNCTION set_curprs(text) LANGUAGE C RETURNS NULL ON NULL INPUT; -CREATE TYPE tokenout +CREATE TYPE tokenout as (tokid int4, token text); CREATE FUNCTION parse(oid,text) @@ -157,19 +157,19 @@ CREATE FUNCTION parse(oid,text) as 'ts_parse_byid' LANGUAGE INTERNAL RETURNS NULL ON NULL INPUT; - + CREATE FUNCTION parse(text,text) RETURNS setof tokenout as 'ts_parse_byname' LANGUAGE INTERNAL RETURNS NULL ON NULL INPUT; - + CREATE FUNCTION parse(text) RETURNS setof tokenout as 'MODULE_PATHNAME', 'tsa_parse_current' LANGUAGE C RETURNS NULL ON NULL INPUT; - + --default parser CREATE FUNCTION prsd_start(internal,int4) RETURNS internal @@ -399,7 +399,7 @@ AS STORAGE gtsvector; --stat info -CREATE TYPE statinfo +CREATE TYPE statinfo as (word text, ndoc int4, nentry int4); CREATE FUNCTION stat(text) @@ -560,7 +560,7 @@ AS CREATE OPERATOR CLASS tsvector_ops FOR TYPE tsvector USING btree AS OPERATOR 1 < , - OPERATOR 2 <= , + OPERATOR 2 <= , OPERATOR 3 = , OPERATOR 4 >= , OPERATOR 5 > , diff --git a/contrib/unaccent/Makefile b/contrib/unaccent/Makefile index 36415fef77d..254155dcca4 100644 --- a/contrib/unaccent/Makefile +++ b/contrib/unaccent/Makefile @@ -9,7 +9,7 @@ DATA_TSEARCH = unaccent.rules REGRESS = unaccent # Adjust REGRESS_OPTS because we need a UTF8 database -REGRESS_OPTS = --dbname=$(CONTRIB_TESTDB) --multibyte=UTF8 --no-locale +REGRESS_OPTS = --dbname=$(CONTRIB_TESTDB) --multibyte=UTF8 --no-locale ifdef USE_PGXS PG_CONFIG = pg_config diff --git a/contrib/xml2/expected/xml2.out b/contrib/xml2/expected/xml2.out index 53b8064cc34..8ce04d0b848 100644 --- a/contrib/xml2/expected/xml2.out +++ b/contrib/xml2/expected/xml2.out @@ -18,7 +18,7 @@ select query_to_xml('select 1 as x',true,false,''); (1 row) -select xslt_process( query_to_xml('select x from generate_series(1,5) as +select xslt_process( query_to_xml('select x from generate_series(1,5) as x',true,false,'')::text, $$<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> diff --git a/contrib/xml2/expected/xml2_1.out b/contrib/xml2/expected/xml2_1.out index b465ea27b63..d2d243ada7d 100644 --- a/contrib/xml2/expected/xml2_1.out +++ b/contrib/xml2/expected/xml2_1.out @@ -18,7 +18,7 @@ select query_to_xml('select 1 as x',true,false,''); (1 row) -select xslt_process( query_to_xml('select x from generate_series(1,5) as +select xslt_process( query_to_xml('select x from generate_series(1,5) as x',true,false,'')::text, $$<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> diff --git a/contrib/xml2/sql/xml2.sql b/contrib/xml2/sql/xml2.sql index 202a72baedc..5b3cc997f50 100644 --- a/contrib/xml2/sql/xml2.sql +++ b/contrib/xml2/sql/xml2.sql @@ -10,7 +10,7 @@ RESET client_min_messages; select query_to_xml('select 1 as x',true,false,''); -select xslt_process( query_to_xml('select x from generate_series(1,5) as +select xslt_process( query_to_xml('select x from generate_series(1,5) as x',true,false,'')::text, $$<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> |