Movatterモバイル変換

Skip to content

postgrespro/postgresPublic

forked frompostgres/postgres

NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitd153b80

anarazel

committed

Fix typos in some error messages thrown by extension scripts when fed to psql.

Some of the many error messages introduced in458857c missed 'FROMunpackaged'. Alsoe016b72 and45ffeb7 forgot to quote extensionversion numbers.Backpatch to 9.1, just like458857c which introduced the messages. Doso because the error messages thrown when the wrong command is copy &pasted aren't easy to understand.

1 parent3cd934f commitd153b80Copy full SHA for d153b80

File tree

39 files changed

+39

-39

lines changed

contrib
- btree_gin
  - btree_gin--unpackaged--1.0.sql
- btree_gist
  - btree_gist--unpackaged--1.0.sql
- chkpass
  - chkpass--unpackaged--1.0.sql
- citext
  - citext--unpackaged--1.0.sql
- cube
  - cube--unpackaged--1.0.sql
- dblink
  - dblink--unpackaged--1.0.sql
- dict_int
  - dict_int--unpackaged--1.0.sql
- dict_xsyn
  - dict_xsyn--unpackaged--1.0.sql
- earthdistance
  - earthdistance--unpackaged--1.0.sql
- fuzzystrmatch
  - fuzzystrmatch--unpackaged--1.0.sql
- hstore
  - hstore--unpackaged--1.0.sql
- intagg
  - intagg--unpackaged--1.0.sql
- intarray
  - intarray--unpackaged--1.0.sql
- isn
  - isn--unpackaged--1.0.sql
- lo
  - lo--unpackaged--1.0.sql
- ltree
  - ltree--unpackaged--1.0.sql
- pageinspect
  - pageinspect--1.0--1.1.sql
  - pageinspect--1.1--1.2.sql
  - pageinspect--unpackaged--1.0.sql
- pg_buffercache
  - pg_buffercache--unpackaged--1.0.sql
- pg_freespacemap
  - pg_freespacemap--unpackaged--1.0.sql
- pg_stat_statements
  - pg_stat_statements--unpackaged--1.0.sql
- pg_trgm
  - pg_trgm--unpackaged--1.0.sql
- pgcrypto
  - pgcrypto--unpackaged--1.0.sql
- pgrowlocks
  - pgrowlocks--unpackaged--1.0.sql
- pgstattuple
  - pgstattuple--unpackaged--1.0.sql
- seg
  - seg--unpackaged--1.0.sql
- spi
  - autoinc--unpackaged--1.0.sql
  - insert_username--unpackaged--1.0.sql
  - moddatetime--unpackaged--1.0.sql
  - refint--unpackaged--1.0.sql
  - timetravel--unpackaged--1.0.sql
- sslinfo
  - sslinfo--unpackaged--1.0.sql
- tablefunc
  - tablefunc--unpackaged--1.0.sql
- test_parser
  - test_parser--unpackaged--1.0.sql
- tsearch2
  - tsearch2--unpackaged--1.0.sql
- unaccent
  - unaccent--unpackaged--1.0.sql
- uuid-ossp
  - uuid-ossp--unpackaged--1.0.sql
- xml2
  - xml2--unpackaged--1.0.sql

39 files changed

+39

-39

lines changed

`‎contrib/btree_gin/btree_gin--unpackaged--1.0.sql‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/* contrib/btree_gin/btree_gin--unpackaged--1.0.sql*/`
`2`	`2`
`3`	`3`	`-- complain if script is sourced in psql, rather than via CREATE EXTENSION`
`4`		`-\echo Use"CREATE EXTENSION btree_gin" to load this file. \quit`
	`4`	`+\echo Use"CREATE EXTENSION btree_gin FROM unpackaged" to load this file. \quit`
`5`	`5`
`6`	`6`	`ALTER EXTENSION btree_gin ADD function gin_btree_consistent(internal,smallint,anyelement,integer,internal,internal);`
`7`	`7`	`ALTER EXTENSION btree_gin ADD function gin_extract_value_int2(smallint,internal);`

`‎contrib/btree_gist/btree_gist--unpackaged--1.0.sql‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/* contrib/btree_gist/btree_gist--unpackaged--1.0.sql*/`
`2`	`2`
`3`	`3`	`-- complain if script is sourced in psql, rather than via CREATE EXTENSION`
`4`		`-\echo Use"CREATE EXTENSION btree_gist" to load this file. \quit`
	`4`	`+\echo Use"CREATE EXTENSION btree_gist FROM unpackaged" to load this file. \quit`
`5`	`5`
`6`	`6`	`ALTER EXTENSION btree_gist ADD type gbtreekey4;`
`7`	`7`	`ALTER EXTENSION btree_gist ADD function gbtreekey4_in(cstring);`

`‎contrib/chkpass/chkpass--unpackaged--1.0.sql‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/* contrib/chkpass/chkpass--unpackaged--1.0.sql*/`
`2`	`2`
`3`	`3`	`-- complain if script is sourced in psql, rather than via CREATE EXTENSION`
`4`		`-\echo Use"CREATE EXTENSION chkpass" to load this file. \quit`
	`4`	`+\echo Use"CREATE EXTENSION chkpass FROM unpackaged" to load this file. \quit`
`5`	`5`
`6`	`6`	`ALTER EXTENSION chkpass ADD type chkpass;`
`7`	`7`	`ALTER EXTENSION chkpass ADD function chkpass_in(cstring);`

`‎contrib/citext/citext--unpackaged--1.0.sql‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/* contrib/citext/citext--unpackaged--1.0.sql*/`
`2`	`2`
`3`	`3`	`-- complain if script is sourced in psql, rather than via CREATE EXTENSION`
`4`		`-\echo Use"CREATE EXTENSION citext" to load this file. \quit`
	`4`	`+\echo Use"CREATE EXTENSION citext FROM unpackaged" to load this file. \quit`
`5`	`5`
`6`	`6`	`ALTER EXTENSION citext ADD type citext;`
`7`	`7`	`ALTER EXTENSION citext ADD function citextin(cstring);`

`‎contrib/cube/cube--unpackaged--1.0.sql‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/* contrib/cube/cube--unpackaged--1.0.sql*/`
`2`	`2`
`3`	`3`	`-- complain if script is sourced in psql, rather than via CREATE EXTENSION`
`4`		`-\echo Use"CREATE EXTENSION cube" to load this file. \quit`
	`4`	`+\echo Use"CREATE EXTENSION cube FROM unpackaged" to load this file. \quit`
`5`	`5`
`6`	`6`	`ALTER EXTENSION cube ADD type cube;`
`7`	`7`	`ALTER EXTENSION cube ADD function cube_in(cstring);`

`‎contrib/dblink/dblink--unpackaged--1.0.sql‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/* contrib/dblink/dblink--unpackaged--1.0.sql*/`
`2`	`2`
`3`	`3`	`-- complain if script is sourced in psql, rather than via CREATE EXTENSION`
`4`		`-\echo Use"CREATE EXTENSION dblink" to load this file. \quit`
	`4`	`+\echo Use"CREATE EXTENSION dblink FROM unpackaged" to load this file. \quit`
`5`	`5`
`6`	`6`	`ALTER EXTENSION dblink ADD function dblink_connect(text);`
`7`	`7`	`ALTER EXTENSION dblink ADD function dblink_connect(text,text);`

`‎contrib/dict_int/dict_int--unpackaged--1.0.sql‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/* contrib/dict_int/dict_int--unpackaged--1.0.sql*/`
`2`	`2`
`3`	`3`	`-- complain if script is sourced in psql, rather than via CREATE EXTENSION`
`4`		`-\echo Use"CREATE EXTENSION dict_int" to load this file. \quit`
	`4`	`+\echo Use"CREATE EXTENSION dict_int FROM unpackaged" to load this file. \quit`
`5`	`5`
`6`	`6`	`ALTER EXTENSION dict_int ADD function dintdict_init(internal);`
`7`	`7`	`ALTER EXTENSION dict_int ADD function dintdict_lexize(internal,internal,internal,internal);`

`‎contrib/dict_xsyn/dict_xsyn--unpackaged--1.0.sql‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/* contrib/dict_xsyn/dict_xsyn--unpackaged--1.0.sql*/`
`2`	`2`
`3`	`3`	`-- complain if script is sourced in psql, rather than via CREATE EXTENSION`
`4`		`-\echo Use"CREATE EXTENSION dict_xsyn" to load this file. \quit`
	`4`	`+\echo Use"CREATE EXTENSION dict_xsyn FROM unpackaged" to load this file. \quit`
`5`	`5`
`6`	`6`	`ALTER EXTENSION dict_xsyn ADD function dxsyn_init(internal);`
`7`	`7`	`ALTER EXTENSION dict_xsyn ADD function dxsyn_lexize(internal,internal,internal,internal);`

`‎contrib/earthdistance/earthdistance--unpackaged--1.0.sql‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/* contrib/earthdistance/earthdistance--unpackaged--1.0.sql*/`
`2`	`2`
`3`	`3`	`-- complain if script is sourced in psql, rather than via CREATE EXTENSION`
`4`		`-\echo Use"CREATE EXTENSION earthdistance" to load this file. \quit`
	`4`	`+\echo Use"CREATE EXTENSION earthdistance FROM unpackaged" to load this file. \quit`
`5`	`5`
`6`	`6`	`ALTER EXTENSION earthdistance ADD function earth();`
`7`	`7`	`ALTER EXTENSION earthdistance ADD type earth;`

`‎contrib/fuzzystrmatch/fuzzystrmatch--unpackaged--1.0.sql‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/* contrib/fuzzystrmatch/fuzzystrmatch--unpackaged--1.0.sql*/`
`2`	`2`
`3`	`3`	`-- complain if script is sourced in psql, rather than via CREATE EXTENSION`
`4`		`-\echo Use"CREATE EXTENSION fuzzystrmatch" to load this file. \quit`
	`4`	`+\echo Use"CREATE EXTENSION fuzzystrmatch FROM unpackaged" to load this file. \quit`
`5`	`5`
`6`	`6`	`ALTER EXTENSION fuzzystrmatch ADD function levenshtein(text,text);`
`7`	`7`	`ALTER EXTENSION fuzzystrmatch ADD function levenshtein(text,text,integer,integer,integer);`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp