Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit7babccb

Browse files
committed
Add the possibility to specify an explicit validator function for foreign-data
wrappers (similar to procedural languages). This way we don't need to retainthe nearly empty libraries, and we are more free in how to implement thewrapper API in the future.
1 parentf73bed3 commit7babccb

28 files changed

+448
-622
lines changed

‎doc/src/sgml/catalogs.sgml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/catalogs.sgml,v 2.197 2009/02/09 20:57:59 alvherre Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/catalogs.sgml,v 2.198 2009/02/24 10:06:31 petere Exp $ -->
22
<!--
33
Documentation of the system catalogs, directed toward PostgreSQL developers
44
-->
@@ -2466,10 +2466,16 @@
24662466
</row>
24672467

24682468
<row>
2469-
<entry><structfield>fdwlibrary</structfield></entry>
2470-
<entry><type>text</type></entry>
2471-
<entry></entry>
2472-
<entry>File name of the library implementing this foreign-data wrapper</entry>
2469+
<entry><structfield>fdwvalidator</structfield></entry>
2470+
<entry><type>oid</type></entry>
2471+
<entry><literal><link linkend="catalog-pg-proc"><structname>pg_proc</structname></link>.oid</literal></entry>
2472+
<entry>
2473+
References a validator function that is responsible for
2474+
checking the validity of the generic options given to the
2475+
foreign-data wrapper, as well as to foreign servers and user
2476+
mappings using the foreign-data wrapper. Zero if no validator
2477+
is provided.
2478+
</entry>
24732479
</row>
24742480

24752481
<row>

‎doc/src/sgml/keywords.sgml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/keywords.sgml,v 2.22 2008/12/19 16:25:16 petere Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/keywords.sgml,v 2.23 2009/02/24 10:06:31 petere Exp $ -->
22

33
<appendix id="sql-keywords-appendix">
44
<title><acronym>SQL</acronym> Key Words</title>
@@ -2687,14 +2687,6 @@
26872687
<entry>reserved</entry>
26882688
<entry>reserved</entry>
26892689
</row>
2690-
<row>
2691-
<entry><token>LIBRARY</token></entry>
2692-
<entry>non-reserved</entry>
2693-
<entry>non-reserved</entry>
2694-
<entry>non-reserved</entry>
2695-
<entry></entry>
2696-
<entry></entry>
2697-
</row>
26982690
<row>
26992691
<entry><token>LIKE</token></entry>
27002692
<entry>reserved (can be function or type)</entry>

‎doc/src/sgml/ref/alter_foreign_data_wrapper.sgml

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/alter_foreign_data_wrapper.sgml,v 1.1 2008/12/19 16:25:16 petere Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/alter_foreign_data_wrapper.sgml,v 1.2 2009/02/24 10:06:32 petere Exp $
33
PostgreSQL documentation
44
-->
55

@@ -21,7 +21,7 @@ PostgreSQL documentation
2121
<refsynopsisdiv>
2222
<synopsis>
2323
ALTER FOREIGN DATA WRAPPER <replaceable class="parameter">name</replaceable>
24-
[LIBRARY '<replaceable class="parameter">libraryname</replaceable>' ]
24+
[VALIDATOR<replaceable class="parameter">valfunction</replaceable> | NO VALIDATOR ]
2525
[ OPTIONS ( [ ADD | SET | DROP ] <replaceable class="PARAMETER">option</replaceable> ['<replaceable class="PARAMETER">value</replaceable>'] [, ... ]) ]
2626
ALTER FOREIGN DATA WRAPPER <replaceable class="parameter">name</replaceable> OWNER TO <replaceable>new_owner</replaceable>
2727
</synopsis>
@@ -58,14 +58,14 @@ ALTER FOREIGN DATA WRAPPER <replaceable class="parameter">name</replaceable> OWN
5858
</varlistentry>
5959

6060
<varlistentry>
61-
<term><replaceable class="parameter">libraryname</replaceable></term>
61+
<term><literal>VALIDATOR <replaceable class="parameter">valfunction</replaceable></literal></term>
6262
<listitem>
6363
<para>
64-
New name of theforeign-data wrapperlibrary.
64+
Specifies a newforeign-data wrappervalidator function.
6565
</para>
6666

6767
<para>
68-
Note that it is possible that after changing thelibrary, the
68+
Note that it is possible that after changing thevalidator the
6969
options to the foreign-data wrapper, servers, and user mappings
7070
have become invalid. It is up to the user to make sure that
7171
these options are correct before using the foreign-data
@@ -74,6 +74,16 @@ ALTER FOREIGN DATA WRAPPER <replaceable class="parameter">name</replaceable> OWN
7474
</listitem>
7575
</varlistentry>
7676

77+
<varlistentry>
78+
<term><literal>NO VALIDATOR</literal></term>
79+
<listitem>
80+
<para>
81+
This is used to specify that the foreign-data wrapper should no
82+
longer have a validator function.
83+
</para>
84+
</listitem>
85+
</varlistentry>
86+
7787
<varlistentry>
7888
<term><literal>OPTIONS ( [ ADD | SET | DROP ] <replaceable class="PARAMETER">option</replaceable> ['<replaceable class="PARAMETER">value</replaceable>'] [, ... ] )</literal></term>
7989
<listitem>
@@ -102,10 +112,10 @@ ALTER FOREIGN DATA WRAPPER dbi OPTIONS (ADD foo '1', DROP 'bar');
102112
</para>
103113

104114
<para>
105-
Change the foreign-data wrapper <literal>dbi</>library
106-
to <literal>/home/bob/mylibrary.so</>:
115+
Change the foreign-data wrapper <literal>dbi</>validator
116+
to <literal>bob.myvalidator</>:
107117
<programlisting>
108-
ALTER FOREIGN DATA WRAPPER dbiLIBRARY '/home/bob/mylibrary.so';
118+
ALTER FOREIGN DATA WRAPPER dbiVALIDATORbob.myvalidator;
109119
</programlisting>
110120
</para>
111121
</refsect1>
@@ -115,8 +125,9 @@ ALTER FOREIGN DATA WRAPPER dbi LIBRARY '/home/bob/mylibrary.so';
115125

116126
<para>
117127
<command>ALTER FOREIGN DATA WRAPPER</command> conforms to ISO/IEC
118-
9075-9 (SQL/MED). The standard does not specify the <literal>OWNER
119-
TO</> variant of the command.
128+
9075-9 (SQL/MED). The standard does not specify the <literal>
129+
VALIDATOR</literal> and <literal>OWNER TO</> variants of the
130+
command.
120131
</para>
121132
</refsect1>
122133

‎doc/src/sgml/ref/create_foreign_data_wrapper.sgml

Lines changed: 33 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/create_foreign_data_wrapper.sgml,v 1.1 2008/12/19 16:25:16 petere Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/create_foreign_data_wrapper.sgml,v 1.2 2009/02/24 10:06:32 petere Exp $
33
PostgreSQL documentation
44
-->
55

@@ -21,8 +21,7 @@ PostgreSQL documentation
2121
<refsynopsisdiv>
2222
<synopsis>
2323
CREATE FOREIGN DATA WRAPPER <replaceable class="parameter">name</replaceable>
24-
LIBRARY '<replaceable class="parameter">libraryname</replaceable>'
25-
LANGUAGE C
24+
[ VALIDATOR <replaceable class="parameter">valfunction</replaceable> | NO VALIDATOR ]
2625
[ OPTIONS ( <replaceable class="PARAMETER">option</replaceable> '<replaceable class="PARAMETER">value</replaceable>' [, ... ] ) ]
2726
</synopsis>
2827
</refsynopsisdiv>
@@ -59,25 +58,25 @@ CREATE FOREIGN DATA WRAPPER <replaceable class="parameter">name</replaceable>
5958
</varlistentry>
6059

6160
<varlistentry>
62-
<term><replaceable class="parameter">libraryname</replaceable></term>
61+
<term><literal>VALIDATOR <replaceable class="parameter">valfunction</replaceable></literal></term>
6362
<listitem>
6463
<para>
65-
The name of the shared library implementing the foreign-data
66-
wrapper. The file name is specified in the same way as for
67-
shared library names in <xref linkend="sql-createfunction"
68-
endterm="sql-createfunction-title">; in particular, one can rely
69-
on a search path and automatic addition of the system's standard
70-
shared library file name extension.
71-
</para>
72-
</listitem>
73-
</varlistentry>
74-
75-
<varlistentry>
76-
<term><literal>LANGUAGE C</literal></term>
77-
<listitem>
78-
<para>
79-
Currently, only the C programming language is supported for
80-
implementing foreign-data wrappers.
64+
<replaceable class="parameter">valfunction</replaceable> is the
65+
name of a previously registered function that will be called to
66+
check the generic options given to the foreign-data wrapper, as
67+
well as to foreign servers and user mappings using the
68+
foreign-data wrapper. If no validator function or <literal>NO
69+
VALIDATOR</literal> is specified, then options will not be
70+
checked at creation time. (Foreign-data wrappers will possibly
71+
ignore or reject invalid option specifications at run time,
72+
depending on the implementation.) The validator function must
73+
take two arguments: one of type <type>text[]</type>, which will
74+
contain the array of options as stored in the system catalogs,
75+
and one of type <type>oid</type>, which will be the OID of the
76+
system catalog containing the options, or zero if the context is
77+
not known. The return type is ignored; the function should
78+
indicate invalid options using
79+
the <function>ereport()</function> function.
8180
</para>
8281
</listitem>
8382
</varlistentry>
@@ -109,47 +108,37 @@ CREATE FOREIGN DATA WRAPPER <replaceable class="parameter">name</replaceable>
109108
</para>
110109

111110
<para>
112-
The C language API for foreign-data wrappers is currently not
113-
documented, stable, or complete. Would-be authors of functionality
114-
interfacing with the SQL/MED functionality are advised to contact
115-
the PostgreSQL developers.
116-
</para>
117-
118-
<para>
119-
There are currently two foreign-data wrapper libraries
120-
provided: <filename>dummy_fdw</filename>, which does nothing and
121-
could be useful for testing,
122-
and <filename>postgresql_fdw</filename>, which accepts options
123-
corresponding to <application>libpq</> connection parameters.
111+
There is currently one foreign-data wrapper validator function
112+
provided:
113+
<filename>postgresql_fdw_validator</filename>, which accepts
114+
options corresponding to <application>libpq</> connection
115+
parameters.
124116
</para>
125117
</refsect1>
126118

127119
<refsect1>
128120
<title>Examples</title>
129121

130122
<para>
131-
Create a foreign-data wrapper <literal>dummy</> with
132-
library <literal>dummy_fdw</>:
123+
Create a foreign-data wrapper <literal>dummy</>:
133124
<programlisting>
134-
CREATE FOREIGN DATA WRAPPER dummy LIBRARY 'dummy_fdw' LANGUAGE C;
125+
CREATE FOREIGN DATA WRAPPER dummy;
135126
</programlisting>
136127
</para>
137128

138129
<para>
139130
Create a foreign-data wrapper <literal>postgresql</> with
140-
library<literal>postgresql_fdw</>:
131+
validator function<literal>postgresql_fdw_validator</>:
141132
<programlisting>
142-
CREATE FOREIGN DATA WRAPPER postgresqlLIBRARY 'postgresql_fdw' LANGUAGE C;
133+
CREATE FOREIGN DATA WRAPPER postgresqlVALIDATOR postgresql_fdw_validator;
143134
</programlisting>
144135
</para>
145136

146137
<para>
147-
Create a foreign-data wrapper <literal>mywrapper</> withlibrary
148-
<literal>/home/bob/mywrapper.so</> and someoptions:
138+
Create a foreign-data wrapper <literal>mywrapper</> withsome
139+
options:
149140
<programlisting>
150141
CREATE FOREIGN DATA WRAPPER mywrapper
151-
LIBRARY '/home/bob/mywrapper.so'
152-
LANGUAGE C
153142
OPTIONS (debug 'true');
154143
</programlisting>
155144
</para>
@@ -161,8 +150,9 @@ CREATE FOREIGN DATA WRAPPER mywrapper
161150
<para>
162151
<command>CREATE FOREIGN DATA WRAPPER</command> conforms to ISO/IEC
163152
9075-9 (SQL/MED), with the exception that
164-
the <literal>LIBRARY</literal> clause is not optional in
165-
PostgreSQL.
153+
the <literal>VALIDATOR</literal> clause is an extension and the
154+
clauses <literal>LIBRARY</literal> and <literal>LANGUAGE</literal>
155+
are not yet implemented in PostgreSQL.
166156
</para>
167157

168158
<para>

‎src/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1994, Regents of the University of California
66
#
7-
# $PostgreSQL: pgsql/src/Makefile,v 1.44 2008/12/19 16:25:16 petere Exp $
7+
# $PostgreSQL: pgsql/src/Makefile,v 1.45 2009/02/24 10:06:32 petere Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -19,7 +19,6 @@ all install installdirs uninstall distprep:
1919
$(MAKE) -C backend$@
2020
$(MAKE) -C backend/utils/mb/conversion_procs$@
2121
$(MAKE) -C backend/snowball$@
22-
$(MAKE) -C backend/foreign$@-fdw
2322
$(MAKE) -C include$@
2423
$(MAKE) -C interfaces$@
2524
$(MAKE) -C bin$@

‎src/backend/catalog/information_schema.sql

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* Copyright (c) 2003-2009, PostgreSQL Global Development Group
66
*
7-
* $PostgreSQL: pgsql/src/backend/catalog/information_schema.sql,v 1.52 2009/02/14 20:48:36 tgl Exp $
7+
* $PostgreSQL: pgsql/src/backend/catalog/information_schema.sql,v 1.53 2009/02/24 10:06:32 petere Exp $
88
*/
99

1010
/*
@@ -2428,7 +2428,6 @@ CREATE VIEW _pg_foreign_data_wrappers AS
24282428
CAST(current_database()AS sql_identifier)AS foreign_data_wrapper_catalog,
24292429
CAST(fdwnameAS sql_identifier)AS foreign_data_wrapper_name,
24302430
CAST(u.rolnameAS sql_identifier)AS authorization_identifier,
2431-
CAST(fdwlibraryAS character_data)AS library_name,
24322431
CAST('c'AS character_data)AS foreign_data_wrapper_language
24332432
FROM pg_foreign_data_wrapper w, pg_authid u
24342433
WHEREu.oid=w.fdwowner
@@ -2458,7 +2457,7 @@ CREATE VIEW foreign_data_wrappers AS
24582457
SELECT foreign_data_wrapper_catalog,
24592458
foreign_data_wrapper_name,
24602459
authorization_identifier,
2461-
library_name,
2460+
CAST(NULLAS character_data)ASlibrary_name,
24622461
foreign_data_wrapper_language
24632462
FROM _pg_foreign_data_wrappers w;
24642463

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp