Movatterモバイル変換

Skip to content

postgrespro/postgresPublic

forked frompostgres/postgres

NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit9c0a0de

tglsfdc

committed

Switch client-side code to include catalog/pg_foo_d.h not pg_foo.h.

Everything of use to frontend code should now appear in the _d.h files,and making this change frees us from needing to worry about whether thecatalog header files proper are frontend-safe.Remove src/interfaces/ecpg/ecpglib/pg_type.h entirely, as the previouscommit reduced it to a confusingly-named wrapper around pg_type_d.h.In passing, make test_rls_hooks.c follow project convention of includingour own files with #include "" not <>.Discussion:https://postgr.es/m/23690.1523031777@sss.pgh.pa.us

1 parent372728b commit9c0a0deCopy full SHA for 9c0a0de

File tree

27 files changed

+51

-67

lines changed

contrib
- oid2name
  - oid2name.c
- vacuumlo
  - vacuumlo.c
src
- bin
  - initdb
    - initdb.c
  - pg_dump
  - pg_rewind
    - filemap.c
    - libpq_fetch.c
  - pg_upgrade
  - psql
  - scripts
    - vacuumdb.c
- common
  - relpath.c
- fe_utils
  - print.c
- interfaces/ecpg/ecpglib
- test/modules/test_rls_hooks
  - test_rls_hooks.c
- tools/findoidjoins
  - findoidjoins.c

27 files changed

+51

-67

lines changed

`‎contrib/oid2name/oid2name.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*/`
`10`	`10`	`#include"postgres_fe.h"`
`11`	`11`
`12`		`-#include"catalog/pg_class.h"`
	`12`	`+#include"catalog/pg_class_d.h"`
`13`	`13`
`14`	`14`	`#include"fe_utils/connect.h"`
`15`	`15`	`#include"libpq-fe.h"`

`‎contrib/vacuumlo/vacuumlo.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`#include<termios.h>`
`22`	`22`	`#endif`
`23`	`23`
`24`		`-#include"catalog/pg_class.h"`
	`24`	`+#include"catalog/pg_class_d.h"`
`25`	`25`
`26`	`26`	`#include"fe_utils/connect.h"`
`27`	`27`	`#include"libpq-fe.h"`

`‎src/bin/initdb/initdb.c`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -61,9 +61,8 @@`
`61`	`61`
`62`	`62`	`#include"access/xlog_internal.h"`
`63`	`63`	`#include"catalog/catalog.h"`
`64`		`-#include"catalog/pg_authid.h"`
`65`		`-#include"catalog/pg_class.h"`
`66`		`-#include"catalog/pg_collation.h"`
	`64`	`+#include"catalog/pg_authid_d.h"`
	`65`	`+#include"catalog/pg_collation_d.h"`
`67`	`66`	`#include"common/file_perm.h"`
`68`	`67`	`#include"common/file_utils.h"`
`69`	`68`	`#include"common/restricted_token.h"`

`‎src/bin/pg_dump/common.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`
`22`	`22`	`#include<ctype.h>`
`23`	`23`
`24`		`-#include"catalog/pg_class.h"`
	`24`	`+#include"catalog/pg_class_d.h"`
`25`	`25`	`#include"fe_utils/string_utils.h"`
`26`	`26`
`27`	`27`

`‎src/bin/pg_dump/pg_dump.c`

Lines changed: 11 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,17 +42,17 @@`
`42`	`42`	`#include "access/attnum.h"`
`43`	`43`	`#include "access/sysattr.h"`
`44`	`44`	`#include "access/transam.h"`
`45`		`-#include "catalog/pg_aggregate.h"`
`46`		`-#include "catalog/pg_am.h"`
`47`		`-#include "catalog/pg_attribute.h"`
`48`		`-#include "catalog/pg_cast.h"`
`49`		`-#include "catalog/pg_class.h"`
`50`		`-#include "catalog/pg_default_acl.h"`
`51`		`-#include "catalog/pg_largeobject.h"`
`52`		`-#include "catalog/pg_largeobject_metadata.h"`
`53`		`-#include "catalog/pg_proc.h"`
`54`		`-#include "catalog/pg_trigger.h"`
`55`		`-#include "catalog/pg_type.h"`
	`45`	`+#include "catalog/pg_aggregate_d.h"`
	`46`	`+#include "catalog/pg_am_d.h"`
	`47`	`+#include "catalog/pg_attribute_d.h"`
	`48`	`+#include "catalog/pg_cast_d.h"`
	`49`	`+#include "catalog/pg_class_d.h"`
	`50`	`+#include "catalog/pg_default_acl_d.h"`
	`51`	`+#include "catalog/pg_largeobject_d.h"`
	`52`	`+#include "catalog/pg_largeobject_metadata_d.h"`
	`53`	`+#include "catalog/pg_proc_d.h"`
	`54`	`+#include "catalog/pg_trigger_d.h"`
	`55`	`+#include "catalog/pg_type_d.h"`
`56`	`56`	`#include "libpq/libpq-fs.h"`
`57`	`57`
`58`	`58`	`#include "dumputils.h"`

`‎src/bin/pg_dump/pg_dump_sort.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`#include"pg_backup_utils.h"`
`20`	`20`	`#include"pg_dump.h"`
`21`	`21`
`22`		`-#include"catalog/pg_class.h"`
	`22`	`+#include"catalog/pg_class_d.h"`
`23`	`23`
`24`	`24`	`/* translator: this is a module name */`
`25`	`25`	`staticconstchar*modulename=gettext_noop("sorter");`

`‎src/bin/pg_rewind/filemap.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`
`21`	`21`	`#include"common/string.h"`
`22`	`22`	`#include"catalog/catalog.h"`
`23`		`-#include"catalog/pg_tablespace.h"`
	`23`	`+#include"catalog/pg_tablespace_d.h"`
`24`	`24`	`#include"storage/fd.h"`
`25`	`25`
`26`	`26`	`filemap_t*filemap=NULL;`

`‎src/bin/pg_rewind/libpq_fetch.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`
`24`	`24`	`#include"libpq-fe.h"`
`25`	`25`	`#include"catalog/catalog.h"`
`26`		`-#include"catalog/pg_type.h"`
	`26`	`+#include"catalog/pg_type_d.h"`
`27`	`27`	`#include"fe_utils/connect.h"`
`28`	`28`	`#include"port/pg_bswap.h"`
`29`	`29`

`‎src/bin/pg_upgrade/check.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`#include"postgres_fe.h"`
`11`	`11`
`12`		`-#include"catalog/pg_authid.h"`
	`12`	`+#include"catalog/pg_authid_d.h"`
`13`	`13`	`#include"fe_utils/string_utils.h"`
`14`	`14`	`#include"mb/pg_wchar.h"`
`15`	`15`	`#include"pg_upgrade.h"`

`‎src/bin/pg_upgrade/function.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`#include"pg_upgrade.h"`
`13`	`13`
`14`	`14`	`#include"access/transam.h"`
`15`		`-#include"catalog/pg_language.h"`
	`15`	`+#include"catalog/pg_language_d.h"`
`16`	`16`
`17`	`17`
`18`	`18`	`/*`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp