Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
Postgres FD Implementation
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Abuhujair Javed
Postgres FD Implementation
Commits
27217127
Commit
27217127
authored
Jun 13, 2017
by
Peter Eisentraut
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
psql: Use more consistent capitalization of some output headings
parent
651902de
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
143 additions
and
143 deletions
+143
-143
contrib/hstore_plperl/expected/create_transform.out
contrib/hstore_plperl/expected/create_transform.out
+3
-3
contrib/postgres_fdw/expected/postgres_fdw.out
contrib/postgres_fdw/expected/postgres_fdw.out
+42
-42
src/bin/psql/describe.c
src/bin/psql/describe.c
+10
-10
src/test/modules/test_extensions/expected/test_extensions.out
...test/modules/test_extensions/expected/test_extensions.out
+7
-7
src/test/modules/test_extensions/sql/test_extensions.sql
src/test/modules/test_extensions/sql/test_extensions.sql
+2
-2
src/test/regress/expected/foreign_data.out
src/test/regress/expected/foreign_data.out
+79
-79
No files found.
contrib/hstore_plperl/expected/create_transform.out
View file @
27217127
...
@@ -44,7 +44,7 @@ DROP FUNCTION plperl_to_hstore(val internal);
...
@@ -44,7 +44,7 @@ DROP FUNCTION plperl_to_hstore(val internal);
CREATE EXTENSION hstore_plperl;
CREATE EXTENSION hstore_plperl;
\dx+ hstore_plperl
\dx+ hstore_plperl
Objects in extension "hstore_plperl"
Objects in extension "hstore_plperl"
Object
D
escription
Object
d
escription
--------------------------------------
--------------------------------------
function hstore_to_plperl(internal)
function hstore_to_plperl(internal)
function plperl_to_hstore(internal)
function plperl_to_hstore(internal)
...
@@ -54,7 +54,7 @@ CREATE EXTENSION hstore_plperl;
...
@@ -54,7 +54,7 @@ CREATE EXTENSION hstore_plperl;
ALTER EXTENSION hstore_plperl DROP TRANSFORM FOR hstore LANGUAGE plperl;
ALTER EXTENSION hstore_plperl DROP TRANSFORM FOR hstore LANGUAGE plperl;
\dx+ hstore_plperl
\dx+ hstore_plperl
Objects in extension "hstore_plperl"
Objects in extension "hstore_plperl"
Object
D
escription
Object
d
escription
-------------------------------------
-------------------------------------
function hstore_to_plperl(internal)
function hstore_to_plperl(internal)
function plperl_to_hstore(internal)
function plperl_to_hstore(internal)
...
@@ -63,7 +63,7 @@ Objects in extension "hstore_plperl"
...
@@ -63,7 +63,7 @@ Objects in extension "hstore_plperl"
ALTER EXTENSION hstore_plperl ADD TRANSFORM FOR hstore LANGUAGE plperl;
ALTER EXTENSION hstore_plperl ADD TRANSFORM FOR hstore LANGUAGE plperl;
\dx+ hstore_plperl
\dx+ hstore_plperl
Objects in extension "hstore_plperl"
Objects in extension "hstore_plperl"
Object
D
escription
Object
d
escription
--------------------------------------
--------------------------------------
function hstore_to_plperl(internal)
function hstore_to_plperl(internal)
function plperl_to_hstore(internal)
function plperl_to_hstore(internal)
...
...
contrib/postgres_fdw/expected/postgres_fdw.out
View file @
27217127
This diff is collapsed.
Click to expand it.
src/bin/psql/describe.c
View file @
27217127
...
@@ -1726,7 +1726,7 @@ describeOneTableDetails(const char *schemaname,
...
@@ -1726,7 +1726,7 @@ describeOneTableDetails(const char *schemaname,
headers
[
cols
++
]
=
gettext_noop
(
"Definition"
);
headers
[
cols
++
]
=
gettext_noop
(
"Definition"
);
if
(
tableinfo
.
relkind
==
RELKIND_FOREIGN_TABLE
&&
pset
.
sversion
>=
90200
)
if
(
tableinfo
.
relkind
==
RELKIND_FOREIGN_TABLE
&&
pset
.
sversion
>=
90200
)
headers
[
cols
++
]
=
gettext_noop
(
"FDW
O
ptions"
);
headers
[
cols
++
]
=
gettext_noop
(
"FDW
o
ptions"
);
if
(
verbose
)
if
(
verbose
)
{
{
...
@@ -2786,7 +2786,7 @@ describeOneTableDetails(const char *schemaname,
...
@@ -2786,7 +2786,7 @@ describeOneTableDetails(const char *schemaname,
ftoptions
=
PQgetvalue
(
result
,
0
,
1
);
ftoptions
=
PQgetvalue
(
result
,
0
,
1
);
if
(
ftoptions
&&
ftoptions
[
0
]
!=
'\0'
)
if
(
ftoptions
&&
ftoptions
[
0
]
!=
'\0'
)
{
{
printfPQExpBuffer
(
&
buf
,
_
(
"FDW
O
ptions: (%s)"
),
ftoptions
);
printfPQExpBuffer
(
&
buf
,
_
(
"FDW
o
ptions: (%s)"
),
ftoptions
);
printTableAddFooter
(
&
cont
,
buf
.
data
);
printTableAddFooter
(
&
cont
,
buf
.
data
);
}
}
PQclear
(
result
);
PQclear
(
result
);
...
@@ -3473,12 +3473,12 @@ listLanguages(const char *pattern, bool verbose, bool showSystem)
...
@@ -3473,12 +3473,12 @@ listLanguages(const char *pattern, bool verbose, bool showSystem)
",
\n
NOT l.lanispl AS
\"
%s
\"
,
\n
"
",
\n
NOT l.lanispl AS
\"
%s
\"
,
\n
"
" l.lanplcallfoid::regprocedure AS
\"
%s
\"
,
\n
"
" l.lanplcallfoid::regprocedure AS
\"
%s
\"
,
\n
"
" l.lanvalidator::regprocedure AS
\"
%s
\"
,
\n
"
,
" l.lanvalidator::regprocedure AS
\"
%s
\"
,
\n
"
,
gettext_noop
(
"Internal
L
anguage"
),
gettext_noop
(
"Internal
l
anguage"
),
gettext_noop
(
"Call
H
andler"
),
gettext_noop
(
"Call
h
andler"
),
gettext_noop
(
"Validator"
));
gettext_noop
(
"Validator"
));
if
(
pset
.
sversion
>=
90000
)
if
(
pset
.
sversion
>=
90000
)
appendPQExpBuffer
(
&
buf
,
"l.laninline::regprocedure AS
\"
%s
\"
,
\n
"
,
appendPQExpBuffer
(
&
buf
,
"l.laninline::regprocedure AS
\"
%s
\"
,
\n
"
,
gettext_noop
(
"Inline
H
andler"
));
gettext_noop
(
"Inline
h
andler"
));
printACLColumn
(
&
buf
,
"l.lanacl"
);
printACLColumn
(
&
buf
,
"l.lanacl"
);
}
}
...
@@ -4612,7 +4612,7 @@ listForeignDataWrappers(const char *pattern, bool verbose)
...
@@ -4612,7 +4612,7 @@ listForeignDataWrappers(const char *pattern, bool verbose)
" quote_literal(option_value) FROM "
" quote_literal(option_value) FROM "
" pg_options_to_table(fdwoptions)), ', ') || ')' "
" pg_options_to_table(fdwoptions)), ', ') || ')' "
" END AS
\"
%s
\"
"
,
" END AS
\"
%s
\"
"
,
gettext_noop
(
"FDW
O
ptions"
));
gettext_noop
(
"FDW
o
ptions"
));
if
(
pset
.
sversion
>=
90100
)
if
(
pset
.
sversion
>=
90100
)
appendPQExpBuffer
(
&
buf
,
appendPQExpBuffer
(
&
buf
,
...
@@ -4696,7 +4696,7 @@ listForeignServers(const char *pattern, bool verbose)
...
@@ -4696,7 +4696,7 @@ listForeignServers(const char *pattern, bool verbose)
" d.description AS
\"
%s
\"
"
,
" d.description AS
\"
%s
\"
"
,
gettext_noop
(
"Type"
),
gettext_noop
(
"Type"
),
gettext_noop
(
"Version"
),
gettext_noop
(
"Version"
),
gettext_noop
(
"FDW
O
ptions"
),
gettext_noop
(
"FDW
o
ptions"
),
gettext_noop
(
"Description"
));
gettext_noop
(
"Description"
));
}
}
...
@@ -4767,7 +4767,7 @@ listUserMappings(const char *pattern, bool verbose)
...
@@ -4767,7 +4767,7 @@ listUserMappings(const char *pattern, bool verbose)
" quote_literal(option_value) FROM "
" quote_literal(option_value) FROM "
" pg_options_to_table(umoptions)), ', ') || ')' "
" pg_options_to_table(umoptions)), ', ') || ')' "
" END AS
\"
%s
\"
"
,
" END AS
\"
%s
\"
"
,
gettext_noop
(
"FDW
O
ptions"
));
gettext_noop
(
"FDW
o
ptions"
));
appendPQExpBufferStr
(
&
buf
,
"
\n
FROM pg_catalog.pg_user_mappings um
\n
"
);
appendPQExpBufferStr
(
&
buf
,
"
\n
FROM pg_catalog.pg_user_mappings um
\n
"
);
...
@@ -4831,7 +4831,7 @@ listForeignTables(const char *pattern, bool verbose)
...
@@ -4831,7 +4831,7 @@ listForeignTables(const char *pattern, bool verbose)
" pg_options_to_table(ftoptions)), ', ') || ')' "
" pg_options_to_table(ftoptions)), ', ') || ')' "
" END AS
\"
%s
\"
,
\n
"
" END AS
\"
%s
\"
,
\n
"
" d.description AS
\"
%s
\"
"
,
" d.description AS
\"
%s
\"
"
,
gettext_noop
(
"FDW
O
ptions"
),
gettext_noop
(
"FDW
o
ptions"
),
gettext_noop
(
"Description"
));
gettext_noop
(
"Description"
));
appendPQExpBufferStr
(
&
buf
,
appendPQExpBufferStr
(
&
buf
,
...
@@ -5017,7 +5017,7 @@ listOneExtensionContents(const char *extname, const char *oid)
...
@@ -5017,7 +5017,7 @@ listOneExtensionContents(const char *extname, const char *oid)
"FROM pg_catalog.pg_depend
\n
"
"FROM pg_catalog.pg_depend
\n
"
"WHERE refclassid = 'pg_catalog.pg_extension'::pg_catalog.regclass AND refobjid = '%s' AND deptype = 'e'
\n
"
"WHERE refclassid = 'pg_catalog.pg_extension'::pg_catalog.regclass AND refobjid = '%s' AND deptype = 'e'
\n
"
"ORDER BY 1;"
,
"ORDER BY 1;"
,
gettext_noop
(
"Object
D
escription"
),
gettext_noop
(
"Object
d
escription"
),
oid
);
oid
);
res
=
PSQLexec
(
buf
.
data
);
res
=
PSQLexec
(
buf
.
data
);
...
...
src/test/modules/test_extensions/expected/test_extensions.out
View file @
27217127
...
@@ -44,7 +44,7 @@ create table old_table1 (col1 serial primary key);
...
@@ -44,7 +44,7 @@ create table old_table1 (col1 serial primary key);
create extension test_ext7;
create extension test_ext7;
\dx+ test_ext7
\dx+ test_ext7
Objects in extension "test_ext7"
Objects in extension "test_ext7"
Object
D
escription
Object
d
escription
-------------------------------
-------------------------------
sequence ext7_table1_col1_seq
sequence ext7_table1_col1_seq
sequence ext7_table2_col2_seq
sequence ext7_table2_col2_seq
...
@@ -57,7 +57,7 @@ Objects in extension "test_ext7"
...
@@ -57,7 +57,7 @@ Objects in extension "test_ext7"
alter extension test_ext7 update to '2.0';
alter extension test_ext7 update to '2.0';
\dx+ test_ext7
\dx+ test_ext7
Objects in extension "test_ext7"
Objects in extension "test_ext7"
Object
D
escription
Object
d
escription
-------------------------------
-------------------------------
sequence ext7_table2_col2_seq
sequence ext7_table2_col2_seq
table ext7_table2
table ext7_table2
...
@@ -67,12 +67,12 @@ Objects in extension "test_ext7"
...
@@ -67,12 +67,12 @@ Objects in extension "test_ext7"
create extension test_ext8;
create extension test_ext8;
-- \dx+ would expose a variable pg_temp_nn schema name, so we can't use it here
-- \dx+ would expose a variable pg_temp_nn schema name, so we can't use it here
select regexp_replace(pg_describe_object(classid, objid, objsubid),
select regexp_replace(pg_describe_object(classid, objid, objsubid),
'pg_temp_\d+', 'pg_temp', 'g') as "Object
D
escription"
'pg_temp_\d+', 'pg_temp', 'g') as "Object
d
escription"
from pg_depend
from pg_depend
where refclassid = 'pg_extension'::regclass and deptype = 'e' and
where refclassid = 'pg_extension'::regclass and deptype = 'e' and
refobjid = (select oid from pg_extension where extname = 'test_ext8')
refobjid = (select oid from pg_extension where extname = 'test_ext8')
order by 1;
order by 1;
Object
D
escription
Object
d
escription
-----------------------------------------
-----------------------------------------
function ext8_even(posint)
function ext8_even(posint)
function pg_temp.ext8_temp_even(posint)
function pg_temp.ext8_temp_even(posint)
...
@@ -85,12 +85,12 @@ order by 1;
...
@@ -85,12 +85,12 @@ order by 1;
drop extension test_ext8;
drop extension test_ext8;
create extension test_ext8;
create extension test_ext8;
select regexp_replace(pg_describe_object(classid, objid, objsubid),
select regexp_replace(pg_describe_object(classid, objid, objsubid),
'pg_temp_\d+', 'pg_temp', 'g') as "Object
D
escription"
'pg_temp_\d+', 'pg_temp', 'g') as "Object
d
escription"
from pg_depend
from pg_depend
where refclassid = 'pg_extension'::regclass and deptype = 'e' and
where refclassid = 'pg_extension'::regclass and deptype = 'e' and
refobjid = (select oid from pg_extension where extname = 'test_ext8')
refobjid = (select oid from pg_extension where extname = 'test_ext8')
order by 1;
order by 1;
Object
D
escription
Object
d
escription
-----------------------------------------
-----------------------------------------
function ext8_even(posint)
function ext8_even(posint)
function pg_temp.ext8_temp_even(posint)
function pg_temp.ext8_temp_even(posint)
...
@@ -112,7 +112,7 @@ end';
...
@@ -112,7 +112,7 @@ end';
-- extension should now contain no temp objects
-- extension should now contain no temp objects
\dx+ test_ext8
\dx+ test_ext8
Objects in extension "test_ext8"
Objects in extension "test_ext8"
Object
D
escription
Object
d
escription
----------------------------
----------------------------
function ext8_even(posint)
function ext8_even(posint)
table ext8_table1
table ext8_table1
...
...
src/test/modules/test_extensions/sql/test_extensions.sql
View file @
27217127
...
@@ -31,7 +31,7 @@ create extension test_ext8;
...
@@ -31,7 +31,7 @@ create extension test_ext8;
-- \dx+ would expose a variable pg_temp_nn schema name, so we can't use it here
-- \dx+ would expose a variable pg_temp_nn schema name, so we can't use it here
select
regexp_replace
(
pg_describe_object
(
classid
,
objid
,
objsubid
),
select
regexp_replace
(
pg_describe_object
(
classid
,
objid
,
objsubid
),
'pg_temp_
\d
+'
,
'pg_temp'
,
'g'
)
as
"Object
D
escription"
'pg_temp_
\d
+'
,
'pg_temp'
,
'g'
)
as
"Object
d
escription"
from
pg_depend
from
pg_depend
where
refclassid
=
'pg_extension'
::
regclass
and
deptype
=
'e'
and
where
refclassid
=
'pg_extension'
::
regclass
and
deptype
=
'e'
and
refobjid
=
(
select
oid
from
pg_extension
where
extname
=
'test_ext8'
)
refobjid
=
(
select
oid
from
pg_extension
where
extname
=
'test_ext8'
)
...
@@ -42,7 +42,7 @@ drop extension test_ext8;
...
@@ -42,7 +42,7 @@ drop extension test_ext8;
create
extension
test_ext8
;
create
extension
test_ext8
;
select
regexp_replace
(
pg_describe_object
(
classid
,
objid
,
objsubid
),
select
regexp_replace
(
pg_describe_object
(
classid
,
objid
,
objsubid
),
'pg_temp_
\d
+'
,
'pg_temp'
,
'g'
)
as
"Object
D
escription"
'pg_temp_
\d
+'
,
'pg_temp'
,
'g'
)
as
"Object
d
escription"
from
pg_depend
from
pg_depend
where
refclassid
=
'pg_extension'
::
regclass
and
deptype
=
'e'
and
where
refclassid
=
'pg_extension'
::
regclass
and
deptype
=
'e'
and
refobjid
=
(
select
oid
from
pg_extension
where
extname
=
'test_ext8'
)
refobjid
=
(
select
oid
from
pg_extension
where
extname
=
'test_ext8'
)
...
...
src/test/regress/expected/foreign_data.out
View file @
27217127
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment