2000-01-19 00:30:24 +01:00
/*
* psql - the PostgreSQL interactive terminal
*
2019-01-02 18:44:25 +01:00
* Copyright ( c ) 2000 - 2019 , PostgreSQL Global Development Group
2000-01-19 00:30:24 +01:00
*
2010-09-20 22:08:53 +02:00
* src / bin / psql / tab - complete . c
2000-01-19 00:30:24 +01:00
*/
2000-06-25 16:25:51 +02:00
/*----------------------------------------------------------------------
* This file implements a somewhat more sophisticated readline " TAB
* completion " in psql. It is not intended to be AI, to replace
* learning SQL , or to relieve you from thinking about what you ' re
* doing . Also it does not always give you all the syntactically legal
* completions , only those that are the most common or the ones that
* the programmer felt most like implementing .
*
* CAVEAT : Tab completion causes queries to be sent to the backend .
2003-10-16 22:03:09 +02:00
* The number of tuples returned gets limited , in most default
* installations to 1000 , but if you still don ' t like this prospect ,
2000-06-25 16:25:51 +02:00
* you can turn off tab completion in your ~ / . inputrc ( or else
* $ { INPUTRC } ) file so :
*
2001-03-22 05:01:46 +01:00
* $ if psql
* set disable - completion on
* $ endif
2000-06-25 16:25:51 +02:00
*
Teach psql's tab completion to consider the entire input string.
Up to now, the tab completion logic has only examined the last few words
of the current input line; "last few" being originally as few as four
words, but lately up to nine words. Furthermore, it only looked at what
libreadline considers the current line of input, which made it rather
myopic if you split your command across lines. This was tolerable,
sort of, so long as the match patterns were only designed to consider the
last few words of input; but with the recent addition of HeadMatches()
and Matches() matching rules, we really have to do better if we want
those to behave sanely.
Hence, change the code to break the entire line down into words, and to
include any previous lines in the command buffer along with the active
readline input buffer.
This will be a little bit slower than the previous coding, but some
measurements say that even a query of several thousand characters can be
parsed in a hundred or so microseconds on modern machines; so it's really
not going to be significant for interactive tab completion. To reduce
the cost some, I arranged to avoid the per-word malloc calls that used
to occur: all the words are now kept in one malloc'd buffer.
2015-12-20 19:28:11 +01:00
* See ` man 3 readline ' or ` info readline ' for the full details .
2000-06-25 16:25:51 +02:00
*
* BUGS :
Teach psql's tab completion to consider the entire input string.
Up to now, the tab completion logic has only examined the last few words
of the current input line; "last few" being originally as few as four
words, but lately up to nine words. Furthermore, it only looked at what
libreadline considers the current line of input, which made it rather
myopic if you split your command across lines. This was tolerable,
sort of, so long as the match patterns were only designed to consider the
last few words of input; but with the recent addition of HeadMatches()
and Matches() matching rules, we really have to do better if we want
those to behave sanely.
Hence, change the code to break the entire line down into words, and to
include any previous lines in the command buffer along with the active
readline input buffer.
This will be a little bit slower than the previous coding, but some
measurements say that even a query of several thousand characters can be
parsed in a hundred or so microseconds on modern machines; so it's really
not going to be significant for interactive tab completion. To reduce
the cost some, I arranged to avoid the per-word malloc calls that used
to occur: all the words are now kept in one malloc'd buffer.
2015-12-20 19:28:11 +01:00
* - Quotes , parentheses , and other funny characters are not handled
2001-03-22 05:01:46 +01:00
* all that gracefully .
2000-06-25 16:25:51 +02:00
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
*/
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
2001-02-10 03:31:31 +01:00
# include "postgres_fe.h"
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
# include "tab-complete.h"
# include "input.h"
/* If we don't have this, we might as well forget about the whole thing: */
# ifdef USE_READLINE
2000-12-03 21:45:40 +01:00
# include <ctype.h>
2017-03-10 04:42:16 +01:00
2018-04-08 19:59:52 +02:00
# include "catalog/pg_class_d.h"
2017-03-10 04:42:16 +01:00
2000-02-16 14:15:26 +01:00
# include "libpq-fe.h"
2006-06-12 01:06:00 +02:00
# include "pqexpbuffer.h"
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
# include "common.h"
2000-01-19 00:30:24 +01:00
# include "settings.h"
2008-03-29 20:19:14 +01:00
# include "stringutils.h"
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
2001-06-12 00:12:48 +02:00
# ifdef HAVE_RL_FILENAME_COMPLETION_FUNCTION
# define filename_completion_function rl_filename_completion_function
2001-06-20 20:39:14 +02:00
# else
/* missing in some header files */
extern char * filename_completion_function ( ) ;
2001-06-12 00:12:48 +02:00
# endif
2000-04-12 19:17:23 +02:00
2001-04-15 00:55:02 +02:00
# ifdef HAVE_RL_COMPLETION_MATCHES
2003-04-03 22:18:16 +02:00
# define completion_matches rl_completion_matches
2000-03-05 14:30:20 +01:00
# endif
2010-02-17 05:09:40 +01:00
/* word break characters */
# define WORD_BREAKS "\t\n@$><=;|&{() "
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
Teach psql's tab completion to consider the entire input string.
Up to now, the tab completion logic has only examined the last few words
of the current input line; "last few" being originally as few as four
words, but lately up to nine words. Furthermore, it only looked at what
libreadline considers the current line of input, which made it rather
myopic if you split your command across lines. This was tolerable,
sort of, so long as the match patterns were only designed to consider the
last few words of input; but with the recent addition of HeadMatches()
and Matches() matching rules, we really have to do better if we want
those to behave sanely.
Hence, change the code to break the entire line down into words, and to
include any previous lines in the command buffer along with the active
readline input buffer.
This will be a little bit slower than the previous coding, but some
measurements say that even a query of several thousand characters can be
parsed in a hundred or so microseconds on modern machines; so it's really
not going to be significant for interactive tab completion. To reduce
the cost some, I arranged to avoid the per-word malloc calls that used
to occur: all the words are now kept in one malloc'd buffer.
2015-12-20 19:28:11 +01:00
/*
* Since readline doesn ' t let us pass any state through to the tab completion
* callback , we have to use this global variable to let get_previous_words ( )
* get at the previous lines of the current command . Ick .
*/
PQExpBuffer tab_completion_query_buf = NULL ;
2018-03-05 21:37:23 +01:00
/*
* In some situations , the query to find out what names are available to
* complete with must vary depending on server version . We handle this by
* storing a list of queries , each tagged with the minimum server version
* it will work for . Each list must be stored in descending server version
* order , so that the first satisfactory query is the one to use .
*
* When the query string is otherwise constant , an array of VersionedQuery
* suffices . Terminate the array with an entry having min_server_version = 0.
* That entry ' s query string can be a query that works in all supported older
* server versions , or NULL to give up and do no completion .
*/
typedef struct VersionedQuery
{
int min_server_version ;
const char * query ;
} VersionedQuery ;
2003-10-30 22:37:38 +01:00
/*
* This struct is used to define " schema queries " , which are custom - built
* to obtain possibly - schema - qualified names of database objects . There is
* enough similarity in the structure that we don ' t want to repeat it each
* time . So we put the components of each query into this struct and
* assemble them with the common boilerplate in _complete_from_query ( ) .
2018-03-05 21:37:23 +01:00
*
* As with VersionedQuery , we can use an array of these if the query details
* must vary across versions .
2003-10-30 22:37:38 +01:00
*/
typedef struct SchemaQuery
{
2018-03-05 21:37:23 +01:00
/*
* If not zero , minimum server version this struct applies to . If not
* zero , there should be a following struct with a smaller minimum server
* version ; use catname = = NULL in the last entry if we should do nothing .
*/
int min_server_version ;
2003-10-30 22:37:38 +01:00
/*
* Name of catalog or catalogs to be queried , with alias , eg .
* " pg_catalog.pg_class c " . Note that " pg_namespace n " will be added .
*/
const char * catname ;
2004-08-29 07:07:03 +02:00
2003-10-30 22:37:38 +01:00
/*
2005-10-15 04:49:52 +02:00
* Selection condition - - - only rows meeting this condition are candidates
2014-05-06 18:12:18 +02:00
* to display . If catname mentions multiple tables , include the necessary
2017-03-10 04:42:16 +01:00
* join condition here . For example , this might look like " c.relkind = "
* CppAsString2 ( RELKIND_RELATION ) . Write NULL ( not an empty string ) if
* not needed .
2003-10-30 22:37:38 +01:00
*/
const char * selcondition ;
2004-08-29 07:07:03 +02:00
2003-10-30 22:37:38 +01:00
/*
* Visibility condition - - - which rows are visible without schema
2005-10-15 04:49:52 +02:00
* qualification ? For example , " pg_catalog.pg_table_is_visible(c.oid) " .
2003-10-30 22:37:38 +01:00
*/
const char * viscondition ;
2004-08-29 07:07:03 +02:00
2003-10-30 22:37:38 +01:00
/*
2005-10-15 04:49:52 +02:00
* Namespace - - - name of field to join to pg_namespace . oid . For example ,
* " c.relnamespace " .
2003-10-30 22:37:38 +01:00
*/
const char * namespace ;
2004-08-29 07:07:03 +02:00
2003-10-30 22:37:38 +01:00
/*
2005-10-15 04:49:52 +02:00
* Result - - - the appropriately - quoted name to return , in the case of an
* unqualified name . For example , " pg_catalog.quote_ident(c.relname) " .
2003-10-30 22:37:38 +01:00
*/
const char * result ;
2004-08-29 07:07:03 +02:00
2003-10-30 22:37:38 +01:00
/*
* In some cases a different result must be used for qualified names .
* Enter that here , or write NULL if result can be used .
*/
const char * qualresult ;
} SchemaQuery ;
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
2000-04-12 19:17:23 +02:00
2003-10-30 22:37:38 +01:00
/* Store maximum number of records we want from database queries
* ( implemented via SELECT . . . LIMIT xx ) .
*/
static int completion_max_records ;
2000-04-12 19:17:23 +02:00
2003-10-30 22:37:38 +01:00
/*
* Communication variables set by COMPLETE_WITH_FOO macros and then used by
* the completion callback functions . Ugly but there is no better way .
*/
2009-06-11 16:49:15 +02:00
static const char * completion_charp ; /* to pass a string */
2017-06-21 20:39:04 +02:00
static const char * const * completion_charpp ; /* to pass a list of strings */
Phase 2 of pgindent updates.
Change pg_bsd_indent to follow upstream rules for placement of comments
to the right of code, and remove pgindent hack that caused comments
following #endif to not obey the general rule.
Commit e3860ffa4dd0dad0dd9eea4be9cc1412373a8c89 wasn't actually using
the published version of pg_bsd_indent, but a hacked-up version that
tried to minimize the amount of movement of comments to the right of
code. The situation of interest is where such a comment has to be
moved to the right of its default placement at column 33 because there's
code there. BSD indent has always moved right in units of tab stops
in such cases --- but in the previous incarnation, indent was working
in 8-space tab stops, while now it knows we use 4-space tabs. So the
net result is that in about half the cases, such comments are placed
one tab stop left of before. This is better all around: it leaves
more room on the line for comment text, and it means that in such
cases the comment uniformly starts at the next 4-space tab stop after
the code, rather than sometimes one and sometimes two tabs after.
Also, ensure that comments following #endif are indented the same
as comments following other preprocessor commands such as #else.
That inconsistency turns out to have been self-inflicted damage
from a poorly-thought-through post-indent "fixup" in pgindent.
This patch is much less interesting than the first round of indent
changes, but also bulkier, so I thought it best to separate the effects.
Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org
Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us
2017-06-21 21:18:54 +02:00
static const char * completion_info_charp ; /* to pass a second string */
static const char * completion_info_charp2 ; /* to pass a third string */
2018-03-05 21:37:23 +01:00
static const VersionedQuery * completion_vquery ; /* to pass a VersionedQuery */
2004-08-29 07:07:03 +02:00
static const SchemaQuery * completion_squery ; /* to pass a SchemaQuery */
2012-06-10 21:20:04 +02:00
static bool completion_case_sensitive ; /* completion is case sensitive */
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
2008-03-29 20:19:14 +01:00
/*
* A few macros to ease typing . You can use these to complete the given
* string with
* 1 ) The results from a query you pass it . ( Perhaps one of those below ? )
2018-03-05 21:37:23 +01:00
* We support both simple and versioned queries .
2008-03-29 20:19:14 +01:00
* 2 ) The results from a schema query you pass it .
2018-03-05 21:37:23 +01:00
* We support both simple and versioned schema queries .
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
* 3 ) The items from a null - pointer - terminated list ( with or without
2018-09-22 02:50:18 +02:00
* case - sensitive comparison ) ; if the list is constant you can build it
* with COMPLETE_WITH ( ) or COMPLETE_WITH_CS ( ) .
* 4 ) The list of attributes of the given table ( possibly schema - qualified ) .
* 5 ) The list of arguments to the given function ( possibly schema - qualified ) .
2008-03-29 20:19:14 +01:00
*/
2003-10-30 22:37:38 +01:00
# define COMPLETE_WITH_QUERY(query) \
2008-03-29 20:19:14 +01:00
do { \
completion_charp = query ; \
matches = completion_matches ( text , complete_from_query ) ; \
} while ( 0 )
2018-03-05 21:37:23 +01:00
# define COMPLETE_WITH_VERSIONED_QUERY(query) \
do { \
completion_vquery = query ; \
matches = completion_matches ( text , complete_from_versioned_query ) ; \
} while ( 0 )
2006-02-12 08:21:40 +01:00
# define COMPLETE_WITH_SCHEMA_QUERY(query, addon) \
2008-03-29 20:19:14 +01:00
do { \
completion_squery = & ( query ) ; \
completion_charp = addon ; \
matches = completion_matches ( text , complete_from_schema_query ) ; \
} while ( 0 )
2018-03-05 21:37:23 +01:00
# define COMPLETE_WITH_VERSIONED_SCHEMA_QUERY(query, addon) \
do { \
completion_squery = query ; \
completion_vquery = addon ; \
matches = completion_matches ( text , complete_from_versioned_schema_query ) ; \
} while ( 0 )
2018-09-22 02:50:18 +02:00
# define COMPLETE_WITH_LIST_INT(cs, list) \
2012-02-01 19:16:40 +01:00
do { \
2018-09-22 02:50:18 +02:00
completion_case_sensitive = ( cs ) ; \
if ( ! ( list ) [ 1 ] ) \
{ \
completion_charp = ( list ) [ 0 ] ; \
matches = completion_matches ( text , complete_from_const ) ; \
} \
else \
{ \
completion_charpp = ( list ) ; \
matches = completion_matches ( text , complete_from_list ) ; \
} \
2012-02-01 19:16:40 +01:00
} while ( 0 )
2018-09-22 02:50:18 +02:00
# define COMPLETE_WITH_LIST(list) COMPLETE_WITH_LIST_INT(false, list)
# define COMPLETE_WITH_LIST_CS(list) COMPLETE_WITH_LIST_INT(true, list)
# define COMPLETE_WITH(...) \
2008-03-29 20:19:14 +01:00
do { \
2018-09-22 02:50:18 +02:00
static const char * const list [ ] = { __VA_ARGS__ , NULL } ; \
COMPLETE_WITH_LIST ( list ) ; \
2008-03-29 20:19:14 +01:00
} while ( 0 )
2018-09-22 02:50:18 +02:00
# define COMPLETE_WITH_CS(...) \
2008-03-29 20:19:14 +01:00
do { \
2018-09-22 02:50:18 +02:00
static const char * const list [ ] = { __VA_ARGS__ , NULL } ; \
COMPLETE_WITH_LIST_CS ( list ) ; \
2008-03-29 20:19:14 +01:00
} while ( 0 )
# define COMPLETE_WITH_ATTR(relation, addon) \
do { \
char * _completion_schema ; \
char * _completion_table ; \
\
_completion_schema = strtokx ( relation , " \t \n \r " , " . " , " \" " , 0 , \
false , false , pset . encoding ) ; \
( void ) strtokx ( NULL , " \t \n \r " , " . " , " \" " , 0 , \
false , false , pset . encoding ) ; \
_completion_table = strtokx ( NULL , " \t \n \r " , " . " , " \" " , 0 , \
false , false , pset . encoding ) ; \
if ( _completion_table = = NULL ) \
{ \
completion_charp = Query_for_list_of_attributes addon ; \
completion_info_charp = relation ; \
} \
else \
{ \
completion_charp = Query_for_list_of_attributes_with_schema addon ; \
completion_info_charp = _completion_table ; \
completion_info_charp2 = _completion_schema ; \
} \
matches = completion_matches ( text , complete_from_query ) ; \
} while ( 0 )
2003-10-15 00:47:12 +02:00
2016-11-08 22:27:09 +01:00
# define COMPLETE_WITH_ENUM_VALUE(type) \
do { \
char * _completion_schema ; \
char * _completion_type ; \
\
_completion_schema = strtokx ( type , " \t \n \r " , " . " , " \" " , 0 , \
false , false , pset . encoding ) ; \
( void ) strtokx ( NULL , " \t \n \r " , " . " , " \" " , 0 , \
false , false , pset . encoding ) ; \
_completion_type = strtokx ( NULL , " \t \n \r " , " . " , " \" " , 0 , \
false , false , pset . encoding ) ; \
if ( _completion_type = = NULL ) \
{ \
completion_charp = Query_for_list_of_enum_values ; \
completion_info_charp = type ; \
} \
else \
{ \
completion_charp = Query_for_list_of_enum_values_with_schema ; \
completion_info_charp = _completion_type ; \
completion_info_charp2 = _completion_schema ; \
} \
matches = completion_matches ( text , complete_from_query ) ; \
} while ( 0 )
2012-07-05 14:03:49 +02:00
# define COMPLETE_WITH_FUNCTION_ARG(function) \
do { \
char * _completion_schema ; \
char * _completion_function ; \
\
_completion_schema = strtokx ( function , " \t \n \r " , " . " , " \" " , 0 , \
false , false , pset . encoding ) ; \
( void ) strtokx ( NULL , " \t \n \r " , " . " , " \" " , 0 , \
false , false , pset . encoding ) ; \
_completion_function = strtokx ( NULL , " \t \n \r " , " . " , " \" " , 0 , \
false , false , pset . encoding ) ; \
if ( _completion_function = = NULL ) \
{ \
completion_charp = Query_for_list_of_arguments ; \
completion_info_charp = function ; \
} \
else \
{ \
completion_charp = Query_for_list_of_arguments_with_schema ; \
completion_info_charp = _completion_function ; \
completion_info_charp2 = _completion_schema ; \
} \
matches = completion_matches ( text , complete_from_query ) ; \
} while ( 0 )
2003-10-30 22:37:38 +01:00
/*
* Assembly instructions for schema queries
*/
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
2018-03-05 21:37:23 +01:00
static const SchemaQuery Query_for_list_of_aggregates [ ] = {
{
2018-08-29 08:36:30 +02:00
. min_server_version = 110000 ,
. catname = " pg_catalog.pg_proc p " ,
. selcondition = " p.prokind = 'a' " ,
. viscondition = " pg_catalog.pg_function_is_visible(p.oid) " ,
. namespace = " p.pronamespace " ,
. result = " pg_catalog.quote_ident(p.proname) " ,
2018-03-05 21:37:23 +01:00
} ,
{
2018-08-29 08:36:30 +02:00
. catname = " pg_catalog.pg_proc p " ,
. selcondition = " p.proisagg " ,
. viscondition = " pg_catalog.pg_function_is_visible(p.oid) " ,
. namespace = " p.pronamespace " ,
. result = " pg_catalog.quote_ident(p.proname) " ,
2018-03-05 21:37:23 +01:00
}
2003-10-30 22:37:38 +01:00
} ;
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
2003-10-30 22:37:38 +01:00
static const SchemaQuery Query_for_list_of_datatypes = {
2018-08-29 08:36:30 +02:00
. catname = " pg_catalog.pg_type t " ,
2003-10-30 22:37:38 +01:00
/* selcondition --- ignore table rowtypes and array types */
2018-08-29 08:36:30 +02:00
. selcondition = " (t.typrelid = 0 "
2017-03-10 04:42:16 +01:00
" OR (SELECT c.relkind = " CppAsString2 ( RELKIND_COMPOSITE_TYPE )
" FROM pg_catalog.pg_class c WHERE c.oid = t.typrelid)) "
2003-10-30 22:37:38 +01:00
" AND t.typname !~ '^_' " ,
2018-08-29 08:36:30 +02:00
. viscondition = " pg_catalog.pg_type_is_visible(t.oid) " ,
. namespace = " t.typnamespace " ,
. result = " pg_catalog.format_type(t.oid, NULL) " ,
. qualresult = " pg_catalog.quote_ident(t.typname) " ,
2003-10-30 22:37:38 +01:00
} ;
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
2018-12-20 06:24:42 +01:00
static const SchemaQuery Query_for_list_of_composite_datatypes = {
. catname = " pg_catalog.pg_type t " ,
/* selcondition --- only get composite types */
. selcondition = " (SELECT c.relkind = " CppAsString2 ( RELKIND_COMPOSITE_TYPE )
" FROM pg_catalog.pg_class c WHERE c.oid = t.typrelid) "
" AND t.typname !~ '^_' " ,
. viscondition = " pg_catalog.pg_type_is_visible(t.oid) " ,
. namespace = " t.typnamespace " ,
. result = " pg_catalog.format_type(t.oid, NULL) " ,
. qualresult = " pg_catalog.quote_ident(t.typname) " ,
} ;
2003-10-30 22:37:38 +01:00
static const SchemaQuery Query_for_list_of_domains = {
2018-08-29 08:36:30 +02:00
. catname = " pg_catalog.pg_type t " ,
. selcondition = " t.typtype = 'd' " ,
. viscondition = " pg_catalog.pg_type_is_visible(t.oid) " ,
. namespace = " t.typnamespace " ,
. result = " pg_catalog.quote_ident(t.typname) " ,
2003-10-30 22:37:38 +01:00
} ;
2000-04-12 19:17:23 +02:00
2018-03-10 19:18:21 +01:00
/* Note: this intentionally accepts aggregates as well as plain functions */
2018-03-05 21:37:23 +01:00
static const SchemaQuery Query_for_list_of_functions [ ] = {
{
2018-08-29 08:36:30 +02:00
. min_server_version = 110000 ,
. catname = " pg_catalog.pg_proc p " ,
. selcondition = " p.prokind != 'p' " ,
. viscondition = " pg_catalog.pg_function_is_visible(p.oid) " ,
. namespace = " p.pronamespace " ,
. result = " pg_catalog.quote_ident(p.proname) " ,
2018-03-05 21:37:23 +01:00
} ,
{
2018-08-29 08:36:30 +02:00
. catname = " pg_catalog.pg_proc p " ,
. viscondition = " pg_catalog.pg_function_is_visible(p.oid) " ,
. namespace = " p.pronamespace " ,
. result = " pg_catalog.quote_ident(p.proname) " ,
2018-03-05 21:37:23 +01:00
}
2003-10-30 22:37:38 +01:00
} ;
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
2018-03-05 21:37:23 +01:00
static const SchemaQuery Query_for_list_of_procedures [ ] = {
{
2018-08-29 08:36:30 +02:00
. min_server_version = 110000 ,
. catname = " pg_catalog.pg_proc p " ,
. selcondition = " p.prokind = 'p' " ,
. viscondition = " pg_catalog.pg_function_is_visible(p.oid) " ,
. namespace = " p.pronamespace " ,
. result = " pg_catalog.quote_ident(p.proname) " ,
2018-03-05 21:37:23 +01:00
} ,
2018-08-29 08:36:30 +02:00
{
/* not supported in older versions */
. catname = NULL ,
}
2017-11-30 14:46:13 +01:00
} ;
static const SchemaQuery Query_for_list_of_routines = {
2018-08-29 08:36:30 +02:00
. catname = " pg_catalog.pg_proc p " ,
. viscondition = " pg_catalog.pg_function_is_visible(p.oid) " ,
. namespace = " p.pronamespace " ,
. result = " pg_catalog.quote_ident(p.proname) " ,
2017-11-30 14:46:13 +01:00
} ;
2003-10-30 22:37:38 +01:00
static const SchemaQuery Query_for_list_of_sequences = {
2018-08-29 08:36:30 +02:00
. catname = " pg_catalog.pg_class c " ,
. selcondition = " c.relkind IN ( " CppAsString2 ( RELKIND_SEQUENCE ) " ) " ,
. viscondition = " pg_catalog.pg_table_is_visible(c.oid) " ,
. namespace = " c.relnamespace " ,
. result = " pg_catalog.quote_ident(c.relname) " ,
2003-10-30 22:37:38 +01:00
} ;
2011-01-02 05:48:11 +01:00
static const SchemaQuery Query_for_list_of_foreign_tables = {
2018-08-29 08:36:30 +02:00
. catname = " pg_catalog.pg_class c " ,
. selcondition = " c.relkind IN ( " CppAsString2 ( RELKIND_FOREIGN_TABLE ) " ) " ,
. viscondition = " pg_catalog.pg_table_is_visible(c.oid) " ,
. namespace = " c.relnamespace " ,
. result = " pg_catalog.quote_ident(c.relname) " ,
2011-01-02 05:48:11 +01:00
} ;
2003-10-30 22:37:38 +01:00
static const SchemaQuery Query_for_list_of_tables = {
2018-08-29 08:36:30 +02:00
. catname = " pg_catalog.pg_class c " ,
. selcondition =
2017-03-10 04:42:16 +01:00
" c.relkind IN ( " CppAsString2 ( RELKIND_RELATION ) " , "
CppAsString2 ( RELKIND_PARTITIONED_TABLE ) " ) " ,
2018-08-29 08:36:30 +02:00
. viscondition = " pg_catalog.pg_table_is_visible(c.oid) " ,
. namespace = " c.relnamespace " ,
. result = " pg_catalog.quote_ident(c.relname) " ,
2003-10-30 22:37:38 +01:00
} ;
2017-02-26 18:20:00 +01:00
static const SchemaQuery Query_for_list_of_partitioned_tables = {
2018-08-29 08:36:30 +02:00
. catname = " pg_catalog.pg_class c " ,
. selcondition = " c.relkind IN ( " CppAsString2 ( RELKIND_PARTITIONED_TABLE ) " ) " ,
. viscondition = " pg_catalog.pg_table_is_visible(c.oid) " ,
. namespace = " c.relnamespace " ,
. result = " pg_catalog.quote_ident(c.relname) " ,
2017-02-26 18:20:00 +01:00
} ;
2018-09-21 18:41:00 +02:00
static const SchemaQuery Query_for_list_of_views = {
. catname = " pg_catalog.pg_class c " ,
. selcondition = " c.relkind IN ( " CppAsString2 ( RELKIND_VIEW ) " ) " ,
. viscondition = " pg_catalog.pg_table_is_visible(c.oid) " ,
. namespace = " c.relnamespace " ,
. result = " pg_catalog.quote_ident(c.relname) " ,
2012-09-15 04:11:17 +02:00
} ;
2018-09-21 18:41:00 +02:00
static const SchemaQuery Query_for_list_of_matviews = {
. catname = " pg_catalog.pg_class c " ,
. selcondition = " c.relkind IN ( " CppAsString2 ( RELKIND_MATVIEW ) " ) " ,
. viscondition = " pg_catalog.pg_table_is_visible(c.oid) " ,
. namespace = " c.relnamespace " ,
. result = " pg_catalog.quote_ident(c.relname) " ,
} ;
static const SchemaQuery Query_for_list_of_indexes = {
2018-08-29 08:36:30 +02:00
. catname = " pg_catalog.pg_class c " ,
. selcondition =
2018-09-21 18:41:00 +02:00
" c.relkind IN ( " CppAsString2 ( RELKIND_INDEX ) " , "
CppAsString2 ( RELKIND_PARTITIONED_INDEX ) " ) " ,
2018-08-29 08:36:30 +02:00
. viscondition = " pg_catalog.pg_table_is_visible(c.oid) " ,
. namespace = " c.relnamespace " ,
. result = " pg_catalog.quote_ident(c.relname) " ,
2010-12-14 04:37:55 +01:00
} ;
2019-04-07 13:59:12 +02:00
static const SchemaQuery Query_for_list_of_partitioned_indexes = {
. catname = " pg_catalog.pg_class c " ,
. selcondition = " c.relkind = " CppAsString2 ( RELKIND_PARTITIONED_INDEX ) ,
. viscondition = " pg_catalog.pg_table_is_visible(c.oid) " ,
. namespace = " c.relnamespace " ,
. result = " pg_catalog.quote_ident(c.relname) " ,
} ;
2018-09-21 18:41:00 +02:00
/* All relations */
2011-06-14 22:45:00 +02:00
static const SchemaQuery Query_for_list_of_relations = {
2018-08-29 08:36:30 +02:00
. catname = " pg_catalog.pg_class c " ,
. viscondition = " pg_catalog.pg_table_is_visible(c.oid) " ,
. namespace = " c.relnamespace " ,
. result = " pg_catalog.quote_ident(c.relname) " ,
2003-10-30 22:37:38 +01:00
} ;
2019-04-07 13:59:12 +02:00
/* partitioned relations */
static const SchemaQuery Query_for_list_of_partitioned_relations = {
. catname = " pg_catalog.pg_class c " ,
. selcondition = " c.relkind IN ( " CppAsString2 ( RELKIND_PARTITIONED_TABLE )
" , " CppAsString2 ( RELKIND_PARTITIONED_INDEX ) " ) " ,
. viscondition = " pg_catalog.pg_table_is_visible(c.oid) " ,
. namespace = " c.relnamespace " ,
. result = " pg_catalog.quote_ident(c.relname) " ,
} ;
2018-09-21 18:41:00 +02:00
/* Relations supporting INSERT, UPDATE or DELETE */
static const SchemaQuery Query_for_list_of_updatables = {
. catname = " pg_catalog.pg_class c " ,
. selcondition =
" c.relkind IN ( " CppAsString2 ( RELKIND_RELATION ) " , "
CppAsString2 ( RELKIND_FOREIGN_TABLE ) " , "
CppAsString2 ( RELKIND_VIEW ) " , "
CppAsString2 ( RELKIND_PARTITIONED_TABLE ) " ) " ,
. viscondition = " pg_catalog.pg_table_is_visible(c.oid) " ,
. namespace = " c.relnamespace " ,
. result = " pg_catalog.quote_ident(c.relname) " ,
} ;
/* Relations supporting SELECT */
static const SchemaQuery Query_for_list_of_selectables = {
2018-08-29 08:36:30 +02:00
. catname = " pg_catalog.pg_class c " ,
. selcondition =
2017-03-10 04:42:16 +01:00
" c.relkind IN ( " CppAsString2 ( RELKIND_RELATION ) " , "
CppAsString2 ( RELKIND_SEQUENCE ) " , "
CppAsString2 ( RELKIND_VIEW ) " , "
CppAsString2 ( RELKIND_MATVIEW ) " , "
CppAsString2 ( RELKIND_FOREIGN_TABLE ) " , "
CppAsString2 ( RELKIND_PARTITIONED_TABLE ) " ) " ,
2018-08-29 08:36:30 +02:00
. viscondition = " pg_catalog.pg_table_is_visible(c.oid) " ,
. namespace = " c.relnamespace " ,
. result = " pg_catalog.quote_ident(c.relname) " ,
2003-10-30 22:37:38 +01:00
} ;
2018-09-21 18:41:00 +02:00
/* Relations supporting GRANT are currently same as those supporting SELECT */
# define Query_for_list_of_grantables Query_for_list_of_selectables
/* Relations supporting ANALYZE */
static const SchemaQuery Query_for_list_of_analyzables = {
2018-08-29 08:36:30 +02:00
. catname = " pg_catalog.pg_class c " ,
. selcondition =
2017-03-10 04:42:16 +01:00
" c.relkind IN ( " CppAsString2 ( RELKIND_RELATION ) " , "
2018-09-12 21:24:56 +02:00
CppAsString2 ( RELKIND_PARTITIONED_TABLE ) " , "
2017-03-10 04:42:16 +01:00
CppAsString2 ( RELKIND_MATVIEW ) " , "
CppAsString2 ( RELKIND_FOREIGN_TABLE ) " ) " ,
2018-08-29 08:36:30 +02:00
. viscondition = " pg_catalog.pg_table_is_visible(c.oid) " ,
. namespace = " c.relnamespace " ,
. result = " pg_catalog.quote_ident(c.relname) " ,
2013-03-04 01:23:31 +01:00
} ;
2018-09-21 18:41:00 +02:00
/* Relations supporting index creation */
static const SchemaQuery Query_for_list_of_indexables = {
2018-08-29 08:36:30 +02:00
. catname = " pg_catalog.pg_class c " ,
. selcondition =
Local partitioned indexes
When CREATE INDEX is run on a partitioned table, create catalog entries
for an index on the partitioned table (which is just a placeholder since
the table proper has no data of its own), and recurse to create actual
indexes on the existing partitions; create them in future partitions
also.
As a convenience gadget, if the new index definition matches some
existing index in partitions, these are picked up and used instead of
creating new ones. Whichever way these indexes come about, they become
attached to the index on the parent table and are dropped alongside it,
and cannot be dropped on isolation unless they are detached first.
To support pg_dump'ing these indexes, add commands
CREATE INDEX ON ONLY <table>
(which creates the index on the parent partitioned table, without
recursing) and
ALTER INDEX ATTACH PARTITION
(which is used after the indexes have been created individually on each
partition, to attach them to the parent index). These reconstruct prior
database state exactly.
Reviewed-by: (in alphabetical order) Peter Eisentraut, Robert Haas, Amit
Langote, Jesper Pedersen, Simon Riggs, David Rowley
Discussion: https://postgr.es/m/20171113170646.gzweigyrgg6pwsg4@alvherre.pgsql
2018-01-19 15:49:22 +01:00
" c.relkind IN ( " CppAsString2 ( RELKIND_RELATION ) " , "
CppAsString2 ( RELKIND_PARTITIONED_TABLE ) " , "
CppAsString2 ( RELKIND_MATVIEW ) " ) " ,
2018-08-29 08:36:30 +02:00
. viscondition = " pg_catalog.pg_table_is_visible(c.oid) " ,
. namespace = " c.relnamespace " ,
. result = " pg_catalog.quote_ident(c.relname) " ,
Local partitioned indexes
When CREATE INDEX is run on a partitioned table, create catalog entries
for an index on the partitioned table (which is just a placeholder since
the table proper has no data of its own), and recurse to create actual
indexes on the existing partitions; create them in future partitions
also.
As a convenience gadget, if the new index definition matches some
existing index in partitions, these are picked up and used instead of
creating new ones. Whichever way these indexes come about, they become
attached to the index on the parent table and are dropped alongside it,
and cannot be dropped on isolation unless they are detached first.
To support pg_dump'ing these indexes, add commands
CREATE INDEX ON ONLY <table>
(which creates the index on the parent partitioned table, without
recursing) and
ALTER INDEX ATTACH PARTITION
(which is used after the indexes have been created individually on each
partition, to attach them to the parent index). These reconstruct prior
database state exactly.
Reviewed-by: (in alphabetical order) Peter Eisentraut, Robert Haas, Amit
Langote, Jesper Pedersen, Simon Riggs, David Rowley
Discussion: https://postgr.es/m/20171113170646.gzweigyrgg6pwsg4@alvherre.pgsql
2018-01-19 15:49:22 +01:00
} ;
2018-09-21 18:41:00 +02:00
/* Relations supporting VACUUM */
static const SchemaQuery Query_for_list_of_vacuumables = {
2018-08-29 08:36:30 +02:00
. catname = " pg_catalog.pg_class c " ,
. selcondition =
2017-03-10 04:42:16 +01:00
" c.relkind IN ( " CppAsString2 ( RELKIND_RELATION ) " , "
CppAsString2 ( RELKIND_MATVIEW ) " ) " ,
2018-08-29 08:36:30 +02:00
. viscondition = " pg_catalog.pg_table_is_visible(c.oid) " ,
. namespace = " c.relnamespace " ,
. result = " pg_catalog.quote_ident(c.relname) " ,
2012-04-06 21:02:35 +02:00
} ;
2018-09-21 18:41:00 +02:00
/* Relations supporting CLUSTER are currently same as those supporting VACUUM */
# define Query_for_list_of_clusterables Query_for_list_of_vacuumables
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
2018-09-21 18:41:00 +02:00
static const SchemaQuery Query_for_list_of_constraints_with_schema = {
. catname = " pg_catalog.pg_constraint c " ,
. selcondition = " c.conrelid <> 0 " ,
. viscondition = " true " , /* there is no pg_constraint_is_visible */
. namespace = " c.connamespace " ,
. result = " pg_catalog.quote_ident(c.conname) " ,
2013-03-04 01:23:31 +01:00
} ;
Change CREATE STATISTICS syntax
Previously, we had the WITH clause in the middle of the command, where
you'd specify both generic options as well as statistic types. Few
people liked this, so this commit changes it to remove the WITH keyword
from that clause and makes it accept statistic types only. (We
currently don't have any generic options, but if we invent in the
future, we will gain a new WITH clause, probably at the end of the
command).
Also, the column list is now specified without parens, which makes the
whole command look more similar to a SELECT command. This change will
let us expand the command to supporting expressions (not just columns
names) as well as multiple tables and their join conditions.
Tom added lots of code comments and fixed some parts of the CREATE
STATISTICS reference page, too; more changes in this area are
forthcoming. He also fixed a potential problem in the alter_generic
regression test, reducing verbosity on a cascaded drop to avoid
dependency on message ordering, as we do in other tests.
Tom also closed a security bug: we documented that table ownership was
required in order to create a statistics object on it, but didn't
actually implement it.
Implement tab-completion for statistics objects. This can stand some
more improvement.
Authors: Alvaro Herrera, with lots of cleanup by Tom Lane
Discussion: https://postgr.es/m/20170420212426.ltvgyhnefvhixm6i@alvherre.pgsql
2017-05-12 19:59:23 +02:00
static const SchemaQuery Query_for_list_of_statistics = {
2018-08-29 08:36:30 +02:00
. catname = " pg_catalog.pg_statistic_ext s " ,
. viscondition = " pg_catalog.pg_statistics_obj_is_visible(s.oid) " ,
. namespace = " s.stxnamespace " ,
. result = " pg_catalog.quote_ident(s.stxname) " ,
Change CREATE STATISTICS syntax
Previously, we had the WITH clause in the middle of the command, where
you'd specify both generic options as well as statistic types. Few
people liked this, so this commit changes it to remove the WITH keyword
from that clause and makes it accept statistic types only. (We
currently don't have any generic options, but if we invent in the
future, we will gain a new WITH clause, probably at the end of the
command).
Also, the column list is now specified without parens, which makes the
whole command look more similar to a SELECT command. This change will
let us expand the command to supporting expressions (not just columns
names) as well as multiple tables and their join conditions.
Tom added lots of code comments and fixed some parts of the CREATE
STATISTICS reference page, too; more changes in this area are
forthcoming. He also fixed a potential problem in the alter_generic
regression test, reducing verbosity on a cascaded drop to avoid
dependency on message ordering, as we do in other tests.
Tom also closed a security bug: we documented that table ownership was
required in order to create a statistics object on it, but didn't
actually implement it.
Implement tab-completion for statistics objects. This can stand some
more improvement.
Authors: Alvaro Herrera, with lots of cleanup by Tom Lane
Discussion: https://postgr.es/m/20170420212426.ltvgyhnefvhixm6i@alvherre.pgsql
2017-05-12 19:59:23 +02:00
} ;
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
2002-08-10 05:56:24 +02:00
/*
* Queries to get lists of names of various kinds of things , possibly
* restricted to names matching a partially entered name . In these queries ,
2008-03-29 20:19:14 +01:00
* the first % s will be replaced by the text entered so far ( suitably escaped
* to become a SQL literal string ) . % d will be replaced by the length of the
2014-05-06 18:12:18 +02:00
* string ( in unescaped form ) . A second and third % s , if present , will be
2008-03-29 20:19:14 +01:00
* replaced by a suitably - escaped version of the string provided in
* completion_info_charp . A fourth and fifth % s are similarly replaced by
* completion_info_charp2 .
2003-10-30 22:37:38 +01:00
*
* Beware that the allowed sequences of % s and % d are determined by
* _complete_from_query ( ) .
2002-08-10 05:56:24 +02:00
*/
2003-03-27 17:45:01 +01:00
# define Query_for_list_of_attributes \
2003-10-16 22:03:09 +02:00
" SELECT pg_catalog.quote_ident(attname) " \
" FROM pg_catalog.pg_attribute a, pg_catalog.pg_class c " \
2003-03-27 17:45:01 +01:00
" WHERE c.oid = a.attrelid " \
" AND a.attnum > 0 " \
" AND NOT a.attisdropped " \
2003-10-16 22:03:09 +02:00
" AND substring(pg_catalog.quote_ident(attname),1,%d)='%s' " \
2008-03-29 20:19:14 +01:00
" AND (pg_catalog.quote_ident(relname)='%s' " \
" OR ' \" ' || relname || ' \" '='%s') " \
2003-03-27 17:45:01 +01:00
" AND pg_catalog.pg_table_is_visible(c.oid) "
2019-01-28 07:30:14 +01:00
# define Query_for_list_of_attribute_numbers \
" SELECT attnum " \
" FROM pg_catalog.pg_attribute a, pg_catalog.pg_class c " \
" WHERE c.oid = a.attrelid " \
" AND a.attnum > 0 " \
" AND NOT a.attisdropped " \
" AND substring(attnum::pg_catalog.text,1,%d)='%s' " \
" AND (pg_catalog.quote_ident(relname)='%s' " \
" OR ' \" ' || relname || ' \" '='%s') " \
" AND pg_catalog.pg_table_is_visible(c.oid) "
2008-03-29 20:19:14 +01:00
# define Query_for_list_of_attributes_with_schema \
" SELECT pg_catalog.quote_ident(attname) " \
" FROM pg_catalog.pg_attribute a, pg_catalog.pg_class c, pg_catalog.pg_namespace n " \
" WHERE c.oid = a.attrelid " \
" AND n.oid = c.relnamespace " \
" AND a.attnum > 0 " \
" AND NOT a.attisdropped " \
" AND substring(pg_catalog.quote_ident(attname),1,%d)='%s' " \
" AND (pg_catalog.quote_ident(relname)='%s' " \
" OR ' \" ' || relname || ' \" ' ='%s') " \
" AND (pg_catalog.quote_ident(nspname)='%s' " \
" OR ' \" ' || nspname || ' \" ' ='%s') "
2016-11-08 22:27:09 +01:00
# define Query_for_list_of_enum_values \
" SELECT pg_catalog.quote_literal(enumlabel) " \
" FROM pg_catalog.pg_enum e, pg_catalog.pg_type t " \
" WHERE t.oid = e.enumtypid " \
" AND substring(pg_catalog.quote_literal(enumlabel),1,%d)='%s' " \
" AND (pg_catalog.quote_ident(typname)='%s' " \
" OR ' \" ' || typname || ' \" '='%s') " \
" AND pg_catalog.pg_type_is_visible(t.oid) "
# define Query_for_list_of_enum_values_with_schema \
" SELECT pg_catalog.quote_literal(enumlabel) " \
" FROM pg_catalog.pg_enum e, pg_catalog.pg_type t, pg_catalog.pg_namespace n " \
" WHERE t.oid = e.enumtypid " \
" AND n.oid = t.typnamespace " \
" AND substring(pg_catalog.quote_literal(enumlabel),1,%d)='%s' " \
" AND (pg_catalog.quote_ident(typname)='%s' " \
" OR ' \" ' || typname || ' \" '='%s') " \
" AND (pg_catalog.quote_ident(nspname)='%s' " \
" OR ' \" ' || nspname || ' \" ' ='%s') "
2007-09-14 06:25:24 +02:00
# define Query_for_list_of_template_databases \
2016-09-11 22:37:27 +02:00
" SELECT pg_catalog.quote_ident(d.datname) " \
" FROM pg_catalog.pg_database d " \
" WHERE substring(pg_catalog.quote_ident(d.datname),1,%d)='%s' " \
2016-09-12 16:22:57 +02:00
" AND (d.datistemplate OR pg_catalog.pg_has_role(d.datdba, 'USAGE')) "
2007-09-14 06:25:24 +02:00
2003-03-27 17:45:01 +01:00
# define Query_for_list_of_databases \
2003-10-16 22:03:09 +02:00
" SELECT pg_catalog.quote_ident(datname) FROM pg_catalog.pg_database " \
" WHERE substring(pg_catalog.quote_ident(datname),1,%d)='%s' "
2003-03-27 17:45:01 +01:00
Attached is the third version of my patch that adds/fixes several things
to/in the psql-tabcomplete code. This diff includes the still missing
tab-complete support for TABLESPACE I already sent earlier. New in this
version of the patch is a small adaption of the tab-complete code to
support the adjusted SAVEPOINT-Syntax commited by Tom, as well as
completion of the only half working (and I think only by accident)
tabcomplete-suppport for "BEGIN [ TRANSACTION | WORK ]".
below is a complete list of the things I have changed with this patch:
*) add tablespace support for CREATE/DROP/ALTER and \db
*) sync the list of possible commands following ALTER with the docs (by
adding
AGGREGATE,CONVERSATION,DOMAIN,FUNCTION,LANGUAGE,OPERATOR,SEQUENCE,TABLESPACE
and TYPE)
*) provide a list of valid users after "OWNER TO"
*) tab-complete support for ALTER (AGGREGATE|CONVERSION|FUNCTION)
*) basic tab-complete support for ALTER DOMAIN
*) provide a list of suitable indexes following ALTER TABLE <sth>
CLUSTER ON(?)
*) add "CLUSTER ON" and "SET" to the ALTER TABLE <sth> - tab-complete
list(fixes incorrect/wrong tab-complete with ALTER TABLE <sth> SET
+<TAB> too)
*) provide a list of possible indexes following ALTER TABLE <sth> CLUSTER ON
*) provide list of possible commands(WITHOUT CLUSTER,WITHOUT OIDS,
TABLESPACE) following ALTER TABLE <sth> SET
*) sync "COMMENT ON" with docs by adding "CAST","CONVERSION","FUNCTION"
*) add ABSOLUT to the list of possible commands after FETCH
*) "END" was missing from the sql-commands overview (though it had
completion support!) - i know it's depreciated but we have ABORT and
others still in ...
*) fixes small buglet with ALTER (TRIGGER|CLUSTER) ON autocomplete
(CLUSTER ON +<TAB> would produce CLUSTER ON ON - same for TRIGGER ON)
*) adapt to new SAVEPOINT syntax
*) fix incomplete Support for BEGIN [ TRANSACTION | WORK ]
Stefan Kaltenbrunn
2004-08-20 21:24:59 +02:00
# define Query_for_list_of_tablespaces \
" SELECT pg_catalog.quote_ident(spcname) FROM pg_catalog.pg_tablespace " \
" WHERE substring(pg_catalog.quote_ident(spcname),1,%d)='%s' "
2003-06-12 03:38:08 +02:00
# define Query_for_list_of_encodings \
" SELECT DISTINCT pg_catalog.pg_encoding_to_char(conforencoding) " \
" FROM pg_catalog.pg_conversion " \
2003-10-16 22:03:09 +02:00
" WHERE substring(pg_catalog.pg_encoding_to_char(conforencoding),1,%d)=UPPER('%s') "
2003-06-12 03:38:08 +02:00
2003-03-27 17:45:01 +01:00
# define Query_for_list_of_languages \
2003-10-16 22:03:09 +02:00
" SELECT pg_catalog.quote_ident(lanname) " \
2010-01-02 22:28:46 +01:00
" FROM pg_catalog.pg_language " \
2003-03-27 17:45:01 +01:00
" WHERE lanname != 'internal' " \
2010-01-02 22:28:46 +01:00
" AND substring(pg_catalog.quote_ident(lanname),1,%d)='%s' "
2003-03-27 17:45:01 +01:00
# define Query_for_list_of_schemas \
2003-10-16 22:03:09 +02:00
" SELECT pg_catalog.quote_ident(nspname) FROM pg_catalog.pg_namespace " \
" WHERE substring(pg_catalog.quote_ident(nspname),1,%d)='%s' "
2003-03-27 17:45:01 +01:00
2013-12-19 18:33:27 +01:00
# define Query_for_list_of_alter_system_set_vars \
" SELECT name FROM " \
" (SELECT pg_catalog.lower(name) AS name FROM pg_catalog.pg_settings " \
2017-02-15 21:23:19 +01:00
" WHERE context != 'internal' " \
" UNION ALL SELECT 'all') ss " \
" WHERE substring(name,1,%d)='%s' "
2013-12-19 18:33:27 +01:00
2005-08-14 20:49:30 +02:00
# define Query_for_list_of_set_vars \
" SELECT name FROM " \
" (SELECT pg_catalog.lower(name) AS name FROM pg_catalog.pg_settings " \
" WHERE context IN ('user', 'superuser') " \
" UNION ALL SELECT 'constraints' " \
" UNION ALL SELECT 'transaction' " \
" UNION ALL SELECT 'session' " \
" UNION ALL SELECT 'role' " \
2008-11-07 19:25:07 +01:00
" UNION ALL SELECT 'tablespace' " \
2005-08-14 20:49:30 +02:00
" UNION ALL SELECT 'all') ss " \
" WHERE substring(name,1,%d)='%s' "
# define Query_for_list_of_show_vars \
" SELECT name FROM " \
" (SELECT pg_catalog.lower(name) AS name FROM pg_catalog.pg_settings " \
" UNION ALL SELECT 'session authorization' " \
" UNION ALL SELECT 'all') ss " \
" WHERE substring(name,1,%d)='%s' "
# define Query_for_list_of_roles \
" SELECT pg_catalog.quote_ident(rolname) " \
" FROM pg_catalog.pg_roles " \
" WHERE substring(pg_catalog.quote_ident(rolname),1,%d)='%s' "
2002-08-10 05:56:24 +02:00
2005-08-14 20:49:30 +02:00
# define Query_for_list_of_grant_roles \
" SELECT pg_catalog.quote_ident(rolname) " \
" FROM pg_catalog.pg_roles " \
" WHERE substring(pg_catalog.quote_ident(rolname),1,%d)='%s' " \
2015-09-08 18:58:29 +02:00
" UNION ALL SELECT 'PUBLIC' " \
" UNION ALL SELECT 'CURRENT_USER' " \
" UNION ALL SELECT 'SESSION_USER' "
2005-05-18 06:47:40 +02:00
Attached is the third version of my patch that adds/fixes several things
to/in the psql-tabcomplete code. This diff includes the still missing
tab-complete support for TABLESPACE I already sent earlier. New in this
version of the patch is a small adaption of the tab-complete code to
support the adjusted SAVEPOINT-Syntax commited by Tom, as well as
completion of the only half working (and I think only by accident)
tabcomplete-suppport for "BEGIN [ TRANSACTION | WORK ]".
below is a complete list of the things I have changed with this patch:
*) add tablespace support for CREATE/DROP/ALTER and \db
*) sync the list of possible commands following ALTER with the docs (by
adding
AGGREGATE,CONVERSATION,DOMAIN,FUNCTION,LANGUAGE,OPERATOR,SEQUENCE,TABLESPACE
and TYPE)
*) provide a list of valid users after "OWNER TO"
*) tab-complete support for ALTER (AGGREGATE|CONVERSION|FUNCTION)
*) basic tab-complete support for ALTER DOMAIN
*) provide a list of suitable indexes following ALTER TABLE <sth>
CLUSTER ON(?)
*) add "CLUSTER ON" and "SET" to the ALTER TABLE <sth> - tab-complete
list(fixes incorrect/wrong tab-complete with ALTER TABLE <sth> SET
+<TAB> too)
*) provide a list of possible indexes following ALTER TABLE <sth> CLUSTER ON
*) provide list of possible commands(WITHOUT CLUSTER,WITHOUT OIDS,
TABLESPACE) following ALTER TABLE <sth> SET
*) sync "COMMENT ON" with docs by adding "CAST","CONVERSION","FUNCTION"
*) add ABSOLUT to the list of possible commands after FETCH
*) "END" was missing from the sql-commands overview (though it had
completion support!) - i know it's depreciated but we have ABORT and
others still in ...
*) fixes small buglet with ALTER (TRIGGER|CLUSTER) ON autocomplete
(CLUSTER ON +<TAB> would produce CLUSTER ON ON - same for TRIGGER ON)
*) adapt to new SAVEPOINT syntax
*) fix incomplete Support for BEGIN [ TRANSACTION | WORK ]
Stefan Kaltenbrunn
2004-08-20 21:24:59 +02:00
/* the silly-looking length condition is just to eat up the current word */
# define Query_for_index_of_table \
" SELECT pg_catalog.quote_ident(c2.relname) " \
" FROM pg_catalog.pg_class c1, pg_catalog.pg_class c2, pg_catalog.pg_index i " \
" WHERE c1.oid=i.indrelid and i.indexrelid=c2.oid " \
2007-06-14 01:59:47 +02:00
" and (%d = pg_catalog.length('%s')) " \
Attached is the third version of my patch that adds/fixes several things
to/in the psql-tabcomplete code. This diff includes the still missing
tab-complete support for TABLESPACE I already sent earlier. New in this
version of the patch is a small adaption of the tab-complete code to
support the adjusted SAVEPOINT-Syntax commited by Tom, as well as
completion of the only half working (and I think only by accident)
tabcomplete-suppport for "BEGIN [ TRANSACTION | WORK ]".
below is a complete list of the things I have changed with this patch:
*) add tablespace support for CREATE/DROP/ALTER and \db
*) sync the list of possible commands following ALTER with the docs (by
adding
AGGREGATE,CONVERSATION,DOMAIN,FUNCTION,LANGUAGE,OPERATOR,SEQUENCE,TABLESPACE
and TYPE)
*) provide a list of valid users after "OWNER TO"
*) tab-complete support for ALTER (AGGREGATE|CONVERSION|FUNCTION)
*) basic tab-complete support for ALTER DOMAIN
*) provide a list of suitable indexes following ALTER TABLE <sth>
CLUSTER ON(?)
*) add "CLUSTER ON" and "SET" to the ALTER TABLE <sth> - tab-complete
list(fixes incorrect/wrong tab-complete with ALTER TABLE <sth> SET
+<TAB> too)
*) provide a list of possible indexes following ALTER TABLE <sth> CLUSTER ON
*) provide list of possible commands(WITHOUT CLUSTER,WITHOUT OIDS,
TABLESPACE) following ALTER TABLE <sth> SET
*) sync "COMMENT ON" with docs by adding "CAST","CONVERSION","FUNCTION"
*) add ABSOLUT to the list of possible commands after FETCH
*) "END" was missing from the sql-commands overview (though it had
completion support!) - i know it's depreciated but we have ABORT and
others still in ...
*) fixes small buglet with ALTER (TRIGGER|CLUSTER) ON autocomplete
(CLUSTER ON +<TAB> would produce CLUSTER ON ON - same for TRIGGER ON)
*) adapt to new SAVEPOINT syntax
*) fix incomplete Support for BEGIN [ TRANSACTION | WORK ]
Stefan Kaltenbrunn
2004-08-20 21:24:59 +02:00
" and pg_catalog.quote_ident(c1.relname)='%s' " \
" and pg_catalog.pg_table_is_visible(c2.oid) "
2012-08-20 22:30:08 +02:00
/* the silly-looking length condition is just to eat up the current word */
# define Query_for_constraint_of_table \
" SELECT pg_catalog.quote_ident(conname) " \
" FROM pg_catalog.pg_class c1, pg_catalog.pg_constraint con " \
" WHERE c1.oid=conrelid and (%d = pg_catalog.length('%s')) " \
" and pg_catalog.quote_ident(c1.relname)='%s' " \
" and pg_catalog.pg_table_is_visible(c1.oid) "
2012-09-15 04:11:17 +02:00
# define Query_for_all_table_constraints \
" SELECT pg_catalog.quote_ident(conname) " \
" FROM pg_catalog.pg_constraint c " \
" WHERE c.conrelid <> 0 "
/* the silly-looking length condition is just to eat up the current word */
# define Query_for_constraint_of_type \
" SELECT pg_catalog.quote_ident(conname) " \
" FROM pg_catalog.pg_type t, pg_catalog.pg_constraint con " \
" WHERE t.oid=contypid and (%d = pg_catalog.length('%s')) " \
" and pg_catalog.quote_ident(t.typname)='%s' " \
" and pg_catalog.pg_type_is_visible(t.oid) "
/* the silly-looking length condition is just to eat up the current word */
2013-05-29 22:58:43 +02:00
# define Query_for_list_of_tables_for_constraint \
2012-09-15 04:11:17 +02:00
" SELECT pg_catalog.quote_ident(relname) " \
" FROM pg_catalog.pg_class " \
" WHERE (%d = pg_catalog.length('%s')) " \
" AND oid IN " \
" (SELECT conrelid FROM pg_catalog.pg_constraint " \
" WHERE pg_catalog.quote_ident(conname)='%s') "
2014-06-23 22:47:39 +02:00
/* the silly-looking length condition is just to eat up the current word */
# define Query_for_rule_of_table \
" SELECT pg_catalog.quote_ident(rulename) " \
" FROM pg_catalog.pg_class c1, pg_catalog.pg_rewrite " \
" WHERE c1.oid=ev_class and (%d = pg_catalog.length('%s')) " \
" and pg_catalog.quote_ident(c1.relname)='%s' " \
" and pg_catalog.pg_table_is_visible(c1.oid) "
2013-02-09 05:58:40 +01:00
/* the silly-looking length condition is just to eat up the current word */
# define Query_for_list_of_tables_for_rule \
" SELECT pg_catalog.quote_ident(relname) " \
" FROM pg_catalog.pg_class " \
" WHERE (%d = pg_catalog.length('%s')) " \
" AND oid IN " \
" (SELECT ev_class FROM pg_catalog.pg_rewrite " \
" WHERE pg_catalog.quote_ident(rulename)='%s') "
2014-06-23 22:47:39 +02:00
/* the silly-looking length condition is just to eat up the current word */
# define Query_for_trigger_of_table \
" SELECT pg_catalog.quote_ident(tgname) " \
" FROM pg_catalog.pg_class c1, pg_catalog.pg_trigger " \
" WHERE c1.oid=tgrelid and (%d = pg_catalog.length('%s')) " \
" and pg_catalog.quote_ident(c1.relname)='%s' " \
" and pg_catalog.pg_table_is_visible(c1.oid) " \
" and not tgisinternal "
2004-09-22 06:25:16 +02:00
/* the silly-looking length condition is just to eat up the current word */
# define Query_for_list_of_tables_for_trigger \
" SELECT pg_catalog.quote_ident(relname) " \
" FROM pg_catalog.pg_class " \
2007-06-14 01:59:47 +02:00
" WHERE (%d = pg_catalog.length('%s')) " \
2004-09-22 06:25:16 +02:00
" AND oid IN " \
" (SELECT tgrelid FROM pg_catalog.pg_trigger " \
" WHERE pg_catalog.quote_ident(tgname)='%s') "
2007-09-14 06:25:24 +02:00
# define Query_for_list_of_ts_configurations \
" SELECT pg_catalog.quote_ident(cfgname) FROM pg_catalog.pg_ts_config " \
" WHERE substring(pg_catalog.quote_ident(cfgname),1,%d)='%s' "
# define Query_for_list_of_ts_dictionaries \
" SELECT pg_catalog.quote_ident(dictname) FROM pg_catalog.pg_ts_dict " \
" WHERE substring(pg_catalog.quote_ident(dictname),1,%d)='%s' "
# define Query_for_list_of_ts_parsers \
" SELECT pg_catalog.quote_ident(prsname) FROM pg_catalog.pg_ts_parser " \
" WHERE substring(pg_catalog.quote_ident(prsname),1,%d)='%s' "
# define Query_for_list_of_ts_templates \
" SELECT pg_catalog.quote_ident(tmplname) FROM pg_catalog.pg_ts_template " \
" WHERE substring(pg_catalog.quote_ident(tmplname),1,%d)='%s' "
2008-12-19 17:25:19 +01:00
# define Query_for_list_of_fdws \
" SELECT pg_catalog.quote_ident(fdwname) " \
" FROM pg_catalog.pg_foreign_data_wrapper " \
" WHERE substring(pg_catalog.quote_ident(fdwname),1,%d)='%s' "
# define Query_for_list_of_servers \
" SELECT pg_catalog.quote_ident(srvname) " \
" FROM pg_catalog.pg_foreign_server " \
" WHERE substring(pg_catalog.quote_ident(srvname),1,%d)='%s' "
# define Query_for_list_of_user_mappings \
" SELECT pg_catalog.quote_ident(usename) " \
" FROM pg_catalog.pg_user_mappings " \
" WHERE substring(pg_catalog.quote_ident(usename),1,%d)='%s' "
2010-02-17 05:09:40 +01:00
# define Query_for_list_of_access_methods \
" SELECT pg_catalog.quote_ident(amname) " \
" FROM pg_catalog.pg_am " \
" WHERE substring(pg_catalog.quote_ident(amname),1,%d)='%s' "
2012-07-05 14:03:49 +02:00
/* the silly-looking length condition is just to eat up the current word */
2010-04-05 07:33:24 +02:00
# define Query_for_list_of_arguments \
2012-07-05 14:03:49 +02:00
" SELECT pg_catalog.oidvectortypes(proargtypes)||')' " \
" FROM pg_catalog.pg_proc " \
" WHERE (%d = pg_catalog.length('%s')) " \
" AND (pg_catalog.quote_ident(proname)='%s' " \
" OR ' \" ' || proname || ' \" '='%s') " \
" AND (pg_catalog.pg_function_is_visible(pg_proc.oid)) "
/* the silly-looking length condition is just to eat up the current word */
# define Query_for_list_of_arguments_with_schema \
" SELECT pg_catalog.oidvectortypes(proargtypes)||')' " \
" FROM pg_catalog.pg_proc p, pg_catalog.pg_namespace n " \
" WHERE (%d = pg_catalog.length('%s')) " \
" AND n.oid = p.pronamespace " \
" AND (pg_catalog.quote_ident(proname)='%s' " \
" OR ' \" ' || proname || ' \" ' ='%s') " \
" AND (pg_catalog.quote_ident(nspname)='%s' " \
" OR ' \" ' || nspname || ' \" ' ='%s') "
2010-04-05 07:33:24 +02:00
2011-02-08 22:08:41 +01:00
# define Query_for_list_of_extensions \
" SELECT pg_catalog.quote_ident(extname) " \
" FROM pg_catalog.pg_extension " \
" WHERE substring(pg_catalog.quote_ident(extname),1,%d)='%s' "
# define Query_for_list_of_available_extensions \
" SELECT pg_catalog.quote_ident(name) " \
" FROM pg_catalog.pg_available_extensions " \
2011-02-14 22:07:00 +01:00
" WHERE substring(pg_catalog.quote_ident(name),1,%d)='%s' AND installed_version IS NULL "
2011-02-08 22:08:41 +01:00
2015-10-20 16:27:20 +02:00
/* the silly-looking length condition is just to eat up the current word */
# define Query_for_list_of_available_extension_versions \
" SELECT pg_catalog.quote_ident(version) " \
" FROM pg_catalog.pg_available_extension_versions " \
" WHERE (%d = pg_catalog.length('%s')) " \
" AND pg_catalog.quote_ident(name)='%s' "
2016-08-18 17:17:10 +02:00
/* the silly-looking length condition is just to eat up the current word */
# define Query_for_list_of_available_extension_versions_with_TO \
" SELECT 'TO ' || pg_catalog.quote_ident(version) " \
" FROM pg_catalog.pg_available_extension_versions " \
" WHERE (%d = pg_catalog.length('%s')) " \
" AND pg_catalog.quote_ident(name)='%s' "
2011-10-24 01:25:34 +02:00
# define Query_for_list_of_prepared_statements \
" SELECT pg_catalog.quote_ident(name) " \
" FROM pg_catalog.pg_prepared_statements " \
" WHERE substring(pg_catalog.quote_ident(name),1,%d)='%s' "
2014-04-14 14:44:21 +02:00
# define Query_for_list_of_event_triggers \
" SELECT pg_catalog.quote_ident(evtname) " \
" FROM pg_catalog.pg_event_trigger " \
" WHERE substring(pg_catalog.quote_ident(evtname),1,%d)='%s' "
2015-06-22 20:13:56 +02:00
# define Query_for_list_of_tablesample_methods \
Redesign tablesample method API, and do extensive code review.
The original implementation of TABLESAMPLE modeled the tablesample method
API on index access methods, which wasn't a good choice because, without
specialized DDL commands, there's no way to build an extension that can
implement a TSM. (Raw inserts into system catalogs are not an acceptable
thing to do, because we can't undo them during DROP EXTENSION, nor will
pg_upgrade behave sanely.) Instead adopt an API more like procedural
language handlers or foreign data wrappers, wherein the only SQL-level
support object needed is a single handler function identified by having
a special return type. This lets us get rid of the supporting catalog
altogether, so that no custom DDL support is needed for the feature.
Adjust the API so that it can support non-constant tablesample arguments
(the original coding assumed we could evaluate the argument expressions at
ExecInitSampleScan time, which is undesirable even if it weren't outright
unsafe), and discourage sampling methods from looking at invisible tuples.
Make sure that the BERNOULLI and SYSTEM methods are genuinely repeatable
within and across queries, as required by the SQL standard, and deal more
honestly with methods that can't support that requirement.
Make a full code-review pass over the tablesample additions, and fix
assorted bugs, omissions, infelicities, and cosmetic issues (such as
failure to put the added code stanzas in a consistent ordering).
Improve EXPLAIN's output of tablesample plans, too.
Back-patch to 9.5 so that we don't have to support the original API
in production.
2015-07-25 20:39:00 +02:00
" SELECT pg_catalog.quote_ident(proname) " \
" FROM pg_catalog.pg_proc " \
" WHERE prorettype = 'pg_catalog.tsm_handler'::pg_catalog.regtype AND " \
" proargtypes[0] = 'pg_catalog.internal'::pg_catalog.regtype AND " \
" substring(pg_catalog.quote_ident(proname),1,%d)='%s' "
2015-06-22 20:13:56 +02:00
2015-07-20 15:37:17 +02:00
# define Query_for_list_of_policies \
" SELECT pg_catalog.quote_ident(polname) " \
Redesign tablesample method API, and do extensive code review.
The original implementation of TABLESAMPLE modeled the tablesample method
API on index access methods, which wasn't a good choice because, without
specialized DDL commands, there's no way to build an extension that can
implement a TSM. (Raw inserts into system catalogs are not an acceptable
thing to do, because we can't undo them during DROP EXTENSION, nor will
pg_upgrade behave sanely.) Instead adopt an API more like procedural
language handlers or foreign data wrappers, wherein the only SQL-level
support object needed is a single handler function identified by having
a special return type. This lets us get rid of the supporting catalog
altogether, so that no custom DDL support is needed for the feature.
Adjust the API so that it can support non-constant tablesample arguments
(the original coding assumed we could evaluate the argument expressions at
ExecInitSampleScan time, which is undesirable even if it weren't outright
unsafe), and discourage sampling methods from looking at invisible tuples.
Make sure that the BERNOULLI and SYSTEM methods are genuinely repeatable
within and across queries, as required by the SQL standard, and deal more
honestly with methods that can't support that requirement.
Make a full code-review pass over the tablesample additions, and fix
assorted bugs, omissions, infelicities, and cosmetic issues (such as
failure to put the added code stanzas in a consistent ordering).
Improve EXPLAIN's output of tablesample plans, too.
Back-patch to 9.5 so that we don't have to support the original API
in production.
2015-07-25 20:39:00 +02:00
" FROM pg_catalog.pg_policy " \
2015-07-20 15:37:17 +02:00
" WHERE substring(pg_catalog.quote_ident(polname),1,%d)='%s' "
# define Query_for_list_of_tables_for_policy \
" SELECT pg_catalog.quote_ident(relname) " \
" FROM pg_catalog.pg_class " \
" WHERE (%d = pg_catalog.length('%s')) " \
" AND oid IN " \
" (SELECT polrelid FROM pg_catalog.pg_policy " \
" WHERE pg_catalog.quote_ident(polname)='%s') "
2015-09-08 20:57:35 +02:00
# define Query_for_enum \
" SELECT name FROM ( " \
" SELECT pg_catalog.quote_ident(pg_catalog.unnest(enumvals)) AS name " \
" FROM pg_catalog.pg_settings " \
" WHERE pg_catalog.lower(name)=pg_catalog.lower('%s') " \
" UNION ALL " \
" SELECT 'DEFAULT' ) ss " \
" WHERE pg_catalog.substring(name,1,%%d)='%%s' "
2017-02-26 18:20:00 +01:00
/* the silly-looking length condition is just to eat up the current word */
# define Query_for_partition_of_table \
" SELECT pg_catalog.quote_ident(c2.relname) " \
" FROM pg_catalog.pg_class c1, pg_catalog.pg_class c2, pg_catalog.pg_inherits i " \
" WHERE c1.oid=i.inhparent and i.inhrelid=c2.oid " \
" and (%d = pg_catalog.length('%s')) " \
" and pg_catalog.quote_ident(c1.relname)='%s' " \
" and pg_catalog.pg_table_is_visible(c2.oid) " \
" and c2.relispartition = 'true' "
2018-03-05 21:37:23 +01:00
/*
* These object types were introduced later than our support cutoff of
* server version 7.4 . We use the VersionedQuery infrastructure so that
* we don ' t send certain - to - fail queries to older servers .
*/
static const VersionedQuery Query_for_list_of_publications [ ] = {
{ 100000 ,
" SELECT pg_catalog.quote_ident(pubname) "
" FROM pg_catalog.pg_publication "
" WHERE substring(pg_catalog.quote_ident(pubname),1,%d)='%s' "
} ,
{ 0 , NULL }
} ;
static const VersionedQuery Query_for_list_of_subscriptions [ ] = {
{ 100000 ,
" SELECT pg_catalog.quote_ident(s.subname) "
" FROM pg_catalog.pg_subscription s, pg_catalog.pg_database d "
" WHERE substring(pg_catalog.quote_ident(s.subname),1,%d)='%s' "
" AND d.datname = pg_catalog.current_database() "
" AND s.subdbid = d.oid "
} ,
{ 0 , NULL }
} ;
2003-10-30 22:37:38 +01:00
/*
* This is a list of all " things " in Pgsql , which can show up after CREATE or
* DROP ; and there is also a query to get a list of them .
*/
2003-03-27 17:45:01 +01:00
2000-04-12 19:17:23 +02:00
typedef struct
{
2003-10-30 22:37:38 +01:00
const char * name ;
const char * query ; /* simple query, or NULL */
2018-03-05 21:37:23 +01:00
const VersionedQuery * vquery ; /* versioned query, or NULL */
2003-10-30 22:37:38 +01:00
const SchemaQuery * squery ; /* schema query, or NULL */
2011-02-24 02:13:27 +01:00
const bits32 flags ; /* visibility flags, see below */
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
} pgsql_thing_t ;
2011-02-24 02:13:27 +01:00
# define THING_NO_CREATE (1 << 0) /* should not show up after CREATE */
# define THING_NO_DROP (1 << 1) /* should not show up after DROP */
2017-03-16 23:54:28 +01:00
# define THING_NO_ALTER (1 << 2) /* should not show up after ALTER */
# define THING_NO_SHOW (THING_NO_CREATE | THING_NO_DROP | THING_NO_ALTER)
2011-02-24 02:13:27 +01:00
2003-10-30 22:37:38 +01:00
static const pgsql_thing_t words_after_create [ ] = {
2018-03-05 21:37:23 +01:00
{ " ACCESS METHOD " , NULL , NULL , NULL , THING_NO_ALTER } ,
{ " AGGREGATE " , NULL , NULL , Query_for_list_of_aggregates } ,
{ " CAST " , NULL , NULL , NULL } , /* Casts have complex structures for names, so
2005-10-15 04:49:52 +02:00
* skip it */
2011-03-11 19:20:11 +01:00
{ " COLLATION " , " SELECT pg_catalog.quote_ident(collname) FROM pg_catalog.pg_collation WHERE collencoding IN (-1, pg_catalog.pg_char_to_encoding(pg_catalog.getdatabaseencoding())) AND substring(pg_catalog.quote_ident(collname),1,%d)='%s' " } ,
2005-10-15 04:49:52 +02:00
/*
* CREATE CONSTRAINT TRIGGER is not supported here because it is designed
* to be used only by pg_dump .
*/
2018-03-05 21:37:23 +01:00
{ " CONFIGURATION " , Query_for_list_of_ts_configurations , NULL , NULL , THING_NO_SHOW } ,
2003-10-30 22:37:38 +01:00
{ " CONVERSION " , " SELECT pg_catalog.quote_ident(conname) FROM pg_catalog.pg_conversion WHERE substring(pg_catalog.quote_ident(conname),1,%d)='%s' " } ,
{ " DATABASE " , Query_for_list_of_databases } ,
2018-03-05 21:37:23 +01:00
{ " DEFAULT PRIVILEGES " , NULL , NULL , NULL , THING_NO_CREATE | THING_NO_DROP } ,
{ " DICTIONARY " , Query_for_list_of_ts_dictionaries , NULL , NULL , THING_NO_SHOW } ,
{ " DOMAIN " , NULL , NULL , & Query_for_list_of_domains } ,
{ " EVENT TRIGGER " , NULL , NULL , NULL } ,
2011-02-08 22:08:41 +01:00
{ " EXTENSION " , Query_for_list_of_extensions } ,
2018-03-05 21:37:23 +01:00
{ " FOREIGN DATA WRAPPER " , NULL , NULL , NULL } ,
{ " FOREIGN TABLE " , NULL , NULL , NULL } ,
{ " FUNCTION " , NULL , NULL , Query_for_list_of_functions } ,
2005-08-14 20:49:30 +02:00
{ " GROUP " , Query_for_list_of_roles } ,
2018-03-05 21:37:23 +01:00
{ " INDEX " , NULL , NULL , & Query_for_list_of_indexes } ,
2017-03-16 23:54:28 +01:00
{ " LANGUAGE " , Query_for_list_of_languages } ,
2018-03-05 21:37:23 +01:00
{ " LARGE OBJECT " , NULL , NULL , NULL , THING_NO_CREATE | THING_NO_DROP } ,
{ " MATERIALIZED VIEW " , NULL , NULL , & Query_for_list_of_matviews } ,
{ " OPERATOR " , NULL , NULL , NULL } , /* Querying for this is probably not such
* a good idea . */
{ " OWNED " , NULL , NULL , NULL , THING_NO_CREATE | THING_NO_ALTER } , /* for DROP OWNED BY ... */
{ " PARSER " , Query_for_list_of_ts_parsers , NULL , NULL , THING_NO_SHOW } ,
{ " POLICY " , NULL , NULL , NULL } ,
{ " PROCEDURE " , NULL , NULL , Query_for_list_of_procedures } ,
{ " PUBLICATION " , NULL , Query_for_list_of_publications } ,
2005-08-14 20:49:30 +02:00
{ " ROLE " , Query_for_list_of_roles } ,
2018-03-05 21:37:23 +01:00
{ " ROUTINE " , NULL , NULL , & Query_for_list_of_routines , THING_NO_CREATE } ,
2003-10-30 22:37:38 +01:00
{ " RULE " , " SELECT pg_catalog.quote_ident(rulename) FROM pg_catalog.pg_rules WHERE substring(pg_catalog.quote_ident(rulename),1,%d)='%s' " } ,
{ " SCHEMA " , Query_for_list_of_schemas } ,
2018-03-05 21:37:23 +01:00
{ " SEQUENCE " , NULL , NULL , & Query_for_list_of_sequences } ,
2008-12-19 17:25:19 +01:00
{ " SERVER " , Query_for_list_of_servers } ,
2018-03-05 21:37:23 +01:00
{ " STATISTICS " , NULL , NULL , & Query_for_list_of_statistics } ,
{ " SUBSCRIPTION " , NULL , Query_for_list_of_subscriptions } ,
{ " SYSTEM " , NULL , NULL , NULL , THING_NO_CREATE | THING_NO_DROP } ,
{ " TABLE " , NULL , NULL , & Query_for_list_of_tables } ,
Attached is the third version of my patch that adds/fixes several things
to/in the psql-tabcomplete code. This diff includes the still missing
tab-complete support for TABLESPACE I already sent earlier. New in this
version of the patch is a small adaption of the tab-complete code to
support the adjusted SAVEPOINT-Syntax commited by Tom, as well as
completion of the only half working (and I think only by accident)
tabcomplete-suppport for "BEGIN [ TRANSACTION | WORK ]".
below is a complete list of the things I have changed with this patch:
*) add tablespace support for CREATE/DROP/ALTER and \db
*) sync the list of possible commands following ALTER with the docs (by
adding
AGGREGATE,CONVERSATION,DOMAIN,FUNCTION,LANGUAGE,OPERATOR,SEQUENCE,TABLESPACE
and TYPE)
*) provide a list of valid users after "OWNER TO"
*) tab-complete support for ALTER (AGGREGATE|CONVERSION|FUNCTION)
*) basic tab-complete support for ALTER DOMAIN
*) provide a list of suitable indexes following ALTER TABLE <sth>
CLUSTER ON(?)
*) add "CLUSTER ON" and "SET" to the ALTER TABLE <sth> - tab-complete
list(fixes incorrect/wrong tab-complete with ALTER TABLE <sth> SET
+<TAB> too)
*) provide a list of possible indexes following ALTER TABLE <sth> CLUSTER ON
*) provide list of possible commands(WITHOUT CLUSTER,WITHOUT OIDS,
TABLESPACE) following ALTER TABLE <sth> SET
*) sync "COMMENT ON" with docs by adding "CAST","CONVERSION","FUNCTION"
*) add ABSOLUT to the list of possible commands after FETCH
*) "END" was missing from the sql-commands overview (though it had
completion support!) - i know it's depreciated but we have ABORT and
others still in ...
*) fixes small buglet with ALTER (TRIGGER|CLUSTER) ON autocomplete
(CLUSTER ON +<TAB> would produce CLUSTER ON ON - same for TRIGGER ON)
*) adapt to new SAVEPOINT syntax
*) fix incomplete Support for BEGIN [ TRANSACTION | WORK ]
Stefan Kaltenbrunn
2004-08-20 21:24:59 +02:00
{ " TABLESPACE " , Query_for_list_of_tablespaces } ,
2018-03-05 21:37:23 +01:00
{ " TEMP " , NULL , NULL , NULL , THING_NO_DROP | THING_NO_ALTER } , /* for CREATE TEMP TABLE
* . . . */
{ " TEMPLATE " , Query_for_list_of_ts_templates , NULL , NULL , THING_NO_SHOW } ,
{ " TEMPORARY " , NULL , NULL , NULL , THING_NO_DROP | THING_NO_ALTER } , /* for CREATE TEMPORARY
* TABLE . . . */
{ " TEXT SEARCH " , NULL , NULL , NULL } ,
{ " TRANSFORM " , NULL , NULL , NULL } ,
2014-06-23 22:47:39 +02:00
{ " TRIGGER " , " SELECT pg_catalog.quote_ident(tgname) FROM pg_catalog.pg_trigger WHERE substring(pg_catalog.quote_ident(tgname),1,%d)='%s' AND NOT tgisinternal " } ,
2018-03-05 21:37:23 +01:00
{ " TYPE " , NULL , NULL , & Query_for_list_of_datatypes } ,
{ " UNIQUE " , NULL , NULL , NULL , THING_NO_DROP | THING_NO_ALTER } , /* for CREATE UNIQUE
* INDEX . . . */
{ " UNLOGGED " , NULL , NULL , NULL , THING_NO_DROP | THING_NO_ALTER } , /* for CREATE UNLOGGED
* TABLE . . . */
2017-07-27 20:13:15 +02:00
{ " USER " , Query_for_list_of_roles " UNION SELECT 'MAPPING FOR' " } ,
2018-03-05 21:37:23 +01:00
{ " USER MAPPING FOR " , NULL , NULL , NULL } ,
{ " VIEW " , NULL , NULL , & Query_for_list_of_views } ,
2011-04-10 17:42:00 +02:00
{ NULL } /* end of list */
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
} ;
2018-12-23 01:33:49 +01:00
/* Storage parameters for CREATE TABLE and ALTER TABLE */
static const char * const table_storage_parameters [ ] = {
" autovacuum_analyze_scale_factor " ,
" autovacuum_analyze_threshold " ,
" autovacuum_enabled " ,
" autovacuum_freeze_max_age " ,
" autovacuum_freeze_min_age " ,
" autovacuum_freeze_table_age " ,
" autovacuum_multixact_freeze_max_age " ,
" autovacuum_multixact_freeze_min_age " ,
" autovacuum_multixact_freeze_table_age " ,
" autovacuum_vacuum_cost_delay " ,
" autovacuum_vacuum_cost_limit " ,
" autovacuum_vacuum_scale_factor " ,
" autovacuum_vacuum_threshold " ,
" fillfactor " ,
" log_autovacuum_min_duration " ,
" parallel_workers " ,
" toast.autovacuum_enabled " ,
" toast.autovacuum_freeze_max_age " ,
" toast.autovacuum_freeze_min_age " ,
" toast.autovacuum_freeze_table_age " ,
" toast.autovacuum_multixact_freeze_max_age " ,
" toast.autovacuum_multixact_freeze_min_age " ,
" toast.autovacuum_multixact_freeze_table_age " ,
" toast.autovacuum_vacuum_cost_delay " ,
" toast.autovacuum_vacuum_cost_limit " ,
" toast.autovacuum_vacuum_scale_factor " ,
" toast.autovacuum_vacuum_threshold " ,
" toast.log_autovacuum_min_duration " ,
2019-04-08 09:43:57 +02:00
" toast.vacuum_truncate " ,
2018-12-23 01:33:49 +01:00
" toast_tuple_target " ,
" user_catalog_table " ,
Allow VACUUM to be run with index cleanup disabled.
This commit adds a new reloption, vacuum_index_cleanup, which
controls whether index cleanup is performed for a particular
relation by default. It also adds a new option to the VACUUM
command, INDEX_CLEANUP, which can be used to override the
reloption. If neither the reloption nor the VACUUM option is
used, the default is true, as before.
Masahiko Sawada, reviewed and tested by Nathan Bossart, Alvaro
Herrera, Kyotaro Horiguchi, Darafei Praliaskouski, and me.
The wording of the documentation is mostly due to me.
Discussion: http://postgr.es/m/CAD21AoAt5R3DNUZSjOoXDUY=naYPUOuffVsRzuTYMz29yLzQCA@mail.gmail.com
2019-04-04 20:58:53 +02:00
" vacuum_index_cleanup " ,
2019-04-08 09:43:57 +02:00
" vacuum_truncate " ,
2018-12-23 01:33:49 +01:00
NULL
} ;
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
2003-10-30 22:37:38 +01:00
/* Forward declaration of functions */
2014-04-04 17:26:01 +02:00
static char * * psql_completion ( const char * text , int start , int end ) ;
2003-10-30 22:37:38 +01:00
static char * create_command_generator ( const char * text , int state ) ;
2006-04-02 11:02:41 +02:00
static char * drop_command_generator ( const char * text , int state ) ;
2017-03-16 23:54:28 +01:00
static char * alter_command_generator ( const char * text , int state ) ;
2003-10-30 22:37:38 +01:00
static char * complete_from_query ( const char * text , int state ) ;
2018-03-05 21:37:23 +01:00
static char * complete_from_versioned_query ( const char * text , int state ) ;
2003-10-30 22:37:38 +01:00
static char * complete_from_schema_query ( const char * text , int state ) ;
2018-03-05 21:37:23 +01:00
static char * complete_from_versioned_schema_query ( const char * text , int state ) ;
static char * _complete_from_query ( const char * simple_query ,
const SchemaQuery * schema_query ,
2003-10-30 22:37:38 +01:00
const char * text , int state ) ;
static char * complete_from_list ( const char * text , int state ) ;
2010-10-11 00:42:35 +02:00
static char * complete_from_const ( const char * text , int state ) ;
2014-08-12 04:57:39 +02:00
static void append_variable_names ( char * * * varnames , int * nvars ,
2015-05-24 03:35:49 +02:00
int * maxvars , const char * varname ,
const char * prefix , const char * suffix ) ;
2014-04-04 17:26:01 +02:00
static char * * complete_from_variables ( const char * text ,
Phase 3 of pgindent updates.
Don't move parenthesized lines to the left, even if that means they
flow past the right margin.
By default, BSD indent lines up statement continuation lines that are
within parentheses so that they start just to the right of the preceding
left parenthesis. However, traditionally, if that resulted in the
continuation line extending to the right of the desired right margin,
then indent would push it left just far enough to not overrun the margin,
if it could do so without making the continuation line start to the left of
the current statement indent. That makes for a weird mix of indentations
unless one has been completely rigid about never violating the 80-column
limit.
This behavior has been pretty universally panned by Postgres developers.
Hence, disable it with indent's new -lpl switch, so that parenthesized
lines are always lined up with the preceding left paren.
This patch is much less interesting than the first round of indent
changes, but also bulkier, so I thought it best to separate the effects.
Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org
Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us
2017-06-21 21:35:54 +02:00
const char * prefix , const char * suffix , bool need_value ) ;
2012-02-28 05:06:29 +01:00
static char * complete_from_files ( const char * text , int state ) ;
2003-10-30 22:37:38 +01:00
2012-05-08 20:03:45 +02:00
static char * pg_strdup_keyword_case ( const char * s , const char * ref ) ;
2015-09-08 20:57:35 +02:00
static char * escape_string ( const char * text ) ;
2003-10-30 22:37:38 +01:00
static PGresult * exec_query ( const char * query ) ;
Teach psql's tab completion to consider the entire input string.
Up to now, the tab completion logic has only examined the last few words
of the current input line; "last few" being originally as few as four
words, but lately up to nine words. Furthermore, it only looked at what
libreadline considers the current line of input, which made it rather
myopic if you split your command across lines. This was tolerable,
sort of, so long as the match patterns were only designed to consider the
last few words of input; but with the recent addition of HeadMatches()
and Matches() matching rules, we really have to do better if we want
those to behave sanely.
Hence, change the code to break the entire line down into words, and to
include any previous lines in the command buffer along with the active
readline input buffer.
This will be a little bit slower than the previous coding, but some
measurements say that even a query of several thousand characters can be
parsed in a hundred or so microseconds on modern machines; so it's really
not going to be significant for interactive tab completion. To reduce
the cost some, I arranged to avoid the per-word malloc calls that used
to occur: all the words are now kept in one malloc'd buffer.
2015-12-20 19:28:11 +01:00
static char * * get_previous_words ( int point , char * * buffer , int * nwords ) ;
2003-10-30 22:37:38 +01:00
2015-09-08 20:57:35 +02:00
static char * get_guctype ( const char * varname ) ;
2010-10-11 00:42:35 +02:00
# ifdef NOT_USED
2003-10-30 22:37:38 +01:00
static char * quote_file_name ( char * text , int match_type , char * quote_pointer ) ;
static char * dequote_file_name ( char * text , char quote_char ) ;
# endif
2010-10-11 00:42:35 +02:00
/*
* Initialize the readline library for our purposes .
*/
2003-10-30 22:37:38 +01:00
void
initialize_readline ( void )
{
2004-08-29 07:07:03 +02:00
rl_readline_name = ( char * ) pset . progname ;
2014-04-04 17:26:01 +02:00
rl_attempted_completion_function = psql_completion ;
2003-10-30 22:37:38 +01:00
2010-02-17 05:09:40 +01:00
rl_basic_word_break_characters = WORD_BREAKS ;
2003-10-30 22:37:38 +01:00
completion_max_records = 1000 ;
/*
2005-10-15 04:49:52 +02:00
* There is a variable rl_completion_query_items for this but apparently
* it ' s not defined everywhere .
2003-10-30 22:37:38 +01:00
*/
}
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
/*
* Check if ' word ' matches any of the ' | ' - separated strings in ' pattern ' ,
2016-01-05 18:00:13 +01:00
* using case - insensitive or case - sensitive comparisons .
*
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
* If pattern is NULL , it ' s a wild card that matches any word .
2016-01-05 18:00:13 +01:00
* If pattern begins with ' ! ' , the result is negated , ie we check that ' word '
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
* does * not * match any alternative appearing in the rest of ' pattern ' .
Improve tab completion for ANALYZE, EXPLAIN, and VACUUM.
Previously, we made no attempt to provide tab completion in these
statements' optional parenthesized options lists. This patch teaches
psql to do so.
To prevent the option completions from being offered after we've already
seen a complete parenthesized option list, it's necessary to improve
word_matches() so that it allows a wildcard '*' in the middle of an
alternative, not only at the end as formerly. That requires only a
little more code than before, and it allows us to test for "incomplete
parenthesized options" with a test like
else if (HeadMatches2("EXPLAIN", "(*") &&
!HeadMatches2("EXPLAIN", "(*)"))
In addition, add some logic to offer column names in the context of
"ANALYZE tablename ( ...", and likewise for VACUUM. This isn't real
complete; it won't offer column names again after a comma. But it's
better than before, and it doesn't take much code.
Justin Pryzby, reviewed at various times by Álvaro Herrera, Arthur
Zakirov, and Edmund Horner; some additional fixups by me
Discussion: https://postgr.es/m/20180529000623.GA21896@telsasoft.com
2018-09-21 21:22:26 +02:00
* Any alternative can contain ' * ' which is a wild card , i . e . , it can match
* any substring ; however , we allow at most one ' * ' per alternative .
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
*
* For readability , callers should use the macros MatchAny and MatchAnyExcept
2016-01-05 18:00:13 +01:00
* to invoke those two special cases for ' pattern ' . ( But ' | ' and ' * ' must
* just be written directly in patterns . )
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
*/
# define MatchAny NULL
# define MatchAnyExcept(pattern) ("!" pattern)
static bool
2018-09-22 02:50:18 +02:00
word_matches ( const char * pattern ,
const char * word ,
bool case_sensitive )
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
{
Improve tab completion for ANALYZE, EXPLAIN, and VACUUM.
Previously, we made no attempt to provide tab completion in these
statements' optional parenthesized options lists. This patch teaches
psql to do so.
To prevent the option completions from being offered after we've already
seen a complete parenthesized option list, it's necessary to improve
word_matches() so that it allows a wildcard '*' in the middle of an
alternative, not only at the end as formerly. That requires only a
little more code than before, and it allows us to test for "incomplete
parenthesized options" with a test like
else if (HeadMatches2("EXPLAIN", "(*") &&
!HeadMatches2("EXPLAIN", "(*)"))
In addition, add some logic to offer column names in the context of
"ANALYZE tablename ( ...", and likewise for VACUUM. This isn't real
complete; it won't offer column names again after a comma. But it's
better than before, and it doesn't take much code.
Justin Pryzby, reviewed at various times by Álvaro Herrera, Arthur
Zakirov, and Edmund Horner; some additional fixups by me
Discussion: https://postgr.es/m/20180529000623.GA21896@telsasoft.com
2018-09-21 21:22:26 +02:00
size_t wordlen ;
# define cimatch(s1, s2, n) \
( case_sensitive ? strncmp ( s1 , s2 , n ) = = 0 : pg_strncasecmp ( s1 , s2 , n ) = = 0 )
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
/* NULL pattern matches anything. */
if ( pattern = = NULL )
return true ;
/* Handle negated patterns from the MatchAnyExcept macro. */
if ( * pattern = = ' ! ' )
2018-09-22 02:50:18 +02:00
return ! word_matches ( pattern + 1 , word , case_sensitive ) ;
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
/* Else consider each alternative in the pattern. */
wordlen = strlen ( word ) ;
for ( ; ; )
{
Improve tab completion for ANALYZE, EXPLAIN, and VACUUM.
Previously, we made no attempt to provide tab completion in these
statements' optional parenthesized options lists. This patch teaches
psql to do so.
To prevent the option completions from being offered after we've already
seen a complete parenthesized option list, it's necessary to improve
word_matches() so that it allows a wildcard '*' in the middle of an
alternative, not only at the end as formerly. That requires only a
little more code than before, and it allows us to test for "incomplete
parenthesized options" with a test like
else if (HeadMatches2("EXPLAIN", "(*") &&
!HeadMatches2("EXPLAIN", "(*)"))
In addition, add some logic to offer column names in the context of
"ANALYZE tablename ( ...", and likewise for VACUUM. This isn't real
complete; it won't offer column names again after a comma. But it's
better than before, and it doesn't take much code.
Justin Pryzby, reviewed at various times by Álvaro Herrera, Arthur
Zakirov, and Edmund Horner; some additional fixups by me
Discussion: https://postgr.es/m/20180529000623.GA21896@telsasoft.com
2018-09-21 21:22:26 +02:00
const char * star = NULL ;
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
const char * c ;
Improve tab completion for ANALYZE, EXPLAIN, and VACUUM.
Previously, we made no attempt to provide tab completion in these
statements' optional parenthesized options lists. This patch teaches
psql to do so.
To prevent the option completions from being offered after we've already
seen a complete parenthesized option list, it's necessary to improve
word_matches() so that it allows a wildcard '*' in the middle of an
alternative, not only at the end as formerly. That requires only a
little more code than before, and it allows us to test for "incomplete
parenthesized options" with a test like
else if (HeadMatches2("EXPLAIN", "(*") &&
!HeadMatches2("EXPLAIN", "(*)"))
In addition, add some logic to offer column names in the context of
"ANALYZE tablename ( ...", and likewise for VACUUM. This isn't real
complete; it won't offer column names again after a comma. But it's
better than before, and it doesn't take much code.
Justin Pryzby, reviewed at various times by Álvaro Herrera, Arthur
Zakirov, and Edmund Horner; some additional fixups by me
Discussion: https://postgr.es/m/20180529000623.GA21896@telsasoft.com
2018-09-21 21:22:26 +02:00
/* Find end of current alternative, and locate any wild card. */
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
c = pattern ;
while ( * c ! = ' \0 ' & & * c ! = ' | ' )
Improve tab completion for ANALYZE, EXPLAIN, and VACUUM.
Previously, we made no attempt to provide tab completion in these
statements' optional parenthesized options lists. This patch teaches
psql to do so.
To prevent the option completions from being offered after we've already
seen a complete parenthesized option list, it's necessary to improve
word_matches() so that it allows a wildcard '*' in the middle of an
alternative, not only at the end as formerly. That requires only a
little more code than before, and it allows us to test for "incomplete
parenthesized options" with a test like
else if (HeadMatches2("EXPLAIN", "(*") &&
!HeadMatches2("EXPLAIN", "(*)"))
In addition, add some logic to offer column names in the context of
"ANALYZE tablename ( ...", and likewise for VACUUM. This isn't real
complete; it won't offer column names again after a comma. But it's
better than before, and it doesn't take much code.
Justin Pryzby, reviewed at various times by Álvaro Herrera, Arthur
Zakirov, and Edmund Horner; some additional fixups by me
Discussion: https://postgr.es/m/20180529000623.GA21896@telsasoft.com
2018-09-21 21:22:26 +02:00
{
if ( * c = = ' * ' )
star = c ;
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
c + + ;
Improve tab completion for ANALYZE, EXPLAIN, and VACUUM.
Previously, we made no attempt to provide tab completion in these
statements' optional parenthesized options lists. This patch teaches
psql to do so.
To prevent the option completions from being offered after we've already
seen a complete parenthesized option list, it's necessary to improve
word_matches() so that it allows a wildcard '*' in the middle of an
alternative, not only at the end as formerly. That requires only a
little more code than before, and it allows us to test for "incomplete
parenthesized options" with a test like
else if (HeadMatches2("EXPLAIN", "(*") &&
!HeadMatches2("EXPLAIN", "(*)"))
In addition, add some logic to offer column names in the context of
"ANALYZE tablename ( ...", and likewise for VACUUM. This isn't real
complete; it won't offer column names again after a comma. But it's
better than before, and it doesn't take much code.
Justin Pryzby, reviewed at various times by Álvaro Herrera, Arthur
Zakirov, and Edmund Horner; some additional fixups by me
Discussion: https://postgr.es/m/20180529000623.GA21896@telsasoft.com
2018-09-21 21:22:26 +02:00
}
/* Was there a wild card? */
if ( star )
2016-01-05 18:00:13 +01:00
{
/* Yes, wildcard match? */
Improve tab completion for ANALYZE, EXPLAIN, and VACUUM.
Previously, we made no attempt to provide tab completion in these
statements' optional parenthesized options lists. This patch teaches
psql to do so.
To prevent the option completions from being offered after we've already
seen a complete parenthesized option list, it's necessary to improve
word_matches() so that it allows a wildcard '*' in the middle of an
alternative, not only at the end as formerly. That requires only a
little more code than before, and it allows us to test for "incomplete
parenthesized options" with a test like
else if (HeadMatches2("EXPLAIN", "(*") &&
!HeadMatches2("EXPLAIN", "(*)"))
In addition, add some logic to offer column names in the context of
"ANALYZE tablename ( ...", and likewise for VACUUM. This isn't real
complete; it won't offer column names again after a comma. But it's
better than before, and it doesn't take much code.
Justin Pryzby, reviewed at various times by Álvaro Herrera, Arthur
Zakirov, and Edmund Horner; some additional fixups by me
Discussion: https://postgr.es/m/20180529000623.GA21896@telsasoft.com
2018-09-21 21:22:26 +02:00
size_t beforelen = star - pattern ,
afterlen = c - star - 1 ;
if ( wordlen > = ( beforelen + afterlen ) & &
cimatch ( word , pattern , beforelen ) & &
cimatch ( word + wordlen - afterlen , star + 1 , afterlen ) )
2016-01-05 18:00:13 +01:00
return true ;
}
else
{
/* No, plain match? */
Improve tab completion for ANALYZE, EXPLAIN, and VACUUM.
Previously, we made no attempt to provide tab completion in these
statements' optional parenthesized options lists. This patch teaches
psql to do so.
To prevent the option completions from being offered after we've already
seen a complete parenthesized option list, it's necessary to improve
word_matches() so that it allows a wildcard '*' in the middle of an
alternative, not only at the end as formerly. That requires only a
little more code than before, and it allows us to test for "incomplete
parenthesized options" with a test like
else if (HeadMatches2("EXPLAIN", "(*") &&
!HeadMatches2("EXPLAIN", "(*)"))
In addition, add some logic to offer column names in the context of
"ANALYZE tablename ( ...", and likewise for VACUUM. This isn't real
complete; it won't offer column names again after a comma. But it's
better than before, and it doesn't take much code.
Justin Pryzby, reviewed at various times by Álvaro Herrera, Arthur
Zakirov, and Edmund Horner; some additional fixups by me
Discussion: https://postgr.es/m/20180529000623.GA21896@telsasoft.com
2018-09-21 21:22:26 +02:00
if ( wordlen = = ( c - pattern ) & &
cimatch ( word , pattern , wordlen ) )
2016-01-05 18:00:13 +01:00
return true ;
}
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
/* Out of alternatives? */
if ( * c = = ' \0 ' )
break ;
/* Nope, try next alternative. */
pattern = c + 1 ;
}
return false ;
}
2016-01-05 18:00:13 +01:00
/*
2018-09-22 02:50:18 +02:00
* Implementation of TailMatches and TailMatchesCS macros : do the last N words
* in previous_words match the variadic arguments ?
2016-01-05 18:00:13 +01:00
*
2018-09-22 02:50:18 +02:00
* The array indexing might look backwards , but remember that
* previous_words [ 0 ] contains the * last * word on the line , not the first .
2016-01-05 18:00:13 +01:00
*/
static bool
2018-09-22 02:50:18 +02:00
TailMatchesImpl ( bool case_sensitive ,
int previous_words_count , char * * previous_words ,
int narg , . . . )
2016-01-05 18:00:13 +01:00
{
2018-09-22 02:50:18 +02:00
va_list args ;
if ( previous_words_count < narg )
return false ;
va_start ( args , narg ) ;
for ( int argno = 0 ; argno < narg ; argno + + )
{
const char * arg = va_arg ( args , const char * ) ;
if ( ! word_matches ( arg , previous_words [ narg - argno - 1 ] ,
case_sensitive ) )
{
va_end ( args ) ;
return false ;
}
}
va_end ( args ) ;
return true ;
2016-01-05 18:00:13 +01:00
}
/*
2018-09-22 02:50:18 +02:00
* Implementation of Matches and MatchesCS macros : do all of the words
* in previous_words match the variadic arguments ?
2016-01-05 18:00:13 +01:00
*/
static bool
2018-09-22 02:50:18 +02:00
MatchesImpl ( bool case_sensitive ,
int previous_words_count , char * * previous_words ,
int narg , . . . )
2016-01-05 18:00:13 +01:00
{
2018-09-22 02:50:18 +02:00
va_list args ;
if ( previous_words_count ! = narg )
return false ;
va_start ( args , narg ) ;
for ( int argno = 0 ; argno < narg ; argno + + )
{
const char * arg = va_arg ( args , const char * ) ;
if ( ! word_matches ( arg , previous_words [ narg - argno - 1 ] ,
case_sensitive ) )
{
va_end ( args ) ;
return false ;
}
}
va_end ( args ) ;
return true ;
}
/*
* Implementation of HeadMatches and HeadMatchesCS macros : do the first N
* words in previous_words match the variadic arguments ?
*/
static bool
HeadMatchesImpl ( bool case_sensitive ,
int previous_words_count , char * * previous_words ,
int narg , . . . )
{
va_list args ;
if ( previous_words_count < narg )
return false ;
va_start ( args , narg ) ;
for ( int argno = 0 ; argno < narg ; argno + + )
{
const char * arg = va_arg ( args , const char * ) ;
if ( ! word_matches ( arg , previous_words [ previous_words_count - argno - 1 ] ,
case_sensitive ) )
{
va_end ( args ) ;
return false ;
}
}
va_end ( args ) ;
return true ;
2016-01-05 18:00:13 +01:00
}
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
/*
* Check if the final character of ' s ' is ' c ' .
*/
static bool
ends_with ( const char * s , char c )
{
size_t length = strlen ( s ) ;
return ( length > 0 & & s [ length - 1 ] = = c ) ;
}
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
2010-10-11 00:42:35 +02:00
/*
* The completion function .
*
* According to readline spec this gets passed the text entered so far and its
* start and end positions in the readline buffer . The return value is some
* partially obscure list format that can be generated by readline ' s
* completion_matches ( ) function , so we don ' t have to worry about it .
*/
2000-04-21 05:01:54 +02:00
static char * *
2014-04-04 17:26:01 +02:00
psql_completion ( const char * text , int start , int end )
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
{
2000-04-12 19:17:23 +02:00
/* This is the variable we'll return. */
char * * matches = NULL ;
Teach psql's tab completion to consider the entire input string.
Up to now, the tab completion logic has only examined the last few words
of the current input line; "last few" being originally as few as four
words, but lately up to nine words. Furthermore, it only looked at what
libreadline considers the current line of input, which made it rather
myopic if you split your command across lines. This was tolerable,
sort of, so long as the match patterns were only designed to consider the
last few words of input; but with the recent addition of HeadMatches()
and Matches() matching rules, we really have to do better if we want
those to behave sanely.
Hence, change the code to break the entire line down into words, and to
include any previous lines in the command buffer along with the active
readline input buffer.
This will be a little bit slower than the previous coding, but some
measurements say that even a query of several thousand characters can be
parsed in a hundred or so microseconds on modern machines; so it's really
not going to be significant for interactive tab completion. To reduce
the cost some, I arranged to avoid the per-word malloc calls that used
to occur: all the words are now kept in one malloc'd buffer.
2015-12-20 19:28:11 +01:00
/* Workspace for parsed words. */
char * words_buffer ;
/* This array will contain pointers to parsed words. */
char * * previous_words ;
2011-10-20 21:38:57 +02:00
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
/* The number of words found on the input line. */
int previous_words_count ;
Teach psql's tab completion to consider the entire input string.
Up to now, the tab completion logic has only examined the last few words
of the current input line; "last few" being originally as few as four
words, but lately up to nine words. Furthermore, it only looked at what
libreadline considers the current line of input, which made it rather
myopic if you split your command across lines. This was tolerable,
sort of, so long as the match patterns were only designed to consider the
last few words of input; but with the recent addition of HeadMatches()
and Matches() matching rules, we really have to do better if we want
those to behave sanely.
Hence, change the code to break the entire line down into words, and to
include any previous lines in the command buffer along with the active
readline input buffer.
This will be a little bit slower than the previous coding, but some
measurements say that even a query of several thousand characters can be
parsed in a hundred or so microseconds on modern machines; so it's really
not going to be significant for interactive tab completion. To reduce
the cost some, I arranged to avoid the per-word malloc calls that used
to occur: all the words are now kept in one malloc'd buffer.
2015-12-20 19:28:11 +01:00
/*
* For compactness , we use these macros to reference previous_words [ ] .
* Caution : do not access a previous_words [ ] entry without having checked
* previous_words_count to be sure it ' s valid . In most cases below , that
* check is implicit in a TailMatches ( ) or similar macro , but in some
* places we have to check it explicitly .
*/
2011-10-20 21:38:57 +02:00
# define prev_wd (previous_words[0])
# define prev2_wd (previous_words[1])
# define prev3_wd (previous_words[2])
# define prev4_wd (previous_words[3])
# define prev5_wd (previous_words[4])
# define prev6_wd (previous_words[5])
2015-09-08 18:58:29 +02:00
# define prev7_wd (previous_words[6])
# define prev8_wd (previous_words[7])
# define prev9_wd (previous_words[8])
2000-04-12 19:17:23 +02:00
2018-09-22 02:50:18 +02:00
/* Match the last N words before point, case-insensitively. */
# define TailMatches(...) \
TailMatchesImpl ( false , previous_words_count , previous_words , \
VA_ARGS_NARGS ( __VA_ARGS__ ) , __VA_ARGS__ )
2016-01-05 18:00:13 +01:00
2018-09-22 02:50:18 +02:00
/* Match the last N words before point, case-sensitively. */
# define TailMatchesCS(...) \
TailMatchesImpl ( true , previous_words_count , previous_words , \
VA_ARGS_NARGS ( __VA_ARGS__ ) , __VA_ARGS__ )
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
2018-09-22 02:50:18 +02:00
/* Match N words representing all of the line, case-insensitively. */
# define Matches(...) \
MatchesImpl ( false , previous_words_count , previous_words , \
VA_ARGS_NARGS ( __VA_ARGS__ ) , __VA_ARGS__ )
/* Match N words representing all of the line, case-sensitively. */
# define MatchesCS(...) \
MatchesImpl ( true , previous_words_count , previous_words , \
VA_ARGS_NARGS ( __VA_ARGS__ ) , __VA_ARGS__ )
/* Match the first N words on the line, case-insensitively. */
# define HeadMatches(...) \
HeadMatchesImpl ( false , previous_words_count , previous_words , \
VA_ARGS_NARGS ( __VA_ARGS__ ) , __VA_ARGS__ )
/* Match the first N words on the line, case-sensitively. */
# define HeadMatchesCS(...) \
HeadMatchesImpl ( true , previous_words_count , previous_words , \
VA_ARGS_NARGS ( __VA_ARGS__ ) , __VA_ARGS__ )
2018-09-21 21:58:37 +02:00
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
/* Known command-starting keywords. */
2004-08-29 07:07:03 +02:00
static const char * const sql_commands [ ] = {
2017-11-30 14:46:13 +01:00
" ABORT " , " ALTER " , " ANALYZE " , " BEGIN " , " CALL " , " CHECKPOINT " , " CLOSE " , " CLUSTER " ,
2006-04-02 11:02:41 +02:00
" COMMENT " , " COMMIT " , " COPY " , " CREATE " , " DEALLOCATE " , " DECLARE " ,
2014-07-10 21:01:31 +02:00
" DELETE FROM " , " DISCARD " , " DO " , " DROP " , " END " , " EXECUTE " , " EXPLAIN " ,
" FETCH " , " GRANT " , " IMPORT " , " INSERT " , " LISTEN " , " LOAD " , " LOCK " ,
2018-04-12 12:22:56 +02:00
" MOVE " , " NOTIFY " , " PREPARE " ,
2016-01-26 15:45:08 +01:00
" REASSIGN " , " REFRESH MATERIALIZED VIEW " , " REINDEX " , " RELEASE " ,
" RESET " , " REVOKE " , " ROLLBACK " ,
2010-09-28 02:55:27 +02:00
" SAVEPOINT " , " SECURITY LABEL " , " SELECT " , " SET " , " SHOW " , " START " ,
" TABLE " , " TRUNCATE " , " UNLISTEN " , " UPDATE " , " VACUUM " , " VALUES " , " WITH " ,
NULL
2000-04-12 19:17:23 +02:00
} ;
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
/* psql's backslash commands. */
2004-08-29 07:07:03 +02:00
static const char * const backslash_commands [ ] = {
2017-06-03 23:10:25 +02:00
" \\ a " ,
" \\ connect " , " \\ conninfo " , " \\ C " , " \\ cd " , " \\ copy " ,
2016-04-09 01:23:18 +02:00
" \\ copyright " , " \\ crosstabview " ,
2016-06-07 23:59:34 +02:00
" \\ d " , " \\ da " , " \\ dA " , " \\ db " , " \\ dc " , " \\ dC " , " \\ dd " , " \\ ddp " , " \\ dD " ,
2015-07-07 16:34:18 +02:00
" \\ des " , " \\ det " , " \\ deu " , " \\ dew " , " \\ dE " , " \\ df " ,
2011-01-20 06:00:30 +01:00
" \\ dF " , " \\ dFd " , " \\ dFp " , " \\ dFt " , " \\ dg " , " \\ di " , " \\ dl " , " \\ dL " ,
2019-04-07 13:59:12 +02:00
" \\ dm " , " \\ dn " , " \\ do " , " \\ dO " , " \\ dp " , " \\ dP " , " \\ dPi " , " \\ dPt " ,
2017-06-03 23:10:25 +02:00
" \\ drds " , " \\ dRs " , " \\ dRp " , " \\ ds " , " \\ dS " ,
2015-07-07 16:34:18 +02:00
" \\ dt " , " \\ dT " , " \\ dv " , " \\ du " , " \\ dx " , " \\ dy " ,
2017-06-03 23:10:25 +02:00
" \\ e " , " \\ echo " , " \\ ef " , " \\ elif " , " \\ else " , " \\ encoding " ,
" \\ endif " , " \\ errverbose " , " \\ ev " ,
" \\ f " ,
2017-09-06 00:17:47 +02:00
" \\ g " , " \\ gdesc " , " \\ gexec " , " \\ gset " , " \\ gx " ,
2017-06-03 23:10:25 +02:00
" \\ h " , " \\ help " , " \\ H " ,
" \\ i " , " \\ if " , " \\ ir " ,
" \\ l " , " \\ lo_import " , " \\ lo_export " , " \\ lo_list " , " \\ lo_unlink " ,
" \\ o " ,
" \\ p " , " \\ password " , " \\ prompt " , " \\ pset " ,
" \\ q " , " \\ qecho " ,
" \\ r " ,
" \\ s " , " \\ set " , " \\ setenv " , " \\ sf " , " \\ sv " ,
" \\ t " , " \\ T " , " \\ timing " ,
" \\ unset " ,
" \\ x " ,
" \\ w " , " \\ watch " ,
" \\ z " ,
" \\ ! " , " \\ ? " ,
2017-03-07 15:31:52 +01:00
NULL
2000-04-12 19:17:23 +02:00
} ;
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
( void ) end ; /* "end" is not used */
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
2000-02-20 15:28:28 +01:00
# ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
2000-04-12 19:17:23 +02:00
rl_completion_append_character = ' ' ;
2000-02-20 15:28:28 +01:00
# endif
2000-04-12 19:17:23 +02:00
/* Clear a few things. */
completion_charp = NULL ;
completion_charpp = NULL ;
completion_info_charp = NULL ;
2008-03-29 20:19:14 +01:00
completion_info_charp2 = NULL ;
2000-04-12 19:17:23 +02:00
/*
Teach psql's tab completion to consider the entire input string.
Up to now, the tab completion logic has only examined the last few words
of the current input line; "last few" being originally as few as four
words, but lately up to nine words. Furthermore, it only looked at what
libreadline considers the current line of input, which made it rather
myopic if you split your command across lines. This was tolerable,
sort of, so long as the match patterns were only designed to consider the
last few words of input; but with the recent addition of HeadMatches()
and Matches() matching rules, we really have to do better if we want
those to behave sanely.
Hence, change the code to break the entire line down into words, and to
include any previous lines in the command buffer along with the active
readline input buffer.
This will be a little bit slower than the previous coding, but some
measurements say that even a query of several thousand characters can be
parsed in a hundred or so microseconds on modern machines; so it's really
not going to be significant for interactive tab completion. To reduce
the cost some, I arranged to avoid the per-word malloc calls that used
to occur: all the words are now kept in one malloc'd buffer.
2015-12-20 19:28:11 +01:00
* Scan the input line to extract the words before our current position .
2012-06-10 21:20:04 +02:00
* According to those we ' ll make some smart decisions on what the user is
* probably intending to type .
2000-04-12 19:17:23 +02:00
*/
Teach psql's tab completion to consider the entire input string.
Up to now, the tab completion logic has only examined the last few words
of the current input line; "last few" being originally as few as four
words, but lately up to nine words. Furthermore, it only looked at what
libreadline considers the current line of input, which made it rather
myopic if you split your command across lines. This was tolerable,
sort of, so long as the match patterns were only designed to consider the
last few words of input; but with the recent addition of HeadMatches()
and Matches() matching rules, we really have to do better if we want
those to behave sanely.
Hence, change the code to break the entire line down into words, and to
include any previous lines in the command buffer along with the active
readline input buffer.
This will be a little bit slower than the previous coding, but some
measurements say that even a query of several thousand characters can be
parsed in a hundred or so microseconds on modern machines; so it's really
not going to be significant for interactive tab completion. To reduce
the cost some, I arranged to avoid the per-word malloc calls that used
to occur: all the words are now kept in one malloc'd buffer.
2015-12-20 19:28:11 +01:00
previous_words = get_previous_words ( start ,
& words_buffer ,
& previous_words_count ) ;
2000-04-12 19:17:23 +02:00
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
/* If current word is a backslash command, offer completions for that */
2000-04-12 19:17:23 +02:00
if ( text [ 0 ] = = ' \\ ' )
2012-02-01 19:16:40 +01:00
COMPLETE_WITH_LIST_CS ( backslash_commands ) ;
2000-04-12 19:17:23 +02:00
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
/* If current word is a variable interpolation, handle that case */
2011-02-11 22:57:58 +01:00
else if ( text [ 0 ] = = ' : ' & & text [ 1 ] ! = ' : ' )
{
if ( text [ 1 ] = = ' \' ' )
2014-08-12 04:57:39 +02:00
matches = complete_from_variables ( text , " :' " , " ' " , true ) ;
2011-02-11 22:57:58 +01:00
else if ( text [ 1 ] = = ' " ' )
2014-08-12 04:57:39 +02:00
matches = complete_from_variables ( text , " : \" " , " \" " , true ) ;
2011-02-11 22:57:58 +01:00
else
2014-08-12 04:57:39 +02:00
matches = complete_from_variables ( text , " : " , " " , true ) ;
2011-02-11 22:57:58 +01:00
}
2000-04-12 19:17:23 +02:00
/* If no previous word, suggest one of the basic sql commands */
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
else if ( previous_words_count = = 0 )
2000-04-12 19:17:23 +02:00
COMPLETE_WITH_LIST ( sql_commands ) ;
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
2006-04-02 11:02:41 +02:00
/* CREATE */
/* complete with something you can create */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " CREATE " ) )
2003-08-04 02:43:34 +02:00
matches = completion_matches ( text , create_command_generator ) ;
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
2011-10-20 21:38:57 +02:00
/* DROP, but not DROP embedded in other commands */
2006-04-02 11:02:41 +02:00
/* complete with something you can drop */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " DROP " ) )
2006-04-02 11:02:41 +02:00
matches = completion_matches ( text , drop_command_generator ) ;
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
/* ALTER */
2003-08-04 02:43:34 +02:00
2014-09-07 14:04:35 +02:00
/* ALTER TABLE */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TABLE " ) )
2014-09-07 14:04:35 +02:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_tables ,
" UNION SELECT 'ALL IN TABLESPACE' " ) ;
2015-05-24 03:35:49 +02:00
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
/* ALTER something */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " ) )
2017-03-16 23:54:28 +01:00
matches = completion_matches ( text , alter_command_generator ) ;
2015-12-19 17:37:11 +01:00
/* ALTER TABLE,INDEX,MATERIALIZED VIEW ALL IN TABLESPACE xxx */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " ALL " , " IN " , " TABLESPACE " , MatchAny ) )
COMPLETE_WITH ( " SET TABLESPACE " , " OWNED BY " ) ;
2015-12-19 17:37:11 +01:00
/* ALTER TABLE,INDEX,MATERIALIZED VIEW ALL IN TABLESPACE xxx OWNED BY */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " ALL " , " IN " , " TABLESPACE " , MatchAny , " OWNED " , " BY " ) )
2014-09-07 14:04:35 +02:00
COMPLETE_WITH_QUERY ( Query_for_list_of_roles ) ;
2015-12-19 17:37:11 +01:00
/* ALTER TABLE,INDEX,MATERIALIZED VIEW ALL IN TABLESPACE xxx OWNED BY xxx */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " ALL " , " IN " , " TABLESPACE " , MatchAny , " OWNED " , " BY " , MatchAny ) )
COMPLETE_WITH ( " SET TABLESPACE " ) ;
2017-11-30 14:46:13 +01:00
/* ALTER AGGREGATE,FUNCTION,PROCEDURE,ROUTINE <name> */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " AGGREGATE|FUNCTION|PROCEDURE|ROUTINE " , MatchAny ) )
COMPLETE_WITH ( " ( " ) ;
2017-11-30 14:46:13 +01:00
/* ALTER AGGREGATE,FUNCTION,PROCEDURE,ROUTINE <name> (...) */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " AGGREGATE|FUNCTION|PROCEDURE|ROUTINE " , MatchAny , MatchAny ) )
2005-08-14 20:49:30 +02:00
{
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
if ( ends_with ( prev_wd , ' ) ' ) )
2018-09-22 02:50:18 +02:00
COMPLETE_WITH ( " OWNER TO " , " RENAME TO " , " SET SCHEMA " ) ;
2010-04-05 07:33:24 +02:00
else
2012-07-05 14:03:49 +02:00
COMPLETE_WITH_FUNCTION_ARG ( prev2_wd ) ;
2005-08-14 20:49:30 +02:00
}
2017-05-17 04:19:21 +02:00
/* ALTER PUBLICATION <name> */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " PUBLICATION " , MatchAny ) )
COMPLETE_WITH ( " ADD TABLE " , " DROP TABLE " , " OWNER TO " , " RENAME TO " , " SET " ) ;
2017-05-17 04:19:21 +02:00
/* ALTER PUBLICATION <name> SET */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " PUBLICATION " , MatchAny , " SET " ) )
COMPLETE_WITH ( " ( " , " TABLE " ) ;
2017-05-17 04:19:21 +02:00
/* ALTER PUBLICATION <name> SET ( */
2018-09-22 02:50:18 +02:00
else if ( HeadMatches ( " ALTER " , " PUBLICATION " , MatchAny ) & & TailMatches ( " SET " , " ( " ) )
COMPLETE_WITH ( " publish " ) ;
2017-05-17 04:19:21 +02:00
/* ALTER SUBSCRIPTION <name> */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " SUBSCRIPTION " , MatchAny ) )
COMPLETE_WITH ( " CONNECTION " , " ENABLE " , " DISABLE " , " OWNER TO " ,
" RENAME TO " , " REFRESH PUBLICATION " , " SET " ) ;
2017-05-17 04:19:21 +02:00
/* ALTER SUBSCRIPTION <name> REFRESH PUBLICATION */
2018-09-22 02:50:18 +02:00
else if ( HeadMatches ( " ALTER " , " SUBSCRIPTION " , MatchAny ) & &
TailMatches ( " REFRESH " , " PUBLICATION " ) )
COMPLETE_WITH ( " WITH ( " ) ;
2017-05-17 04:19:21 +02:00
/* ALTER SUBSCRIPTION <name> REFRESH PUBLICATION WITH ( */
2018-09-22 02:50:18 +02:00
else if ( HeadMatches ( " ALTER " , " SUBSCRIPTION " , MatchAny ) & &
TailMatches ( " REFRESH " , " PUBLICATION " , " WITH " , " ( " ) )
COMPLETE_WITH ( " copy_data " ) ;
2017-05-17 04:19:21 +02:00
/* ALTER SUBSCRIPTION <name> SET */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " SUBSCRIPTION " , MatchAny , " SET " ) )
COMPLETE_WITH ( " ( " , " PUBLICATION " ) ;
2017-05-17 04:19:21 +02:00
/* ALTER SUBSCRIPTION <name> SET ( */
2018-09-22 02:50:18 +02:00
else if ( HeadMatches ( " ALTER " , " SUBSCRIPTION " , MatchAny ) & & TailMatches ( " SET " , " ( " ) )
COMPLETE_WITH ( " slot_name " , " synchronous_commit " ) ;
2017-05-17 04:19:21 +02:00
/* ALTER SUBSCRIPTION <name> SET PUBLICATION */
2018-09-22 02:50:18 +02:00
else if ( HeadMatches ( " ALTER " , " SUBSCRIPTION " , MatchAny ) & & TailMatches ( " SET " , " PUBLICATION " ) )
2017-05-17 04:19:21 +02:00
{
/* complete with nothing here as this refers to remote publications */
2017-01-19 18:00:00 +01:00
}
2017-06-09 16:17:06 +02:00
/* ALTER SUBSCRIPTION <name> SET PUBLICATION <name> */
2018-09-22 02:50:18 +02:00
else if ( HeadMatches ( " ALTER " , " SUBSCRIPTION " , MatchAny ) & &
TailMatches ( " SET " , " PUBLICATION " , MatchAny ) )
COMPLETE_WITH ( " WITH ( " ) ;
2017-06-09 16:17:06 +02:00
/* ALTER SUBSCRIPTION <name> SET PUBLICATION <name> WITH ( */
2018-09-22 02:50:18 +02:00
else if ( HeadMatches ( " ALTER " , " SUBSCRIPTION " , MatchAny ) & &
TailMatches ( " SET " , " PUBLICATION " , MatchAny , " WITH " , " ( " ) )
COMPLETE_WITH ( " copy_data " , " refresh " ) ;
2010-11-26 23:27:23 +01:00
/* ALTER SCHEMA <name> */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " SCHEMA " , MatchAny ) )
COMPLETE_WITH ( " OWNER TO " , " RENAME TO " ) ;
2001-03-22 05:01:46 +01:00
2011-02-12 14:54:13 +01:00
/* ALTER COLLATION <name> */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " COLLATION " , MatchAny ) )
COMPLETE_WITH ( " OWNER TO " , " RENAME TO " , " SET SCHEMA " ) ;
2011-02-12 14:54:13 +01:00
2010-11-26 23:27:23 +01:00
/* ALTER CONVERSION <name> */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " CONVERSION " , MatchAny ) )
COMPLETE_WITH ( " OWNER TO " , " RENAME TO " , " SET SCHEMA " ) ;
2010-11-26 23:27:23 +01:00
Clean up psql:
Add simple ALTER DATABASE, ALTER TRIGGER, CHECK POINT, CREATE
CONVERSION, CREATE DOMAIN, CREATE LANGUAGE, DEALLOCATE, DROP CONVERSION,
DROP DOMAIN, DROP LANGUAGE, EXECUTE, PREPARE
Complete CAST in CREATE CAST and DROP CAST but doesn't suggest what
should follow.
Add many more SET / SHOW variables to the list. Taken from SHOW ALL
output.
Complete a case sensitive search to allow \dD, \dd, \dS, \ds, \h, \H to
complete properly. But there are no matches, then try a case
insensitive search to allow case conversion. Add all missing help
options.
\Q<tab> -> \q
\dD<tab> -> \dD
\dd<tab> -> \dd
\D<tab><tab><tab> -> \d (with listing of \d? commands)
sel<tab> -> SELECT
Rod Taylor
2002-11-15 04:07:52 +01:00
/* ALTER DATABASE <name> */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " DATABASE " , MatchAny ) )
COMPLETE_WITH ( " RESET " , " SET " , " OWNER TO " , " RENAME TO " ,
" IS_TEMPLATE " , " ALLOW_CONNECTIONS " ,
" CONNECTION LIMIT " ) ;
2004-08-21 20:45:59 +02:00
2018-09-20 23:16:06 +02:00
/* ALTER DATABASE <name> SET TABLESPACE */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " DATABASE " , MatchAny , " SET " , " TABLESPACE " ) )
2018-09-20 23:16:06 +02:00
COMPLETE_WITH_QUERY ( Query_for_list_of_tablespaces ) ;
2014-04-14 14:44:21 +02:00
/* ALTER EVENT TRIGGER */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " EVENT " , " TRIGGER " ) )
2014-04-14 14:44:21 +02:00
COMPLETE_WITH_QUERY ( Query_for_list_of_event_triggers ) ;
/* ALTER EVENT TRIGGER <name> */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " EVENT " , " TRIGGER " , MatchAny ) )
COMPLETE_WITH ( " DISABLE " , " ENABLE " , " OWNER TO " , " RENAME TO " ) ;
2014-04-14 14:44:21 +02:00
/* ALTER EVENT TRIGGER <name> ENABLE */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " EVENT " , " TRIGGER " , MatchAny , " ENABLE " ) )
COMPLETE_WITH ( " REPLICA " , " ALWAYS " ) ;
2014-04-14 14:44:21 +02:00
2011-02-08 22:08:41 +01:00
/* ALTER EXTENSION <name> */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " EXTENSION " , MatchAny ) )
COMPLETE_WITH ( " ADD " , " DROP " , " UPDATE " , " SET SCHEMA " ) ;
2011-02-08 22:08:41 +01:00
2016-08-18 17:17:10 +02:00
/* ALTER EXTENSION <name> UPDATE */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " EXTENSION " , MatchAny , " UPDATE " ) )
2016-08-18 17:17:10 +02:00
{
completion_info_charp = prev2_wd ;
COMPLETE_WITH_QUERY ( Query_for_list_of_available_extension_versions_with_TO ) ;
}
/* ALTER EXTENSION <name> UPDATE TO */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " EXTENSION " , MatchAny , " UPDATE " , " TO " ) )
2016-08-18 17:17:10 +02:00
{
completion_info_charp = prev3_wd ;
COMPLETE_WITH_QUERY ( Query_for_list_of_available_extension_versions ) ;
}
2011-01-02 05:48:11 +01:00
/* ALTER FOREIGN */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " FOREIGN " ) )
COMPLETE_WITH ( " DATA WRAPPER " , " TABLE " ) ;
2011-01-02 05:48:11 +01:00
2008-12-19 17:25:19 +01:00
/* ALTER FOREIGN DATA WRAPPER <name> */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " FOREIGN " , " DATA " , " WRAPPER " , MatchAny ) )
COMPLETE_WITH ( " HANDLER " , " VALIDATOR " , " OPTIONS " , " OWNER TO " , " RENAME TO " ) ;
2008-12-19 17:25:19 +01:00
2011-01-02 05:48:11 +01:00
/* ALTER FOREIGN TABLE <name> */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " FOREIGN " , " TABLE " , MatchAny ) )
COMPLETE_WITH ( " ADD " , " ALTER " , " DISABLE TRIGGER " , " DROP " , " ENABLE " ,
" INHERIT " , " NO INHERIT " , " OPTIONS " , " OWNER TO " ,
" RENAME " , " SET " , " VALIDATE CONSTRAINT " ) ;
2011-01-02 05:48:11 +01:00
2014-09-07 14:04:35 +02:00
/* ALTER INDEX */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " INDEX " ) )
2014-09-07 14:04:35 +02:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_indexes ,
" UNION SELECT 'ALL IN TABLESPACE' " ) ;
2004-08-20 06:29:33 +02:00
/* ALTER INDEX <name> */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " INDEX " , MatchAny ) )
COMPLETE_WITH ( " ALTER COLUMN " , " OWNER TO " , " RENAME TO " , " SET " ,
" RESET " , " ATTACH PARTITION " ) ;
else if ( Matches ( " ALTER " , " INDEX " , MatchAny , " ATTACH " ) )
COMPLETE_WITH ( " PARTITION " ) ;
else if ( Matches ( " ALTER " , " INDEX " , MatchAny , " ATTACH " , " PARTITION " ) )
Local partitioned indexes
When CREATE INDEX is run on a partitioned table, create catalog entries
for an index on the partitioned table (which is just a placeholder since
the table proper has no data of its own), and recurse to create actual
indexes on the existing partitions; create them in future partitions
also.
As a convenience gadget, if the new index definition matches some
existing index in partitions, these are picked up and used instead of
creating new ones. Whichever way these indexes come about, they become
attached to the index on the parent table and are dropped alongside it,
and cannot be dropped on isolation unless they are detached first.
To support pg_dump'ing these indexes, add commands
CREATE INDEX ON ONLY <table>
(which creates the index on the parent partitioned table, without
recursing) and
ALTER INDEX ATTACH PARTITION
(which is used after the indexes have been created individually on each
partition, to attach them to the parent index). These reconstruct prior
database state exactly.
Reviewed-by: (in alphabetical order) Peter Eisentraut, Robert Haas, Amit
Langote, Jesper Pedersen, Simon Riggs, David Rowley
Discussion: https://postgr.es/m/20171113170646.gzweigyrgg6pwsg4@alvherre.pgsql
2018-01-19 15:49:22 +01:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_indexes , NULL ) ;
2018-12-25 06:20:46 +01:00
/* ALTER INDEX <name> ALTER */
else if ( Matches ( " ALTER " , " INDEX " , MatchAny , " ALTER " ) )
COMPLETE_WITH ( " COLUMN " ) ;
2019-01-28 07:30:14 +01:00
/* ALTER INDEX <name> ALTER COLUMN */
else if ( Matches ( " ALTER " , " INDEX " , MatchAny , " ALTER " , " COLUMN " ) )
{
completion_info_charp = prev3_wd ;
COMPLETE_WITH_QUERY ( Query_for_list_of_attribute_numbers ) ;
}
2017-09-06 22:46:01 +02:00
/* ALTER INDEX <name> ALTER COLUMN <colnum> */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " INDEX " , MatchAny , " ALTER " , " COLUMN " , MatchAny ) )
COMPLETE_WITH ( " SET STATISTICS " ) ;
2018-12-25 06:20:46 +01:00
/* ALTER INDEX <name> ALTER COLUMN <colnum> SET */
else if ( Matches ( " ALTER " , " INDEX " , MatchAny , " ALTER " , " COLUMN " , MatchAny , " SET " ) )
COMPLETE_WITH ( " STATISTICS " ) ;
/* ALTER INDEX <name> ALTER COLUMN <colnum> SET STATISTICS */
else if ( Matches ( " ALTER " , " INDEX " , MatchAny , " ALTER " , " COLUMN " , MatchAny , " SET " , " STATISTICS " ) )
{
/* Enforce no completion here, as an integer has to be specified */
}
2010-02-17 05:09:40 +01:00
/* ALTER INDEX <name> SET */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " INDEX " , MatchAny , " SET " ) )
COMPLETE_WITH ( " ( " , " TABLESPACE " ) ;
2010-02-17 05:09:40 +01:00
/* ALTER INDEX <name> RESET */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " INDEX " , MatchAny , " RESET " ) )
COMPLETE_WITH ( " ( " ) ;
2010-02-17 05:09:40 +01:00
/* ALTER INDEX <foo> SET|RESET ( */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " INDEX " , MatchAny , " RESET " , " ( " ) )
2019-01-15 18:07:10 +01:00
COMPLETE_WITH ( " fillfactor " ,
2018-09-22 02:50:18 +02:00
" vacuum_cleanup_index_scale_factor " , /* BTREE */
" fastupdate " , " gin_pending_list_limit " , /* GIN */
" buffering " , /* GiST */
" pages_per_range " , " autosummarize " /* BRIN */
2018-03-02 17:41:01 +01:00
) ;
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " INDEX " , MatchAny , " SET " , " ( " ) )
2019-01-15 18:07:10 +01:00
COMPLETE_WITH ( " fillfactor = " ,
2018-09-22 02:50:18 +02:00
" vacuum_cleanup_index_scale_factor = " , /* BTREE */
" fastupdate = " , " gin_pending_list_limit = " , /* GIN */
" buffering = " , /* GiST */
" pages_per_range = " , " autosummarize = " /* BRIN */
2018-03-02 17:41:01 +01:00
) ;
Attached is the third version of my patch that adds/fixes several things
to/in the psql-tabcomplete code. This diff includes the still missing
tab-complete support for TABLESPACE I already sent earlier. New in this
version of the patch is a small adaption of the tab-complete code to
support the adjusted SAVEPOINT-Syntax commited by Tom, as well as
completion of the only half working (and I think only by accident)
tabcomplete-suppport for "BEGIN [ TRANSACTION | WORK ]".
below is a complete list of the things I have changed with this patch:
*) add tablespace support for CREATE/DROP/ALTER and \db
*) sync the list of possible commands following ALTER with the docs (by
adding
AGGREGATE,CONVERSATION,DOMAIN,FUNCTION,LANGUAGE,OPERATOR,SEQUENCE,TABLESPACE
and TYPE)
*) provide a list of valid users after "OWNER TO"
*) tab-complete support for ALTER (AGGREGATE|CONVERSION|FUNCTION)
*) basic tab-complete support for ALTER DOMAIN
*) provide a list of suitable indexes following ALTER TABLE <sth>
CLUSTER ON(?)
*) add "CLUSTER ON" and "SET" to the ALTER TABLE <sth> - tab-complete
list(fixes incorrect/wrong tab-complete with ALTER TABLE <sth> SET
+<TAB> too)
*) provide a list of possible indexes following ALTER TABLE <sth> CLUSTER ON
*) provide list of possible commands(WITHOUT CLUSTER,WITHOUT OIDS,
TABLESPACE) following ALTER TABLE <sth> SET
*) sync "COMMENT ON" with docs by adding "CAST","CONVERSION","FUNCTION"
*) add ABSOLUT to the list of possible commands after FETCH
*) "END" was missing from the sql-commands overview (though it had
completion support!) - i know it's depreciated but we have ABORT and
others still in ...
*) fixes small buglet with ALTER (TRIGGER|CLUSTER) ON autocomplete
(CLUSTER ON +<TAB> would produce CLUSTER ON ON - same for TRIGGER ON)
*) adapt to new SAVEPOINT syntax
*) fix incomplete Support for BEGIN [ TRANSACTION | WORK ]
Stefan Kaltenbrunn
2004-08-20 21:24:59 +02:00
2004-09-22 06:25:16 +02:00
/* ALTER LANGUAGE <name> */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " LANGUAGE " , MatchAny ) )
COMPLETE_WITH ( " OWNER_TO " , " RENAME TO " ) ;
2004-09-22 06:25:16 +02:00
2009-12-11 04:34:57 +01:00
/* ALTER LARGE OBJECT <oid> */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " LARGE " , " OBJECT " , MatchAny ) )
COMPLETE_WITH ( " OWNER TO " ) ;
2009-12-11 04:34:57 +01:00
2013-03-04 01:23:31 +01:00
/* ALTER MATERIALIZED VIEW */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " MATERIALIZED " , " VIEW " ) )
2014-09-07 14:04:35 +02:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_matviews ,
" UNION SELECT 'ALL IN TABLESPACE' " ) ;
2013-03-04 01:23:31 +01:00
2005-08-14 20:49:30 +02:00
/* ALTER USER,ROLE <name> */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " USER|ROLE " , MatchAny ) & &
! TailMatches ( " USER " , " MAPPING " ) )
COMPLETE_WITH ( " BYPASSRLS " , " CONNECTION LIMIT " , " CREATEDB " , " CREATEROLE " ,
" ENCRYPTED PASSWORD " , " INHERIT " , " LOGIN " , " NOBYPASSRLS " ,
" NOCREATEDB " , " NOCREATEROLE " , " NOINHERIT " ,
" NOLOGIN " , " NOREPLICATION " , " NOSUPERUSER " , " PASSWORD " ,
" RENAME TO " , " REPLICATION " , " RESET " , " SET " , " SUPERUSER " ,
" VALID UNTIL " , " WITH " ) ;
2004-09-22 06:25:16 +02:00
2012-04-18 15:55:01 +02:00
/* ALTER USER,ROLE <name> WITH */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " USER|ROLE " , MatchAny , " WITH " ) )
2012-04-18 15:55:01 +02:00
/* Similar to the above, but don't complete "WITH" again. */
2018-09-22 02:50:18 +02:00
COMPLETE_WITH ( " BYPASSRLS " , " CONNECTION LIMIT " , " CREATEDB " , " CREATEROLE " ,
" ENCRYPTED PASSWORD " , " INHERIT " , " LOGIN " , " NOBYPASSRLS " ,
" NOCREATEDB " , " NOCREATEROLE " , " NOINHERIT " ,
" NOLOGIN " , " NOREPLICATION " , " NOSUPERUSER " , " PASSWORD " ,
" RENAME TO " , " REPLICATION " , " RESET " , " SET " , " SUPERUSER " ,
" VALID UNTIL " ) ;
2012-04-18 15:55:01 +02:00
2010-04-07 05:51:19 +02:00
/* ALTER DEFAULT PRIVILEGES */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " DEFAULT " , " PRIVILEGES " ) )
COMPLETE_WITH ( " FOR ROLE " , " IN SCHEMA " ) ;
2010-04-07 05:51:19 +02:00
/* ALTER DEFAULT PRIVILEGES FOR */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " DEFAULT " , " PRIVILEGES " , " FOR " ) )
COMPLETE_WITH ( " ROLE " ) ;
Fix tab completion in psql for ALTER DEFAULT PRIVILEGES
When providing tab completion for ALTER DEFAULT PRIVILEGES, we are
including the list of roles as possible options for completion after the
GRANT or REVOKE. Further, we accept FOR ROLE/IN SCHEMA at the same time
and in either order, but the tab completion was only working for one or
the other. Lastly, we weren't using the actual list of allowed kinds of
objects for default privileges for completion after the 'GRANT X ON' but
instead were completeing to what 'GRANT X ON' supports, which isn't the
ssame at all.
Address these issues by improving the forward tab-completion for ALTER
DEFAULT PRIVILEGES and then constrain and correct how the tail
completion is done when it is for ALTER DEFAULT PRIVILEGES.
Back-patch the forward/tail tab-completion to 9.6, where we made it easy
to handle such cases.
For 9.5 and earlier, correct the initial tab-completion to at least be
correct as far as it goes and then add a check for GRANT/REVOKE to only
tab-complete when the GRANT/REVOKE is the start of the command, so we
don't try to do tab-completion after we get to the GRANT/REVOKE part of
the ALTER DEFAULT PRIVILEGES command, which is better than providing
incorrect completions.
Initial patch for master and 9.6 by Gilles Darold, though I cleaned it
up and added a few comments. All bugs in the 9.5 and earlier patch are
mine.
Discussion: https://www.postgresql.org/message-id/1614593c-e356-5b27-6dba-66320a9bc68b@dalibo.com
2016-12-24 03:01:29 +01:00
/* ALTER DEFAULT PRIVILEGES IN */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " DEFAULT " , " PRIVILEGES " , " IN " ) )
COMPLETE_WITH ( " SCHEMA " ) ;
Fix tab completion in psql for ALTER DEFAULT PRIVILEGES
When providing tab completion for ALTER DEFAULT PRIVILEGES, we are
including the list of roles as possible options for completion after the
GRANT or REVOKE. Further, we accept FOR ROLE/IN SCHEMA at the same time
and in either order, but the tab completion was only working for one or
the other. Lastly, we weren't using the actual list of allowed kinds of
objects for default privileges for completion after the 'GRANT X ON' but
instead were completeing to what 'GRANT X ON' supports, which isn't the
ssame at all.
Address these issues by improving the forward tab-completion for ALTER
DEFAULT PRIVILEGES and then constrain and correct how the tail
completion is done when it is for ALTER DEFAULT PRIVILEGES.
Back-patch the forward/tail tab-completion to 9.6, where we made it easy
to handle such cases.
For 9.5 and earlier, correct the initial tab-completion to at least be
correct as far as it goes and then add a check for GRANT/REVOKE to only
tab-complete when the GRANT/REVOKE is the start of the command, so we
don't try to do tab-completion after we get to the GRANT/REVOKE part of
the ALTER DEFAULT PRIVILEGES command, which is better than providing
incorrect completions.
Initial patch for master and 9.6 by Gilles Darold, though I cleaned it
up and added a few comments. All bugs in the 9.5 and earlier patch are
mine.
Discussion: https://www.postgresql.org/message-id/1614593c-e356-5b27-6dba-66320a9bc68b@dalibo.com
2016-12-24 03:01:29 +01:00
/* ALTER DEFAULT PRIVILEGES FOR ROLE|USER ... */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " DEFAULT " , " PRIVILEGES " , " FOR " , " ROLE|USER " ,
MatchAny ) )
COMPLETE_WITH ( " GRANT " , " REVOKE " , " IN SCHEMA " ) ;
Fix tab completion in psql for ALTER DEFAULT PRIVILEGES
When providing tab completion for ALTER DEFAULT PRIVILEGES, we are
including the list of roles as possible options for completion after the
GRANT or REVOKE. Further, we accept FOR ROLE/IN SCHEMA at the same time
and in either order, but the tab completion was only working for one or
the other. Lastly, we weren't using the actual list of allowed kinds of
objects for default privileges for completion after the 'GRANT X ON' but
instead were completeing to what 'GRANT X ON' supports, which isn't the
ssame at all.
Address these issues by improving the forward tab-completion for ALTER
DEFAULT PRIVILEGES and then constrain and correct how the tail
completion is done when it is for ALTER DEFAULT PRIVILEGES.
Back-patch the forward/tail tab-completion to 9.6, where we made it easy
to handle such cases.
For 9.5 and earlier, correct the initial tab-completion to at least be
correct as far as it goes and then add a check for GRANT/REVOKE to only
tab-complete when the GRANT/REVOKE is the start of the command, so we
don't try to do tab-completion after we get to the GRANT/REVOKE part of
the ALTER DEFAULT PRIVILEGES command, which is better than providing
incorrect completions.
Initial patch for master and 9.6 by Gilles Darold, though I cleaned it
up and added a few comments. All bugs in the 9.5 and earlier patch are
mine.
Discussion: https://www.postgresql.org/message-id/1614593c-e356-5b27-6dba-66320a9bc68b@dalibo.com
2016-12-24 03:01:29 +01:00
/* ALTER DEFAULT PRIVILEGES IN SCHEMA ... */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " DEFAULT " , " PRIVILEGES " , " IN " , " SCHEMA " ,
MatchAny ) )
COMPLETE_WITH ( " GRANT " , " REVOKE " , " FOR ROLE " ) ;
Fix tab completion in psql for ALTER DEFAULT PRIVILEGES
When providing tab completion for ALTER DEFAULT PRIVILEGES, we are
including the list of roles as possible options for completion after the
GRANT or REVOKE. Further, we accept FOR ROLE/IN SCHEMA at the same time
and in either order, but the tab completion was only working for one or
the other. Lastly, we weren't using the actual list of allowed kinds of
objects for default privileges for completion after the 'GRANT X ON' but
instead were completeing to what 'GRANT X ON' supports, which isn't the
ssame at all.
Address these issues by improving the forward tab-completion for ALTER
DEFAULT PRIVILEGES and then constrain and correct how the tail
completion is done when it is for ALTER DEFAULT PRIVILEGES.
Back-patch the forward/tail tab-completion to 9.6, where we made it easy
to handle such cases.
For 9.5 and earlier, correct the initial tab-completion to at least be
correct as far as it goes and then add a check for GRANT/REVOKE to only
tab-complete when the GRANT/REVOKE is the start of the command, so we
don't try to do tab-completion after we get to the GRANT/REVOKE part of
the ALTER DEFAULT PRIVILEGES command, which is better than providing
incorrect completions.
Initial patch for master and 9.6 by Gilles Darold, though I cleaned it
up and added a few comments. All bugs in the 9.5 and earlier patch are
mine.
Discussion: https://www.postgresql.org/message-id/1614593c-e356-5b27-6dba-66320a9bc68b@dalibo.com
2016-12-24 03:01:29 +01:00
/* ALTER DEFAULT PRIVILEGES IN SCHEMA ... FOR */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " DEFAULT " , " PRIVILEGES " , " IN " , " SCHEMA " ,
MatchAny , " FOR " ) )
COMPLETE_WITH ( " ROLE " ) ;
Fix tab completion in psql for ALTER DEFAULT PRIVILEGES
When providing tab completion for ALTER DEFAULT PRIVILEGES, we are
including the list of roles as possible options for completion after the
GRANT or REVOKE. Further, we accept FOR ROLE/IN SCHEMA at the same time
and in either order, but the tab completion was only working for one or
the other. Lastly, we weren't using the actual list of allowed kinds of
objects for default privileges for completion after the 'GRANT X ON' but
instead were completeing to what 'GRANT X ON' supports, which isn't the
ssame at all.
Address these issues by improving the forward tab-completion for ALTER
DEFAULT PRIVILEGES and then constrain and correct how the tail
completion is done when it is for ALTER DEFAULT PRIVILEGES.
Back-patch the forward/tail tab-completion to 9.6, where we made it easy
to handle such cases.
For 9.5 and earlier, correct the initial tab-completion to at least be
correct as far as it goes and then add a check for GRANT/REVOKE to only
tab-complete when the GRANT/REVOKE is the start of the command, so we
don't try to do tab-completion after we get to the GRANT/REVOKE part of
the ALTER DEFAULT PRIVILEGES command, which is better than providing
incorrect completions.
Initial patch for master and 9.6 by Gilles Darold, though I cleaned it
up and added a few comments. All bugs in the 9.5 and earlier patch are
mine.
Discussion: https://www.postgresql.org/message-id/1614593c-e356-5b27-6dba-66320a9bc68b@dalibo.com
2016-12-24 03:01:29 +01:00
/* ALTER DEFAULT PRIVILEGES FOR ROLE|USER ... IN SCHEMA ... */
/* ALTER DEFAULT PRIVILEGES IN SCHEMA ... FOR ROLE|USER ... */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " DEFAULT " , " PRIVILEGES " , " FOR " , " ROLE|USER " ,
MatchAny , " IN " , " SCHEMA " , MatchAny ) | |
Matches ( " ALTER " , " DEFAULT " , " PRIVILEGES " , " IN " , " SCHEMA " ,
MatchAny , " FOR " , " ROLE|USER " , MatchAny ) )
COMPLETE_WITH ( " GRANT " , " REVOKE " ) ;
Attached is the third version of my patch that adds/fixes several things
to/in the psql-tabcomplete code. This diff includes the still missing
tab-complete support for TABLESPACE I already sent earlier. New in this
version of the patch is a small adaption of the tab-complete code to
support the adjusted SAVEPOINT-Syntax commited by Tom, as well as
completion of the only half working (and I think only by accident)
tabcomplete-suppport for "BEGIN [ TRANSACTION | WORK ]".
below is a complete list of the things I have changed with this patch:
*) add tablespace support for CREATE/DROP/ALTER and \db
*) sync the list of possible commands following ALTER with the docs (by
adding
AGGREGATE,CONVERSATION,DOMAIN,FUNCTION,LANGUAGE,OPERATOR,SEQUENCE,TABLESPACE
and TYPE)
*) provide a list of valid users after "OWNER TO"
*) tab-complete support for ALTER (AGGREGATE|CONVERSION|FUNCTION)
*) basic tab-complete support for ALTER DOMAIN
*) provide a list of suitable indexes following ALTER TABLE <sth>
CLUSTER ON(?)
*) add "CLUSTER ON" and "SET" to the ALTER TABLE <sth> - tab-complete
list(fixes incorrect/wrong tab-complete with ALTER TABLE <sth> SET
+<TAB> too)
*) provide a list of possible indexes following ALTER TABLE <sth> CLUSTER ON
*) provide list of possible commands(WITHOUT CLUSTER,WITHOUT OIDS,
TABLESPACE) following ALTER TABLE <sth> SET
*) sync "COMMENT ON" with docs by adding "CAST","CONVERSION","FUNCTION"
*) add ABSOLUT to the list of possible commands after FETCH
*) "END" was missing from the sql-commands overview (though it had
completion support!) - i know it's depreciated but we have ABORT and
others still in ...
*) fixes small buglet with ALTER (TRIGGER|CLUSTER) ON autocomplete
(CLUSTER ON +<TAB> would produce CLUSTER ON ON - same for TRIGGER ON)
*) adapt to new SAVEPOINT syntax
*) fix incomplete Support for BEGIN [ TRANSACTION | WORK ]
Stefan Kaltenbrunn
2004-08-20 21:24:59 +02:00
/* ALTER DOMAIN <name> */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " DOMAIN " , MatchAny ) )
COMPLETE_WITH ( " ADD " , " DROP " , " OWNER TO " , " RENAME " , " SET " ,
" VALIDATE CONSTRAINT " ) ;
Attached is the third version of my patch that adds/fixes several things
to/in the psql-tabcomplete code. This diff includes the still missing
tab-complete support for TABLESPACE I already sent earlier. New in this
version of the patch is a small adaption of the tab-complete code to
support the adjusted SAVEPOINT-Syntax commited by Tom, as well as
completion of the only half working (and I think only by accident)
tabcomplete-suppport for "BEGIN [ TRANSACTION | WORK ]".
below is a complete list of the things I have changed with this patch:
*) add tablespace support for CREATE/DROP/ALTER and \db
*) sync the list of possible commands following ALTER with the docs (by
adding
AGGREGATE,CONVERSATION,DOMAIN,FUNCTION,LANGUAGE,OPERATOR,SEQUENCE,TABLESPACE
and TYPE)
*) provide a list of valid users after "OWNER TO"
*) tab-complete support for ALTER (AGGREGATE|CONVERSION|FUNCTION)
*) basic tab-complete support for ALTER DOMAIN
*) provide a list of suitable indexes following ALTER TABLE <sth>
CLUSTER ON(?)
*) add "CLUSTER ON" and "SET" to the ALTER TABLE <sth> - tab-complete
list(fixes incorrect/wrong tab-complete with ALTER TABLE <sth> SET
+<TAB> too)
*) provide a list of possible indexes following ALTER TABLE <sth> CLUSTER ON
*) provide list of possible commands(WITHOUT CLUSTER,WITHOUT OIDS,
TABLESPACE) following ALTER TABLE <sth> SET
*) sync "COMMENT ON" with docs by adding "CAST","CONVERSION","FUNCTION"
*) add ABSOLUT to the list of possible commands after FETCH
*) "END" was missing from the sql-commands overview (though it had
completion support!) - i know it's depreciated but we have ABORT and
others still in ...
*) fixes small buglet with ALTER (TRIGGER|CLUSTER) ON autocomplete
(CLUSTER ON +<TAB> would produce CLUSTER ON ON - same for TRIGGER ON)
*) adapt to new SAVEPOINT syntax
*) fix incomplete Support for BEGIN [ TRANSACTION | WORK ]
Stefan Kaltenbrunn
2004-08-20 21:24:59 +02:00
/* ALTER DOMAIN <sth> DROP */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " DOMAIN " , MatchAny , " DROP " ) )
COMPLETE_WITH ( " CONSTRAINT " , " DEFAULT " , " NOT NULL " ) ;
2012-09-15 04:11:17 +02:00
/* ALTER DOMAIN <sth> DROP|RENAME|VALIDATE CONSTRAINT */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " DOMAIN " , MatchAny , " DROP|RENAME|VALIDATE " , " CONSTRAINT " ) )
2012-09-15 04:11:17 +02:00
{
completion_info_charp = prev3_wd ;
COMPLETE_WITH_QUERY ( Query_for_constraint_of_type ) ;
}
2012-04-26 19:07:40 +02:00
/* ALTER DOMAIN <sth> RENAME */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " DOMAIN " , MatchAny , " RENAME " ) )
COMPLETE_WITH ( " CONSTRAINT " , " TO " ) ;
2012-04-26 19:07:40 +02:00
/* ALTER DOMAIN <sth> RENAME CONSTRAINT <sth> */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " DOMAIN " , MatchAny , " RENAME " , " CONSTRAINT " , MatchAny ) )
COMPLETE_WITH ( " TO " ) ;
2012-04-26 19:07:40 +02:00
Attached is the third version of my patch that adds/fixes several things
to/in the psql-tabcomplete code. This diff includes the still missing
tab-complete support for TABLESPACE I already sent earlier. New in this
version of the patch is a small adaption of the tab-complete code to
support the adjusted SAVEPOINT-Syntax commited by Tom, as well as
completion of the only half working (and I think only by accident)
tabcomplete-suppport for "BEGIN [ TRANSACTION | WORK ]".
below is a complete list of the things I have changed with this patch:
*) add tablespace support for CREATE/DROP/ALTER and \db
*) sync the list of possible commands following ALTER with the docs (by
adding
AGGREGATE,CONVERSATION,DOMAIN,FUNCTION,LANGUAGE,OPERATOR,SEQUENCE,TABLESPACE
and TYPE)
*) provide a list of valid users after "OWNER TO"
*) tab-complete support for ALTER (AGGREGATE|CONVERSION|FUNCTION)
*) basic tab-complete support for ALTER DOMAIN
*) provide a list of suitable indexes following ALTER TABLE <sth>
CLUSTER ON(?)
*) add "CLUSTER ON" and "SET" to the ALTER TABLE <sth> - tab-complete
list(fixes incorrect/wrong tab-complete with ALTER TABLE <sth> SET
+<TAB> too)
*) provide a list of possible indexes following ALTER TABLE <sth> CLUSTER ON
*) provide list of possible commands(WITHOUT CLUSTER,WITHOUT OIDS,
TABLESPACE) following ALTER TABLE <sth> SET
*) sync "COMMENT ON" with docs by adding "CAST","CONVERSION","FUNCTION"
*) add ABSOLUT to the list of possible commands after FETCH
*) "END" was missing from the sql-commands overview (though it had
completion support!) - i know it's depreciated but we have ABORT and
others still in ...
*) fixes small buglet with ALTER (TRIGGER|CLUSTER) ON autocomplete
(CLUSTER ON +<TAB> would produce CLUSTER ON ON - same for TRIGGER ON)
*) adapt to new SAVEPOINT syntax
*) fix incomplete Support for BEGIN [ TRANSACTION | WORK ]
Stefan Kaltenbrunn
2004-08-20 21:24:59 +02:00
/* ALTER DOMAIN <sth> SET */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " DOMAIN " , MatchAny , " SET " ) )
COMPLETE_WITH ( " DEFAULT " , " NOT NULL " , " SCHEMA " ) ;
2004-09-22 06:25:16 +02:00
/* ALTER SEQUENCE <name> */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " SEQUENCE " , MatchAny ) )
COMPLETE_WITH ( " INCREMENT " , " MINVALUE " , " MAXVALUE " , " RESTART " , " NO " ,
" CACHE " , " CYCLE " , " SET SCHEMA " , " OWNED BY " , " OWNER TO " ,
" RENAME TO " ) ;
2004-09-22 06:25:16 +02:00
/* ALTER SEQUENCE <name> NO */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " SEQUENCE " , MatchAny , " NO " ) )
COMPLETE_WITH ( " MINVALUE " , " MAXVALUE " , " CYCLE " ) ;
2008-12-19 17:25:19 +01:00
/* ALTER SERVER <name> */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " SERVER " , MatchAny ) )
COMPLETE_WITH ( " VERSION " , " OPTIONS " , " OWNER TO " , " RENAME TO " ) ;
2016-06-10 00:02:36 +02:00
/* ALTER SERVER <name> VERSION <version> */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " SERVER " , MatchAny , " VERSION " , MatchAny ) )
COMPLETE_WITH ( " OPTIONS " ) ;
2014-09-02 09:06:58 +02:00
/* ALTER SYSTEM SET, RESET, RESET ALL */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " SYSTEM " ) )
COMPLETE_WITH ( " SET " , " RESET " ) ;
else if ( Matches ( " ALTER " , " SYSTEM " , " SET|RESET " ) )
2013-12-19 18:33:27 +01:00
COMPLETE_WITH_QUERY ( Query_for_list_of_alter_system_set_vars ) ;
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " SYSTEM " , " SET " , MatchAny ) )
COMPLETE_WITH ( " TO " ) ;
2007-07-03 03:30:37 +02:00
/* ALTER VIEW <name> */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " VIEW " , MatchAny ) )
COMPLETE_WITH ( " ALTER COLUMN " , " OWNER TO " , " RENAME TO " ,
" SET SCHEMA " ) ;
2013-03-04 01:23:31 +01:00
/* ALTER MATERIALIZED VIEW <name> */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " MATERIALIZED " , " VIEW " , MatchAny ) )
COMPLETE_WITH ( " ALTER COLUMN " , " OWNER TO " , " RENAME TO " ,
" SET SCHEMA " ) ;
2013-02-09 05:58:40 +01:00
2015-12-10 18:28:46 +01:00
/* ALTER POLICY <name> */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " POLICY " ) )
2015-12-10 18:28:46 +01:00
COMPLETE_WITH_QUERY ( Query_for_list_of_policies ) ;
Row-Level Security Policies (RLS)
Building on the updatable security-barrier views work, add the
ability to define policies on tables to limit the set of rows
which are returned from a query and which are allowed to be added
to a table. Expressions defined by the policy for filtering are
added to the security barrier quals of the query, while expressions
defined to check records being added to a table are added to the
with-check options of the query.
New top-level commands are CREATE/ALTER/DROP POLICY and are
controlled by the table owner. Row Security is able to be enabled
and disabled by the owner on a per-table basis using
ALTER TABLE .. ENABLE/DISABLE ROW SECURITY.
Per discussion, ROW SECURITY is disabled on tables by default and
must be enabled for policies on the table to be used. If no
policies exist on a table with ROW SECURITY enabled, a default-deny
policy is used and no records will be visible.
By default, row security is applied at all times except for the
table owner and the superuser. A new GUC, row_security, is added
which can be set to ON, OFF, or FORCE. When set to FORCE, row
security will be applied even for the table owner and superusers.
When set to OFF, row security will be disabled when allowed and an
error will be thrown if the user does not have rights to bypass row
security.
Per discussion, pg_dump sets row_security = OFF by default to ensure
that exports and backups will have all data in the table or will
error if there are insufficient privileges to bypass row security.
A new option has been added to pg_dump, --enable-row-security, to
ask pg_dump to export with row security enabled.
A new role capability, BYPASSRLS, which can only be set by the
superuser, is added to allow other users to be able to bypass row
security using row_security = OFF.
Many thanks to the various individuals who have helped with the
design, particularly Robert Haas for his feedback.
Authors include Craig Ringer, KaiGai Kohei, Adam Brightwell, Dean
Rasheed, with additional changes and rework by me.
Reviewers have included all of the above, Greg Smith,
Jeff McCormick, and Robert Haas.
2014-09-19 17:18:35 +02:00
/* ALTER POLICY <name> ON */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " POLICY " , MatchAny ) )
COMPLETE_WITH ( " ON " ) ;
Row-Level Security Policies (RLS)
Building on the updatable security-barrier views work, add the
ability to define policies on tables to limit the set of rows
which are returned from a query and which are allowed to be added
to a table. Expressions defined by the policy for filtering are
added to the security barrier quals of the query, while expressions
defined to check records being added to a table are added to the
with-check options of the query.
New top-level commands are CREATE/ALTER/DROP POLICY and are
controlled by the table owner. Row Security is able to be enabled
and disabled by the owner on a per-table basis using
ALTER TABLE .. ENABLE/DISABLE ROW SECURITY.
Per discussion, ROW SECURITY is disabled on tables by default and
must be enabled for policies on the table to be used. If no
policies exist on a table with ROW SECURITY enabled, a default-deny
policy is used and no records will be visible.
By default, row security is applied at all times except for the
table owner and the superuser. A new GUC, row_security, is added
which can be set to ON, OFF, or FORCE. When set to FORCE, row
security will be applied even for the table owner and superusers.
When set to OFF, row security will be disabled when allowed and an
error will be thrown if the user does not have rights to bypass row
security.
Per discussion, pg_dump sets row_security = OFF by default to ensure
that exports and backups will have all data in the table or will
error if there are insufficient privileges to bypass row security.
A new option has been added to pg_dump, --enable-row-security, to
ask pg_dump to export with row security enabled.
A new role capability, BYPASSRLS, which can only be set by the
superuser, is added to allow other users to be able to bypass row
security using row_security = OFF.
Many thanks to the various individuals who have helped with the
design, particularly Robert Haas for his feedback.
Authors include Craig Ringer, KaiGai Kohei, Adam Brightwell, Dean
Rasheed, with additional changes and rework by me.
Reviewers have included all of the above, Greg Smith,
Jeff McCormick, and Robert Haas.
2014-09-19 17:18:35 +02:00
/* ALTER POLICY <name> ON <table> */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " POLICY " , MatchAny , " ON " ) )
2015-12-10 18:28:46 +01:00
{
completion_info_charp = prev2_wd ;
COMPLETE_WITH_QUERY ( Query_for_list_of_tables_for_policy ) ;
}
Row-Level Security Policies (RLS)
Building on the updatable security-barrier views work, add the
ability to define policies on tables to limit the set of rows
which are returned from a query and which are allowed to be added
to a table. Expressions defined by the policy for filtering are
added to the security barrier quals of the query, while expressions
defined to check records being added to a table are added to the
with-check options of the query.
New top-level commands are CREATE/ALTER/DROP POLICY and are
controlled by the table owner. Row Security is able to be enabled
and disabled by the owner on a per-table basis using
ALTER TABLE .. ENABLE/DISABLE ROW SECURITY.
Per discussion, ROW SECURITY is disabled on tables by default and
must be enabled for policies on the table to be used. If no
policies exist on a table with ROW SECURITY enabled, a default-deny
policy is used and no records will be visible.
By default, row security is applied at all times except for the
table owner and the superuser. A new GUC, row_security, is added
which can be set to ON, OFF, or FORCE. When set to FORCE, row
security will be applied even for the table owner and superusers.
When set to OFF, row security will be disabled when allowed and an
error will be thrown if the user does not have rights to bypass row
security.
Per discussion, pg_dump sets row_security = OFF by default to ensure
that exports and backups will have all data in the table or will
error if there are insufficient privileges to bypass row security.
A new option has been added to pg_dump, --enable-row-security, to
ask pg_dump to export with row security enabled.
A new role capability, BYPASSRLS, which can only be set by the
superuser, is added to allow other users to be able to bypass row
security using row_security = OFF.
Many thanks to the various individuals who have helped with the
design, particularly Robert Haas for his feedback.
Authors include Craig Ringer, KaiGai Kohei, Adam Brightwell, Dean
Rasheed, with additional changes and rework by me.
Reviewers have included all of the above, Greg Smith,
Jeff McCormick, and Robert Haas.
2014-09-19 17:18:35 +02:00
/* ALTER POLICY <name> ON <table> - show options */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " POLICY " , MatchAny , " ON " , MatchAny ) )
COMPLETE_WITH ( " RENAME TO " , " TO " , " USING ( " , " WITH CHECK ( " ) ;
Row-Level Security Policies (RLS)
Building on the updatable security-barrier views work, add the
ability to define policies on tables to limit the set of rows
which are returned from a query and which are allowed to be added
to a table. Expressions defined by the policy for filtering are
added to the security barrier quals of the query, while expressions
defined to check records being added to a table are added to the
with-check options of the query.
New top-level commands are CREATE/ALTER/DROP POLICY and are
controlled by the table owner. Row Security is able to be enabled
and disabled by the owner on a per-table basis using
ALTER TABLE .. ENABLE/DISABLE ROW SECURITY.
Per discussion, ROW SECURITY is disabled on tables by default and
must be enabled for policies on the table to be used. If no
policies exist on a table with ROW SECURITY enabled, a default-deny
policy is used and no records will be visible.
By default, row security is applied at all times except for the
table owner and the superuser. A new GUC, row_security, is added
which can be set to ON, OFF, or FORCE. When set to FORCE, row
security will be applied even for the table owner and superusers.
When set to OFF, row security will be disabled when allowed and an
error will be thrown if the user does not have rights to bypass row
security.
Per discussion, pg_dump sets row_security = OFF by default to ensure
that exports and backups will have all data in the table or will
error if there are insufficient privileges to bypass row security.
A new option has been added to pg_dump, --enable-row-security, to
ask pg_dump to export with row security enabled.
A new role capability, BYPASSRLS, which can only be set by the
superuser, is added to allow other users to be able to bypass row
security using row_security = OFF.
Many thanks to the various individuals who have helped with the
design, particularly Robert Haas for his feedback.
Authors include Craig Ringer, KaiGai Kohei, Adam Brightwell, Dean
Rasheed, with additional changes and rework by me.
Reviewers have included all of the above, Greg Smith,
Jeff McCormick, and Robert Haas.
2014-09-19 17:18:35 +02:00
/* ALTER POLICY <name> ON <table> TO <role> */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " POLICY " , MatchAny , " ON " , MatchAny , " TO " ) )
Row-Level Security Policies (RLS)
Building on the updatable security-barrier views work, add the
ability to define policies on tables to limit the set of rows
which are returned from a query and which are allowed to be added
to a table. Expressions defined by the policy for filtering are
added to the security barrier quals of the query, while expressions
defined to check records being added to a table are added to the
with-check options of the query.
New top-level commands are CREATE/ALTER/DROP POLICY and are
controlled by the table owner. Row Security is able to be enabled
and disabled by the owner on a per-table basis using
ALTER TABLE .. ENABLE/DISABLE ROW SECURITY.
Per discussion, ROW SECURITY is disabled on tables by default and
must be enabled for policies on the table to be used. If no
policies exist on a table with ROW SECURITY enabled, a default-deny
policy is used and no records will be visible.
By default, row security is applied at all times except for the
table owner and the superuser. A new GUC, row_security, is added
which can be set to ON, OFF, or FORCE. When set to FORCE, row
security will be applied even for the table owner and superusers.
When set to OFF, row security will be disabled when allowed and an
error will be thrown if the user does not have rights to bypass row
security.
Per discussion, pg_dump sets row_security = OFF by default to ensure
that exports and backups will have all data in the table or will
error if there are insufficient privileges to bypass row security.
A new option has been added to pg_dump, --enable-row-security, to
ask pg_dump to export with row security enabled.
A new role capability, BYPASSRLS, which can only be set by the
superuser, is added to allow other users to be able to bypass row
security using row_security = OFF.
Many thanks to the various individuals who have helped with the
design, particularly Robert Haas for his feedback.
Authors include Craig Ringer, KaiGai Kohei, Adam Brightwell, Dean
Rasheed, with additional changes and rework by me.
Reviewers have included all of the above, Greg Smith,
Jeff McCormick, and Robert Haas.
2014-09-19 17:18:35 +02:00
COMPLETE_WITH_QUERY ( Query_for_list_of_grant_roles ) ;
/* ALTER POLICY <name> ON <table> USING ( */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " POLICY " , MatchAny , " ON " , MatchAny , " USING " ) )
COMPLETE_WITH ( " ( " ) ;
Row-Level Security Policies (RLS)
Building on the updatable security-barrier views work, add the
ability to define policies on tables to limit the set of rows
which are returned from a query and which are allowed to be added
to a table. Expressions defined by the policy for filtering are
added to the security barrier quals of the query, while expressions
defined to check records being added to a table are added to the
with-check options of the query.
New top-level commands are CREATE/ALTER/DROP POLICY and are
controlled by the table owner. Row Security is able to be enabled
and disabled by the owner on a per-table basis using
ALTER TABLE .. ENABLE/DISABLE ROW SECURITY.
Per discussion, ROW SECURITY is disabled on tables by default and
must be enabled for policies on the table to be used. If no
policies exist on a table with ROW SECURITY enabled, a default-deny
policy is used and no records will be visible.
By default, row security is applied at all times except for the
table owner and the superuser. A new GUC, row_security, is added
which can be set to ON, OFF, or FORCE. When set to FORCE, row
security will be applied even for the table owner and superusers.
When set to OFF, row security will be disabled when allowed and an
error will be thrown if the user does not have rights to bypass row
security.
Per discussion, pg_dump sets row_security = OFF by default to ensure
that exports and backups will have all data in the table or will
error if there are insufficient privileges to bypass row security.
A new option has been added to pg_dump, --enable-row-security, to
ask pg_dump to export with row security enabled.
A new role capability, BYPASSRLS, which can only be set by the
superuser, is added to allow other users to be able to bypass row
security using row_security = OFF.
Many thanks to the various individuals who have helped with the
design, particularly Robert Haas for his feedback.
Authors include Craig Ringer, KaiGai Kohei, Adam Brightwell, Dean
Rasheed, with additional changes and rework by me.
Reviewers have included all of the above, Greg Smith,
Jeff McCormick, and Robert Haas.
2014-09-19 17:18:35 +02:00
/* ALTER POLICY <name> ON <table> WITH CHECK ( */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " POLICY " , MatchAny , " ON " , MatchAny , " WITH " , " CHECK " ) )
COMPLETE_WITH ( " ( " ) ;
Row-Level Security Policies (RLS)
Building on the updatable security-barrier views work, add the
ability to define policies on tables to limit the set of rows
which are returned from a query and which are allowed to be added
to a table. Expressions defined by the policy for filtering are
added to the security barrier quals of the query, while expressions
defined to check records being added to a table are added to the
with-check options of the query.
New top-level commands are CREATE/ALTER/DROP POLICY and are
controlled by the table owner. Row Security is able to be enabled
and disabled by the owner on a per-table basis using
ALTER TABLE .. ENABLE/DISABLE ROW SECURITY.
Per discussion, ROW SECURITY is disabled on tables by default and
must be enabled for policies on the table to be used. If no
policies exist on a table with ROW SECURITY enabled, a default-deny
policy is used and no records will be visible.
By default, row security is applied at all times except for the
table owner and the superuser. A new GUC, row_security, is added
which can be set to ON, OFF, or FORCE. When set to FORCE, row
security will be applied even for the table owner and superusers.
When set to OFF, row security will be disabled when allowed and an
error will be thrown if the user does not have rights to bypass row
security.
Per discussion, pg_dump sets row_security = OFF by default to ensure
that exports and backups will have all data in the table or will
error if there are insufficient privileges to bypass row security.
A new option has been added to pg_dump, --enable-row-security, to
ask pg_dump to export with row security enabled.
A new role capability, BYPASSRLS, which can only be set by the
superuser, is added to allow other users to be able to bypass row
security using row_security = OFF.
Many thanks to the various individuals who have helped with the
design, particularly Robert Haas for his feedback.
Authors include Craig Ringer, KaiGai Kohei, Adam Brightwell, Dean
Rasheed, with additional changes and rework by me.
Reviewers have included all of the above, Greg Smith,
Jeff McCormick, and Robert Haas.
2014-09-19 17:18:35 +02:00
2013-02-09 05:58:40 +01:00
/* ALTER RULE <name>, add ON */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " RULE " , MatchAny ) )
COMPLETE_WITH ( " ON " ) ;
2013-02-09 05:58:40 +01:00
/* If we have ALTER RULE <name> ON, then add the correct tablename */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " RULE " , MatchAny , " ON " ) )
2013-02-09 05:58:40 +01:00
{
completion_info_charp = prev2_wd ;
COMPLETE_WITH_QUERY ( Query_for_list_of_tables_for_rule ) ;
}
/* ALTER RULE <name> ON <name> */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " RULE " , MatchAny , " ON " , MatchAny ) )
COMPLETE_WITH ( " RENAME TO " ) ;
2013-02-09 05:58:40 +01:00
Change CREATE STATISTICS syntax
Previously, we had the WITH clause in the middle of the command, where
you'd specify both generic options as well as statistic types. Few
people liked this, so this commit changes it to remove the WITH keyword
from that clause and makes it accept statistic types only. (We
currently don't have any generic options, but if we invent in the
future, we will gain a new WITH clause, probably at the end of the
command).
Also, the column list is now specified without parens, which makes the
whole command look more similar to a SELECT command. This change will
let us expand the command to supporting expressions (not just columns
names) as well as multiple tables and their join conditions.
Tom added lots of code comments and fixed some parts of the CREATE
STATISTICS reference page, too; more changes in this area are
forthcoming. He also fixed a potential problem in the alter_generic
regression test, reducing verbosity on a cascaded drop to avoid
dependency on message ordering, as we do in other tests.
Tom also closed a security bug: we documented that table ownership was
required in order to create a statistics object on it, but didn't
actually implement it.
Implement tab-completion for statistics objects. This can stand some
more improvement.
Authors: Alvaro Herrera, with lots of cleanup by Tom Lane
Discussion: https://postgr.es/m/20170420212426.ltvgyhnefvhixm6i@alvherre.pgsql
2017-05-12 19:59:23 +02:00
/* ALTER STATISTICS <name> */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " STATISTICS " , MatchAny ) )
COMPLETE_WITH ( " OWNER TO " , " RENAME TO " , " SET SCHEMA " ) ;
Change CREATE STATISTICS syntax
Previously, we had the WITH clause in the middle of the command, where
you'd specify both generic options as well as statistic types. Few
people liked this, so this commit changes it to remove the WITH keyword
from that clause and makes it accept statistic types only. (We
currently don't have any generic options, but if we invent in the
future, we will gain a new WITH clause, probably at the end of the
command).
Also, the column list is now specified without parens, which makes the
whole command look more similar to a SELECT command. This change will
let us expand the command to supporting expressions (not just columns
names) as well as multiple tables and their join conditions.
Tom added lots of code comments and fixed some parts of the CREATE
STATISTICS reference page, too; more changes in this area are
forthcoming. He also fixed a potential problem in the alter_generic
regression test, reducing verbosity on a cascaded drop to avoid
dependency on message ordering, as we do in other tests.
Tom also closed a security bug: we documented that table ownership was
required in order to create a statistics object on it, but didn't
actually implement it.
Implement tab-completion for statistics objects. This can stand some
more improvement.
Authors: Alvaro Herrera, with lots of cleanup by Tom Lane
Discussion: https://postgr.es/m/20170420212426.ltvgyhnefvhixm6i@alvherre.pgsql
2017-05-12 19:59:23 +02:00
Clean up psql:
Add simple ALTER DATABASE, ALTER TRIGGER, CHECK POINT, CREATE
CONVERSION, CREATE DOMAIN, CREATE LANGUAGE, DEALLOCATE, DROP CONVERSION,
DROP DOMAIN, DROP LANGUAGE, EXECUTE, PREPARE
Complete CAST in CREATE CAST and DROP CAST but doesn't suggest what
should follow.
Add many more SET / SHOW variables to the list. Taken from SHOW ALL
output.
Complete a case sensitive search to allow \dD, \dd, \dS, \ds, \h, \H to
complete properly. But there are no matches, then try a case
insensitive search to allow case conversion. Add all missing help
options.
\Q<tab> -> \q
\dD<tab> -> \dD
\dd<tab> -> \dd
\D<tab><tab><tab> -> \d (with listing of \d? commands)
sel<tab> -> SELECT
Rod Taylor
2002-11-15 04:07:52 +01:00
/* ALTER TRIGGER <name>, add ON */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TRIGGER " , MatchAny ) )
COMPLETE_WITH ( " ON " ) ;
2004-11-02 17:10:05 +01:00
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TRIGGER " , MatchAny , MatchAny ) )
2004-09-22 06:25:16 +02:00
{
completion_info_charp = prev2_wd ;
COMPLETE_WITH_QUERY ( Query_for_list_of_tables_for_trigger ) ;
}
Clean up psql:
Add simple ALTER DATABASE, ALTER TRIGGER, CHECK POINT, CREATE
CONVERSION, CREATE DOMAIN, CREATE LANGUAGE, DEALLOCATE, DROP CONVERSION,
DROP DOMAIN, DROP LANGUAGE, EXECUTE, PREPARE
Complete CAST in CREATE CAST and DROP CAST but doesn't suggest what
should follow.
Add many more SET / SHOW variables to the list. Taken from SHOW ALL
output.
Complete a case sensitive search to allow \dD, \dd, \dS, \ds, \h, \H to
complete properly. But there are no matches, then try a case
insensitive search to allow case conversion. Add all missing help
options.
\Q<tab> -> \q
\dD<tab> -> \dD
\dd<tab> -> \dd
\D<tab><tab><tab> -> \d (with listing of \d? commands)
sel<tab> -> SELECT
Rod Taylor
2002-11-15 04:07:52 +01:00
/*
* If we have ALTER TRIGGER < sth > ON , then add the correct tablename
*/
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TRIGGER " , MatchAny , " ON " ) )
2003-10-30 22:37:38 +01:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_tables , NULL ) ;
Clean up psql:
Add simple ALTER DATABASE, ALTER TRIGGER, CHECK POINT, CREATE
CONVERSION, CREATE DOMAIN, CREATE LANGUAGE, DEALLOCATE, DROP CONVERSION,
DROP DOMAIN, DROP LANGUAGE, EXECUTE, PREPARE
Complete CAST in CREATE CAST and DROP CAST but doesn't suggest what
should follow.
Add many more SET / SHOW variables to the list. Taken from SHOW ALL
output.
Complete a case sensitive search to allow \dD, \dd, \dS, \ds, \h, \H to
complete properly. But there are no matches, then try a case
insensitive search to allow case conversion. Add all missing help
options.
\Q<tab> -> \q
\dD<tab> -> \dD
\dd<tab> -> \dd
\D<tab><tab><tab> -> \d (with listing of \d? commands)
sel<tab> -> SELECT
Rod Taylor
2002-11-15 04:07:52 +01:00
2004-09-22 06:25:16 +02:00
/* ALTER TRIGGER <name> ON <name> */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TRIGGER " , MatchAny , " ON " , MatchAny ) )
COMPLETE_WITH ( " RENAME TO " ) ;
2004-09-22 06:25:16 +02:00
2001-03-22 05:01:46 +01:00
/*
2011-02-24 13:05:40 +01:00
* If we detect ALTER TABLE < name > , suggest sub commands
2001-03-22 05:01:46 +01:00
*/
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TABLE " , MatchAny ) )
COMPLETE_WITH ( " ADD " , " ALTER " , " CLUSTER ON " , " DISABLE " , " DROP " ,
" ENABLE " , " INHERIT " , " NO INHERIT " , " RENAME " , " RESET " ,
" OWNER TO " , " SET " , " VALIDATE CONSTRAINT " ,
" REPLICA IDENTITY " , " ATTACH PARTITION " ,
" DETACH PARTITION " ) ;
2007-09-14 06:25:24 +02:00
/* ALTER TABLE xxx ENABLE */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TABLE " , MatchAny , " ENABLE " ) )
COMPLETE_WITH ( " ALWAYS " , " REPLICA " , " ROW LEVEL SECURITY " , " RULE " ,
" TRIGGER " ) ;
else if ( Matches ( " ALTER " , " TABLE " , MatchAny , " ENABLE " , " REPLICA|ALWAYS " ) )
COMPLETE_WITH ( " RULE " , " TRIGGER " ) ;
else if ( Matches ( " ALTER " , " TABLE " , MatchAny , " ENABLE " , " RULE " ) )
2014-06-23 22:47:39 +02:00
{
completion_info_charp = prev3_wd ;
COMPLETE_WITH_QUERY ( Query_for_rule_of_table ) ;
}
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TABLE " , MatchAny , " ENABLE " , MatchAny , " RULE " ) )
2014-06-23 22:47:39 +02:00
{
completion_info_charp = prev4_wd ;
COMPLETE_WITH_QUERY ( Query_for_rule_of_table ) ;
}
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TABLE " , MatchAny , " ENABLE " , " TRIGGER " ) )
2014-06-23 22:47:39 +02:00
{
completion_info_charp = prev3_wd ;
COMPLETE_WITH_QUERY ( Query_for_trigger_of_table ) ;
}
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TABLE " , MatchAny , " ENABLE " , MatchAny , " TRIGGER " ) )
2014-06-23 22:47:39 +02:00
{
completion_info_charp = prev4_wd ;
COMPLETE_WITH_QUERY ( Query_for_trigger_of_table ) ;
}
2012-07-26 16:16:55 +02:00
/* ALTER TABLE xxx INHERIT */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TABLE " , MatchAny , " INHERIT " ) )
2012-07-26 16:16:55 +02:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_tables , " " ) ;
/* ALTER TABLE xxx NO INHERIT */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TABLE " , MatchAny , " NO " , " INHERIT " ) )
2012-07-26 16:16:55 +02:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_tables , " " ) ;
2014-06-23 22:47:39 +02:00
/* ALTER TABLE xxx DISABLE */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TABLE " , MatchAny , " DISABLE " ) )
COMPLETE_WITH ( " ROW LEVEL SECURITY " , " RULE " , " TRIGGER " ) ;
else if ( Matches ( " ALTER " , " TABLE " , MatchAny , " DISABLE " , " RULE " ) )
2014-06-23 22:47:39 +02:00
{
completion_info_charp = prev3_wd ;
COMPLETE_WITH_QUERY ( Query_for_rule_of_table ) ;
}
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TABLE " , MatchAny , " DISABLE " , " TRIGGER " ) )
2014-06-23 22:47:39 +02:00
{
completion_info_charp = prev3_wd ;
COMPLETE_WITH_QUERY ( Query_for_trigger_of_table ) ;
}
2007-11-15 22:14:46 +01:00
2012-04-26 19:07:40 +02:00
/* ALTER TABLE xxx ALTER */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TABLE " , MatchAny , " ALTER " ) )
2014-11-28 13:29:45 +01:00
COMPLETE_WITH_ATTR ( prev2_wd , " UNION SELECT 'COLUMN' UNION SELECT 'CONSTRAINT' " ) ;
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
2012-04-26 19:07:40 +02:00
/* ALTER TABLE xxx RENAME */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TABLE " , MatchAny , " RENAME " ) )
2012-04-26 19:07:40 +02:00
COMPLETE_WITH_ATTR ( prev2_wd , " UNION SELECT 'COLUMN' UNION SELECT 'CONSTRAINT' UNION SELECT 'TO' " ) ;
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TABLE " , MatchAny , " ALTER|RENAME " , " COLUMN " ) )
2006-02-12 08:21:40 +01:00
COMPLETE_WITH_ATTR ( prev3_wd , " " ) ;
2006-10-04 02:30:14 +02:00
2004-09-22 06:25:16 +02:00
/* ALTER TABLE xxx RENAME yyy */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TABLE " , MatchAny , " RENAME " , MatchAnyExcept ( " CONSTRAINT|TO " ) ) )
COMPLETE_WITH ( " TO " ) ;
2004-09-22 06:25:16 +02:00
2012-04-26 19:07:40 +02:00
/* ALTER TABLE xxx RENAME COLUMN/CONSTRAINT yyy */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TABLE " , MatchAny , " RENAME " , " COLUMN|CONSTRAINT " , MatchAnyExcept ( " TO " ) ) )
COMPLETE_WITH ( " TO " ) ;
2006-02-12 08:21:40 +01:00
In psql's tab completion, change most TailMatches patterns to Matches.
In the refactoring in commit d37b816dc9e8f976c8913296781e08cbd45c5af1,
we mostly kept to the original design whereby only the last few words
on the line were matched to identify a completable pattern. However,
after commit d854118c8df8c413d069f7e88bb01b9e18e4c8ed, there's really
no reason to do it like that: where it's sensible, we can use patterns
that expect to match the entire input line. And mostly, it's sensible.
Matching the entire line greatly reduces the odds of a false match that
leads to offering irrelevant completions. Moreover (though I've not
tried to measure this), it should make tab completion faster since
many of the patterns will be discarded after a single integer comparison
that finds that the wrong number of words appear on the line.
There are certain identifiable places where we still need to use
TailMatches because the statement in question is allowed to appear
embedded in a larger statement. These are just a small minority of
the existing patterns, though, so the benefit of switching where
possible is large.
It's possible that this patch has removed some within-line matching
behaviors that are in fact desirable, but we can put those back when
we get complaints. Most of the removed behaviors are certainly silly.
Michael Paquier, with some further adjustments by me
2016-01-05 02:08:08 +01:00
/* If we have ALTER TABLE <sth> DROP, provide COLUMN or CONSTRAINT */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TABLE " , MatchAny , " DROP " ) )
COMPLETE_WITH ( " COLUMN " , " CONSTRAINT " ) ;
2012-09-15 04:11:17 +02:00
/* If we have ALTER TABLE <sth> DROP COLUMN, provide list of columns */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TABLE " , MatchAny , " DROP " , " COLUMN " ) )
2006-02-12 08:21:40 +01:00
COMPLETE_WITH_ATTR ( prev3_wd , " " ) ;
2013-05-29 22:58:43 +02:00
/*
2014-11-28 13:29:45 +01:00
* If we have ALTER TABLE < sth > ALTER | DROP | RENAME | VALIDATE CONSTRAINT ,
* provide list of constraints
2013-05-29 22:58:43 +02:00
*/
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TABLE " , MatchAny , " ALTER|DROP|RENAME|VALIDATE " , " CONSTRAINT " ) )
2012-08-20 22:30:08 +02:00
{
completion_info_charp = prev3_wd ;
COMPLETE_WITH_QUERY ( Query_for_constraint_of_table ) ;
}
2004-09-22 06:25:16 +02:00
/* ALTER TABLE ALTER [COLUMN] <foo> */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TABLE " , MatchAny , " ALTER " , " COLUMN " , MatchAny ) | |
Matches ( " ALTER " , " TABLE " , MatchAny , " ALTER " , MatchAny ) )
COMPLETE_WITH ( " TYPE " , " SET " , " RESET " , " RESTART " , " ADD " , " DROP " ) ;
2010-02-17 05:09:40 +01:00
/* ALTER TABLE ALTER [COLUMN] <foo> SET */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TABLE " , MatchAny , " ALTER " , " COLUMN " , MatchAny , " SET " ) | |
Matches ( " ALTER " , " TABLE " , MatchAny , " ALTER " , MatchAny , " SET " ) )
COMPLETE_WITH ( " ( " , " DEFAULT " , " NOT NULL " , " STATISTICS " , " STORAGE " ) ;
2010-02-17 05:09:40 +01:00
/* ALTER TABLE ALTER [COLUMN] <foo> SET ( */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TABLE " , MatchAny , " ALTER " , " COLUMN " , MatchAny , " SET " , " ( " ) | |
Matches ( " ALTER " , " TABLE " , MatchAny , " ALTER " , MatchAny , " SET " , " ( " ) )
COMPLETE_WITH ( " n_distinct " , " n_distinct_inherited " ) ;
2010-02-17 05:09:40 +01:00
/* ALTER TABLE ALTER [COLUMN] <foo> SET STORAGE */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TABLE " , MatchAny , " ALTER " , " COLUMN " , MatchAny , " SET " , " STORAGE " ) | |
Matches ( " ALTER " , " TABLE " , MatchAny , " ALTER " , MatchAny , " SET " , " STORAGE " ) )
COMPLETE_WITH ( " PLAIN " , " EXTERNAL " , " EXTENDED " , " MAIN " ) ;
2018-12-25 06:20:46 +01:00
/* ALTER TABLE ALTER [COLUMN] <foo> SET STATISTICS */
else if ( Matches ( " ALTER " , " TABLE " , MatchAny , " ALTER " , " COLUMN " , MatchAny , " SET " , " STATISTICS " ) | |
Matches ( " ALTER " , " TABLE " , MatchAny , " ALTER " , MatchAny , " SET " , " STATISTICS " ) )
{
/* Enforce no completion here, as an integer has to be specified */
}
2010-02-17 05:09:40 +01:00
/* ALTER TABLE ALTER [COLUMN] <foo> DROP */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TABLE " , MatchAny , " ALTER " , " COLUMN " , MatchAny , " DROP " ) | |
Matches ( " ALTER " , " TABLE " , MatchAny , " ALTER " , MatchAny , " DROP " ) )
COMPLETE_WITH ( " DEFAULT " , " IDENTITY " , " NOT NULL " ) ;
else if ( Matches ( " ALTER " , " TABLE " , MatchAny , " CLUSTER " ) )
COMPLETE_WITH ( " ON " ) ;
else if ( Matches ( " ALTER " , " TABLE " , MatchAny , " CLUSTER " , " ON " ) )
Attached is the third version of my patch that adds/fixes several things
to/in the psql-tabcomplete code. This diff includes the still missing
tab-complete support for TABLESPACE I already sent earlier. New in this
version of the patch is a small adaption of the tab-complete code to
support the adjusted SAVEPOINT-Syntax commited by Tom, as well as
completion of the only half working (and I think only by accident)
tabcomplete-suppport for "BEGIN [ TRANSACTION | WORK ]".
below is a complete list of the things I have changed with this patch:
*) add tablespace support for CREATE/DROP/ALTER and \db
*) sync the list of possible commands following ALTER with the docs (by
adding
AGGREGATE,CONVERSATION,DOMAIN,FUNCTION,LANGUAGE,OPERATOR,SEQUENCE,TABLESPACE
and TYPE)
*) provide a list of valid users after "OWNER TO"
*) tab-complete support for ALTER (AGGREGATE|CONVERSION|FUNCTION)
*) basic tab-complete support for ALTER DOMAIN
*) provide a list of suitable indexes following ALTER TABLE <sth>
CLUSTER ON(?)
*) add "CLUSTER ON" and "SET" to the ALTER TABLE <sth> - tab-complete
list(fixes incorrect/wrong tab-complete with ALTER TABLE <sth> SET
+<TAB> too)
*) provide a list of possible indexes following ALTER TABLE <sth> CLUSTER ON
*) provide list of possible commands(WITHOUT CLUSTER,WITHOUT OIDS,
TABLESPACE) following ALTER TABLE <sth> SET
*) sync "COMMENT ON" with docs by adding "CAST","CONVERSION","FUNCTION"
*) add ABSOLUT to the list of possible commands after FETCH
*) "END" was missing from the sql-commands overview (though it had
completion support!) - i know it's depreciated but we have ABORT and
others still in ...
*) fixes small buglet with ALTER (TRIGGER|CLUSTER) ON autocomplete
(CLUSTER ON +<TAB> would produce CLUSTER ON ON - same for TRIGGER ON)
*) adapt to new SAVEPOINT syntax
*) fix incomplete Support for BEGIN [ TRANSACTION | WORK ]
Stefan Kaltenbrunn
2004-08-20 21:24:59 +02:00
{
completion_info_charp = prev3_wd ;
COMPLETE_WITH_QUERY ( Query_for_index_of_table ) ;
}
In psql's tab completion, change most TailMatches patterns to Matches.
In the refactoring in commit d37b816dc9e8f976c8913296781e08cbd45c5af1,
we mostly kept to the original design whereby only the last few words
on the line were matched to identify a completable pattern. However,
after commit d854118c8df8c413d069f7e88bb01b9e18e4c8ed, there's really
no reason to do it like that: where it's sensible, we can use patterns
that expect to match the entire input line. And mostly, it's sensible.
Matching the entire line greatly reduces the odds of a false match that
leads to offering irrelevant completions. Moreover (though I've not
tried to measure this), it should make tab completion faster since
many of the patterns will be discarded after a single integer comparison
that finds that the wrong number of words appear on the line.
There are certain identifiable places where we still need to use
TailMatches because the statement in question is allowed to appear
embedded in a larger statement. These are just a small minority of
the existing patterns, though, so the benefit of switching where
possible is large.
It's possible that this patch has removed some within-line matching
behaviors that are in fact desirable, but we can put those back when
we get complaints. Most of the removed behaviors are certainly silly.
Michael Paquier, with some further adjustments by me
2016-01-05 02:08:08 +01:00
/* If we have ALTER TABLE <sth> SET, provide list of attributes and '(' */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TABLE " , MatchAny , " SET " ) )
COMPLETE_WITH ( " ( " , " LOGGED " , " SCHEMA " , " TABLESPACE " , " UNLOGGED " ,
" WITH " , " WITHOUT " ) ;
In psql's tab completion, change most TailMatches patterns to Matches.
In the refactoring in commit d37b816dc9e8f976c8913296781e08cbd45c5af1,
we mostly kept to the original design whereby only the last few words
on the line were matched to identify a completable pattern. However,
after commit d854118c8df8c413d069f7e88bb01b9e18e4c8ed, there's really
no reason to do it like that: where it's sensible, we can use patterns
that expect to match the entire input line. And mostly, it's sensible.
Matching the entire line greatly reduces the odds of a false match that
leads to offering irrelevant completions. Moreover (though I've not
tried to measure this), it should make tab completion faster since
many of the patterns will be discarded after a single integer comparison
that finds that the wrong number of words appear on the line.
There are certain identifiable places where we still need to use
TailMatches because the statement in question is allowed to appear
embedded in a larger statement. These are just a small minority of
the existing patterns, though, so the benefit of switching where
possible is large.
It's possible that this patch has removed some within-line matching
behaviors that are in fact desirable, but we can put those back when
we get complaints. Most of the removed behaviors are certainly silly.
Michael Paquier, with some further adjustments by me
2016-01-05 02:08:08 +01:00
/*
* If we have ALTER TABLE < sth > SET TABLESPACE provide a list of
* tablespaces
*/
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TABLE " , MatchAny , " SET " , " TABLESPACE " ) )
Attached is the third version of my patch that adds/fixes several things
to/in the psql-tabcomplete code. This diff includes the still missing
tab-complete support for TABLESPACE I already sent earlier. New in this
version of the patch is a small adaption of the tab-complete code to
support the adjusted SAVEPOINT-Syntax commited by Tom, as well as
completion of the only half working (and I think only by accident)
tabcomplete-suppport for "BEGIN [ TRANSACTION | WORK ]".
below is a complete list of the things I have changed with this patch:
*) add tablespace support for CREATE/DROP/ALTER and \db
*) sync the list of possible commands following ALTER with the docs (by
adding
AGGREGATE,CONVERSATION,DOMAIN,FUNCTION,LANGUAGE,OPERATOR,SEQUENCE,TABLESPACE
and TYPE)
*) provide a list of valid users after "OWNER TO"
*) tab-complete support for ALTER (AGGREGATE|CONVERSION|FUNCTION)
*) basic tab-complete support for ALTER DOMAIN
*) provide a list of suitable indexes following ALTER TABLE <sth>
CLUSTER ON(?)
*) add "CLUSTER ON" and "SET" to the ALTER TABLE <sth> - tab-complete
list(fixes incorrect/wrong tab-complete with ALTER TABLE <sth> SET
+<TAB> too)
*) provide a list of possible indexes following ALTER TABLE <sth> CLUSTER ON
*) provide list of possible commands(WITHOUT CLUSTER,WITHOUT OIDS,
TABLESPACE) following ALTER TABLE <sth> SET
*) sync "COMMENT ON" with docs by adding "CAST","CONVERSION","FUNCTION"
*) add ABSOLUT to the list of possible commands after FETCH
*) "END" was missing from the sql-commands overview (though it had
completion support!) - i know it's depreciated but we have ABORT and
others still in ...
*) fixes small buglet with ALTER (TRIGGER|CLUSTER) ON autocomplete
(CLUSTER ON +<TAB> would produce CLUSTER ON ON - same for TRIGGER ON)
*) adapt to new SAVEPOINT syntax
*) fix incomplete Support for BEGIN [ TRANSACTION | WORK ]
Stefan Kaltenbrunn
2004-08-20 21:24:59 +02:00
COMPLETE_WITH_QUERY ( Query_for_list_of_tablespaces ) ;
In psql's tab completion, change most TailMatches patterns to Matches.
In the refactoring in commit d37b816dc9e8f976c8913296781e08cbd45c5af1,
we mostly kept to the original design whereby only the last few words
on the line were matched to identify a completable pattern. However,
after commit d854118c8df8c413d069f7e88bb01b9e18e4c8ed, there's really
no reason to do it like that: where it's sensible, we can use patterns
that expect to match the entire input line. And mostly, it's sensible.
Matching the entire line greatly reduces the odds of a false match that
leads to offering irrelevant completions. Moreover (though I've not
tried to measure this), it should make tab completion faster since
many of the patterns will be discarded after a single integer comparison
that finds that the wrong number of words appear on the line.
There are certain identifiable places where we still need to use
TailMatches because the statement in question is allowed to appear
embedded in a larger statement. These are just a small minority of
the existing patterns, though, so the benefit of switching where
possible is large.
It's possible that this patch has removed some within-line matching
behaviors that are in fact desirable, but we can put those back when
we get complaints. Most of the removed behaviors are certainly silly.
Michael Paquier, with some further adjustments by me
2016-01-05 02:08:08 +01:00
/* If we have ALTER TABLE <sth> SET WITHOUT provide CLUSTER or OIDS */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TABLE " , MatchAny , " SET " , " WITHOUT " ) )
COMPLETE_WITH ( " CLUSTER " , " OIDS " ) ;
2010-02-17 05:09:40 +01:00
/* ALTER TABLE <foo> RESET */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TABLE " , MatchAny , " RESET " ) )
COMPLETE_WITH ( " ( " ) ;
2010-02-17 05:09:40 +01:00
/* ALTER TABLE <foo> SET|RESET ( */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TABLE " , MatchAny , " SET|RESET " , " ( " ) )
2018-12-23 01:33:49 +01:00
COMPLETE_WITH_LIST ( table_storage_parameters ) ;
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TABLE " , MatchAny , " REPLICA " , " IDENTITY " , " USING " , " INDEX " ) )
2013-11-08 18:30:43 +01:00
{
completion_info_charp = prev5_wd ;
COMPLETE_WITH_QUERY ( Query_for_index_of_table ) ;
}
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TABLE " , MatchAny , " REPLICA " , " IDENTITY " , " USING " ) )
COMPLETE_WITH ( " INDEX " ) ;
else if ( Matches ( " ALTER " , " TABLE " , MatchAny , " REPLICA " , " IDENTITY " ) )
COMPLETE_WITH ( " FULL " , " NOTHING " , " DEFAULT " , " USING " ) ;
else if ( Matches ( " ALTER " , " TABLE " , MatchAny , " REPLICA " ) )
COMPLETE_WITH ( " IDENTITY " ) ;
2017-05-17 22:31:56 +02:00
2017-02-26 18:20:00 +01:00
/*
* If we have ALTER TABLE < foo > ATTACH PARTITION , provide a list of
* tables .
*/
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TABLE " , MatchAny , " ATTACH " , " PARTITION " ) )
2017-02-26 18:20:00 +01:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_tables , " " ) ;
/* Limited completion support for partition bound specification */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " ATTACH " , " PARTITION " , MatchAny ) )
COMPLETE_WITH ( " FOR VALUES " , " DEFAULT " ) ;
else if ( TailMatches ( " FOR " , " VALUES " ) )
COMPLETE_WITH ( " FROM ( " , " IN ( " , " WITH ( " ) ;
2017-05-17 22:31:56 +02:00
2017-02-26 18:20:00 +01:00
/*
* If we have ALTER TABLE < foo > DETACH PARTITION , provide a list of
* partitions of < foo > .
*/
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TABLE " , MatchAny , " DETACH " , " PARTITION " ) )
2017-02-26 18:20:00 +01:00
{
completion_info_charp = prev3_wd ;
COMPLETE_WITH_QUERY ( Query_for_partition_of_table ) ;
}
2010-02-17 05:09:40 +01:00
2014-09-07 14:04:35 +02:00
/* ALTER TABLESPACE <foo> with RENAME TO, OWNER TO, SET, RESET */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TABLESPACE " , MatchAny ) )
COMPLETE_WITH ( " RENAME TO " , " OWNER TO " , " SET " , " RESET " ) ;
2010-02-17 05:09:40 +01:00
/* ALTER TABLESPACE <foo> SET|RESET */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TABLESPACE " , MatchAny , " SET|RESET " ) )
COMPLETE_WITH ( " ( " ) ;
2010-02-17 05:09:40 +01:00
/* ALTER TABLESPACE <foo> SET|RESET ( */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TABLESPACE " , MatchAny , " SET|RESET " , " ( " ) )
COMPLETE_WITH ( " seq_page_cost " , " random_page_cost " ,
" effective_io_concurrency " ) ;
2010-02-17 05:09:40 +01:00
2007-09-14 06:25:24 +02:00
/* ALTER TEXT SEARCH */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TEXT " , " SEARCH " ) )
COMPLETE_WITH ( " CONFIGURATION " , " DICTIONARY " , " PARSER " , " TEMPLATE " ) ;
else if ( Matches ( " ALTER " , " TEXT " , " SEARCH " , " TEMPLATE|PARSER " , MatchAny ) )
COMPLETE_WITH ( " RENAME TO " , " SET SCHEMA " ) ;
else if ( Matches ( " ALTER " , " TEXT " , " SEARCH " , " DICTIONARY " , MatchAny ) )
COMPLETE_WITH ( " OWNER TO " , " RENAME TO " , " SET SCHEMA " ) ;
else if ( Matches ( " ALTER " , " TEXT " , " SEARCH " , " CONFIGURATION " , MatchAny ) )
COMPLETE_WITH ( " ADD MAPPING FOR " , " ALTER MAPPING " ,
" DROP MAPPING FOR " ,
" OWNER TO " , " RENAME TO " , " SET SCHEMA " ) ;
2007-09-14 06:25:24 +02:00
2010-09-26 13:41:03 +02:00
/* complete ALTER TYPE <foo> with actions */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TYPE " , MatchAny ) )
COMPLETE_WITH ( " ADD ATTRIBUTE " , " ADD VALUE " , " ALTER ATTRIBUTE " ,
" DROP ATTRIBUTE " ,
" OWNER TO " , " RENAME " , " SET SCHEMA " ) ;
2011-02-24 13:05:40 +01:00
/* complete ALTER TYPE <foo> ADD with actions */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TYPE " , MatchAny , " ADD " ) )
COMPLETE_WITH ( " ATTRIBUTE " , " VALUE " ) ;
2011-04-10 17:42:00 +02:00
/* ALTER TYPE <foo> RENAME */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TYPE " , MatchAny , " RENAME " ) )
COMPLETE_WITH ( " ATTRIBUTE " , " TO " , " VALUE " ) ;
2016-11-08 22:27:09 +01:00
/* ALTER TYPE xxx RENAME (ATTRIBUTE|VALUE) yyy */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TYPE " , MatchAny , " RENAME " , " ATTRIBUTE|VALUE " , MatchAny ) )
COMPLETE_WITH ( " TO " ) ;
2017-05-17 22:31:56 +02:00
2011-04-10 17:42:00 +02:00
/*
In psql's tab completion, change most TailMatches patterns to Matches.
In the refactoring in commit d37b816dc9e8f976c8913296781e08cbd45c5af1,
we mostly kept to the original design whereby only the last few words
on the line were matched to identify a completable pattern. However,
after commit d854118c8df8c413d069f7e88bb01b9e18e4c8ed, there's really
no reason to do it like that: where it's sensible, we can use patterns
that expect to match the entire input line. And mostly, it's sensible.
Matching the entire line greatly reduces the odds of a false match that
leads to offering irrelevant completions. Moreover (though I've not
tried to measure this), it should make tab completion faster since
many of the patterns will be discarded after a single integer comparison
that finds that the wrong number of words appear on the line.
There are certain identifiable places where we still need to use
TailMatches because the statement in question is allowed to appear
embedded in a larger statement. These are just a small minority of
the existing patterns, though, so the benefit of switching where
possible is large.
It's possible that this patch has removed some within-line matching
behaviors that are in fact desirable, but we can put those back when
we get complaints. Most of the removed behaviors are certainly silly.
Michael Paquier, with some further adjustments by me
2016-01-05 02:08:08 +01:00
* If we have ALTER TYPE < sth > ALTER / DROP / RENAME ATTRIBUTE , provide list
* of attributes
2011-04-10 17:42:00 +02:00
*/
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TYPE " , MatchAny , " ALTER|DROP|RENAME " , " ATTRIBUTE " ) )
2010-09-26 13:41:03 +02:00
COMPLETE_WITH_ATTR ( prev3_wd , " " ) ;
/* ALTER TYPE ALTER ATTRIBUTE <foo> */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TYPE " , MatchAny , " ALTER " , " ATTRIBUTE " , MatchAny ) )
COMPLETE_WITH ( " TYPE " ) ;
2004-09-22 06:25:16 +02:00
/* complete ALTER GROUP <foo> */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " GROUP " , MatchAny ) )
COMPLETE_WITH ( " ADD USER " , " DROP USER " , " RENAME TO " ) ;
2000-06-25 16:25:51 +02:00
/* complete ALTER GROUP <foo> ADD|DROP with USER */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " GROUP " , MatchAny , " ADD|DROP " ) )
COMPLETE_WITH ( " USER " ) ;
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
/* complete ALTER GROUP <foo> ADD|DROP USER with a user name */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " GROUP " , MatchAny , " ADD|DROP " , " USER " ) )
2005-08-14 20:49:30 +02:00
COMPLETE_WITH_QUERY ( Query_for_list_of_roles ) ;
2000-06-25 16:25:51 +02:00
2016-11-08 22:27:09 +01:00
/*
* If we have ALTER TYPE < sth > RENAME VALUE , provide list of enum values
*/
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER " , " TYPE " , MatchAny , " RENAME " , " VALUE " ) )
2016-11-08 22:27:09 +01:00
COMPLETE_WITH_ENUM_VALUE ( prev3_wd ) ;
Improve tab completion for ANALYZE, EXPLAIN, and VACUUM.
Previously, we made no attempt to provide tab completion in these
statements' optional parenthesized options lists. This patch teaches
psql to do so.
To prevent the option completions from being offered after we've already
seen a complete parenthesized option list, it's necessary to improve
word_matches() so that it allows a wildcard '*' in the middle of an
alternative, not only at the end as formerly. That requires only a
little more code than before, and it allows us to test for "incomplete
parenthesized options" with a test like
else if (HeadMatches2("EXPLAIN", "(*") &&
!HeadMatches2("EXPLAIN", "(*)"))
In addition, add some logic to offer column names in the context of
"ANALYZE tablename ( ...", and likewise for VACUUM. This isn't real
complete; it won't offer column names again after a comma. But it's
better than before, and it doesn't take much code.
Justin Pryzby, reviewed at various times by Álvaro Herrera, Arthur
Zakirov, and Edmund Horner; some additional fixups by me
Discussion: https://postgr.es/m/20180529000623.GA21896@telsasoft.com
2018-09-21 21:22:26 +02:00
/*
* ANALYZE [ ( option [ , . . . ] ) ] [ table_and_columns [ , . . . ] ]
* ANALYZE [ VERBOSE ] [ table_and_columns [ , . . . ] ]
*/
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ANALYZE " ) )
Improve tab completion for ANALYZE, EXPLAIN, and VACUUM.
Previously, we made no attempt to provide tab completion in these
statements' optional parenthesized options lists. This patch teaches
psql to do so.
To prevent the option completions from being offered after we've already
seen a complete parenthesized option list, it's necessary to improve
word_matches() so that it allows a wildcard '*' in the middle of an
alternative, not only at the end as formerly. That requires only a
little more code than before, and it allows us to test for "incomplete
parenthesized options" with a test like
else if (HeadMatches2("EXPLAIN", "(*") &&
!HeadMatches2("EXPLAIN", "(*)"))
In addition, add some logic to offer column names in the context of
"ANALYZE tablename ( ...", and likewise for VACUUM. This isn't real
complete; it won't offer column names again after a comma. But it's
better than before, and it doesn't take much code.
Justin Pryzby, reviewed at various times by Álvaro Herrera, Arthur
Zakirov, and Edmund Horner; some additional fixups by me
Discussion: https://postgr.es/m/20180529000623.GA21896@telsasoft.com
2018-09-21 21:22:26 +02:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_analyzables ,
" UNION SELECT 'VERBOSE' " ) ;
2019-03-06 06:42:52 +01:00
else if ( HeadMatches ( " ANALYZE " , " (* " ) & &
! HeadMatches ( " ANALYZE " , " (*) " ) )
{
/*
* This fires if we ' re in an unfinished parenthesized option list .
* get_previous_words treats a completed parenthesized option list as
* one word , so the above test is correct .
*/
if ( ends_with ( prev_wd , ' ( ' ) | | ends_with ( prev_wd , ' , ' ) )
COMPLETE_WITH ( " VERBOSE " , " SKIP_LOCKED " ) ;
}
2018-09-22 02:50:18 +02:00
else if ( HeadMatches ( " ANALYZE " ) & & TailMatches ( " ( " ) )
Improve tab completion for ANALYZE, EXPLAIN, and VACUUM.
Previously, we made no attempt to provide tab completion in these
statements' optional parenthesized options lists. This patch teaches
psql to do so.
To prevent the option completions from being offered after we've already
seen a complete parenthesized option list, it's necessary to improve
word_matches() so that it allows a wildcard '*' in the middle of an
alternative, not only at the end as formerly. That requires only a
little more code than before, and it allows us to test for "incomplete
parenthesized options" with a test like
else if (HeadMatches2("EXPLAIN", "(*") &&
!HeadMatches2("EXPLAIN", "(*)"))
In addition, add some logic to offer column names in the context of
"ANALYZE tablename ( ...", and likewise for VACUUM. This isn't real
complete; it won't offer column names again after a comma. But it's
better than before, and it doesn't take much code.
Justin Pryzby, reviewed at various times by Álvaro Herrera, Arthur
Zakirov, and Edmund Horner; some additional fixups by me
Discussion: https://postgr.es/m/20180529000623.GA21896@telsasoft.com
2018-09-21 21:22:26 +02:00
/* "ANALYZE (" should be caught above, so assume we want columns */
COMPLETE_WITH_ATTR ( prev2_wd , " " ) ;
2018-09-22 02:50:18 +02:00
else if ( HeadMatches ( " ANALYZE " ) )
Improve tab completion for ANALYZE, EXPLAIN, and VACUUM.
Previously, we made no attempt to provide tab completion in these
statements' optional parenthesized options lists. This patch teaches
psql to do so.
To prevent the option completions from being offered after we've already
seen a complete parenthesized option list, it's necessary to improve
word_matches() so that it allows a wildcard '*' in the middle of an
alternative, not only at the end as formerly. That requires only a
little more code than before, and it allows us to test for "incomplete
parenthesized options" with a test like
else if (HeadMatches2("EXPLAIN", "(*") &&
!HeadMatches2("EXPLAIN", "(*)"))
In addition, add some logic to offer column names in the context of
"ANALYZE tablename ( ...", and likewise for VACUUM. This isn't real
complete; it won't offer column names again after a comma. But it's
better than before, and it doesn't take much code.
Justin Pryzby, reviewed at various times by Álvaro Herrera, Arthur
Zakirov, and Edmund Horner; some additional fixups by me
Discussion: https://postgr.es/m/20180529000623.GA21896@telsasoft.com
2018-09-21 21:22:26 +02:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_analyzables , NULL ) ;
2016-09-01 23:10:30 +02:00
/* BEGIN */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " BEGIN " ) )
COMPLETE_WITH ( " WORK " , " TRANSACTION " , " ISOLATION LEVEL " , " READ " , " DEFERRABLE " , " NOT DEFERRABLE " ) ;
2016-09-01 23:10:30 +02:00
/* END, ABORT */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " END|ABORT " ) )
2019-03-24 10:33:14 +01:00
COMPLETE_WITH ( " AND " , " WORK " , " TRANSACTION " ) ;
2005-07-29 00:14:30 +02:00
/* COMMIT */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " COMMIT " ) )
2019-03-24 10:33:14 +01:00
COMPLETE_WITH ( " AND " , " WORK " , " TRANSACTION " , " PREPARED " ) ;
Attached is the third version of my patch that adds/fixes several things
to/in the psql-tabcomplete code. This diff includes the still missing
tab-complete support for TABLESPACE I already sent earlier. New in this
version of the patch is a small adaption of the tab-complete code to
support the adjusted SAVEPOINT-Syntax commited by Tom, as well as
completion of the only half working (and I think only by accident)
tabcomplete-suppport for "BEGIN [ TRANSACTION | WORK ]".
below is a complete list of the things I have changed with this patch:
*) add tablespace support for CREATE/DROP/ALTER and \db
*) sync the list of possible commands following ALTER with the docs (by
adding
AGGREGATE,CONVERSATION,DOMAIN,FUNCTION,LANGUAGE,OPERATOR,SEQUENCE,TABLESPACE
and TYPE)
*) provide a list of valid users after "OWNER TO"
*) tab-complete support for ALTER (AGGREGATE|CONVERSION|FUNCTION)
*) basic tab-complete support for ALTER DOMAIN
*) provide a list of suitable indexes following ALTER TABLE <sth>
CLUSTER ON(?)
*) add "CLUSTER ON" and "SET" to the ALTER TABLE <sth> - tab-complete
list(fixes incorrect/wrong tab-complete with ALTER TABLE <sth> SET
+<TAB> too)
*) provide a list of possible indexes following ALTER TABLE <sth> CLUSTER ON
*) provide list of possible commands(WITHOUT CLUSTER,WITHOUT OIDS,
TABLESPACE) following ALTER TABLE <sth> SET
*) sync "COMMENT ON" with docs by adding "CAST","CONVERSION","FUNCTION"
*) add ABSOLUT to the list of possible commands after FETCH
*) "END" was missing from the sql-commands overview (though it had
completion support!) - i know it's depreciated but we have ABORT and
others still in ...
*) fixes small buglet with ALTER (TRIGGER|CLUSTER) ON autocomplete
(CLUSTER ON +<TAB> would produce CLUSTER ON ON - same for TRIGGER ON)
*) adapt to new SAVEPOINT syntax
*) fix incomplete Support for BEGIN [ TRANSACTION | WORK ]
Stefan Kaltenbrunn
2004-08-20 21:24:59 +02:00
/* RELEASE SAVEPOINT */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " RELEASE " ) )
COMPLETE_WITH ( " SAVEPOINT " ) ;
In psql's tab completion, change most TailMatches patterns to Matches.
In the refactoring in commit d37b816dc9e8f976c8913296781e08cbd45c5af1,
we mostly kept to the original design whereby only the last few words
on the line were matched to identify a completable pattern. However,
after commit d854118c8df8c413d069f7e88bb01b9e18e4c8ed, there's really
no reason to do it like that: where it's sensible, we can use patterns
that expect to match the entire input line. And mostly, it's sensible.
Matching the entire line greatly reduces the odds of a false match that
leads to offering irrelevant completions. Moreover (though I've not
tried to measure this), it should make tab completion faster since
many of the patterns will be discarded after a single integer comparison
that finds that the wrong number of words appear on the line.
There are certain identifiable places where we still need to use
TailMatches because the statement in question is allowed to appear
embedded in a larger statement. These are just a small minority of
the existing patterns, though, so the benefit of switching where
possible is large.
It's possible that this patch has removed some within-line matching
behaviors that are in fact desirable, but we can put those back when
we get complaints. Most of the removed behaviors are certainly silly.
Michael Paquier, with some further adjustments by me
2016-01-05 02:08:08 +01:00
/* ROLLBACK */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ROLLBACK " ) )
2019-03-24 10:33:14 +01:00
COMPLETE_WITH ( " AND " , " WORK " , " TRANSACTION " , " TO SAVEPOINT " , " PREPARED " ) ;
else if ( Matches ( " ABORT|END|COMMIT|ROLLBACK " , " AND " ) )
COMPLETE_WITH ( " CHAIN " ) ;
2017-11-30 14:46:13 +01:00
/* CALL */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CALL " ) )
2018-03-05 21:37:23 +01:00
COMPLETE_WITH_VERSIONED_SCHEMA_QUERY ( Query_for_list_of_procedures , NULL ) ;
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CALL " , MatchAny ) )
COMPLETE_WITH ( " ( " ) ;
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
/* CLUSTER */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CLUSTER " ) )
2018-09-21 18:41:00 +02:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_clusterables , " UNION SELECT 'VERBOSE' " ) ;
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CLUSTER " , " VERBOSE " ) )
2018-09-21 18:41:00 +02:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_clusterables , NULL ) ;
2007-04-08 02:26:34 +02:00
/* If we have CLUSTER <sth>, then add "USING" */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CLUSTER " , MatchAnyExcept ( " VERBOSE|ON " ) ) )
COMPLETE_WITH ( " USING " ) ;
2012-08-20 22:45:44 +02:00
/* If we have CLUSTER VERBOSE <sth>, then add "USING" */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CLUSTER " , " VERBOSE " , MatchAny ) )
COMPLETE_WITH ( " USING " ) ;
In psql's tab completion, change most TailMatches patterns to Matches.
In the refactoring in commit d37b816dc9e8f976c8913296781e08cbd45c5af1,
we mostly kept to the original design whereby only the last few words
on the line were matched to identify a completable pattern. However,
after commit d854118c8df8c413d069f7e88bb01b9e18e4c8ed, there's really
no reason to do it like that: where it's sensible, we can use patterns
that expect to match the entire input line. And mostly, it's sensible.
Matching the entire line greatly reduces the odds of a false match that
leads to offering irrelevant completions. Moreover (though I've not
tried to measure this), it should make tab completion faster since
many of the patterns will be discarded after a single integer comparison
that finds that the wrong number of words appear on the line.
There are certain identifiable places where we still need to use
TailMatches because the statement in question is allowed to appear
embedded in a larger statement. These are just a small minority of
the existing patterns, though, so the benefit of switching where
possible is large.
It's possible that this patch has removed some within-line matching
behaviors that are in fact desirable, but we can put those back when
we get complaints. Most of the removed behaviors are certainly silly.
Michael Paquier, with some further adjustments by me
2016-01-05 02:08:08 +01:00
/* If we have CLUSTER <sth> USING, then add the index as well */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CLUSTER " , MatchAny , " USING " ) | |
Matches ( " CLUSTER " , " VERBOSE " , MatchAny , " USING " ) )
2012-08-20 22:45:44 +02:00
{
completion_info_charp = prev2_wd ;
COMPLETE_WITH_QUERY ( Query_for_index_of_table ) ;
}
2000-06-25 16:25:51 +02:00
/* COMMENT */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " COMMENT " ) )
COMPLETE_WITH ( " ON " ) ;
else if ( Matches ( " COMMENT " , " ON " ) )
COMPLETE_WITH ( " ACCESS METHOD " , " CAST " , " COLLATION " , " CONVERSION " ,
" DATABASE " , " EVENT TRIGGER " , " EXTENSION " ,
" FOREIGN DATA WRAPPER " , " FOREIGN TABLE " , " SERVER " ,
" INDEX " , " LANGUAGE " , " POLICY " , " PUBLICATION " , " RULE " ,
" SCHEMA " , " SEQUENCE " , " STATISTICS " , " SUBSCRIPTION " ,
" TABLE " , " TYPE " , " VIEW " , " MATERIALIZED VIEW " ,
" COLUMN " , " AGGREGATE " , " FUNCTION " ,
" PROCEDURE " , " ROUTINE " ,
" OPERATOR " , " TRIGGER " , " CONSTRAINT " , " DOMAIN " ,
" LARGE OBJECT " , " TABLESPACE " , " TEXT SEARCH " , " ROLE " ) ;
else if ( Matches ( " COMMENT " , " ON " , " ACCESS " , " METHOD " ) )
2016-06-07 23:59:34 +02:00
COMPLETE_WITH_QUERY ( Query_for_list_of_access_methods ) ;
2018-09-22 02:50:18 +02:00
else if ( Matches ( " COMMENT " , " ON " , " FOREIGN " ) )
COMPLETE_WITH ( " DATA WRAPPER " , " TABLE " ) ;
else if ( Matches ( " COMMENT " , " ON " , " TEXT " , " SEARCH " ) )
COMPLETE_WITH ( " CONFIGURATION " , " DICTIONARY " , " PARSER " , " TEMPLATE " ) ;
else if ( Matches ( " COMMENT " , " ON " , " CONSTRAINT " ) )
2012-09-15 04:11:17 +02:00
COMPLETE_WITH_QUERY ( Query_for_all_table_constraints ) ;
2018-09-22 02:50:18 +02:00
else if ( Matches ( " COMMENT " , " ON " , " CONSTRAINT " , MatchAny ) )
COMPLETE_WITH ( " ON " ) ;
else if ( Matches ( " COMMENT " , " ON " , " CONSTRAINT " , MatchAny , " ON " ) )
2012-09-15 04:11:17 +02:00
{
completion_info_charp = prev2_wd ;
COMPLETE_WITH_QUERY ( Query_for_list_of_tables_for_constraint ) ;
}
2018-09-22 02:50:18 +02:00
else if ( Matches ( " COMMENT " , " ON " , " MATERIALIZED " , " VIEW " ) )
2013-03-04 01:23:31 +01:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_matviews , NULL ) ;
2018-09-22 02:50:18 +02:00
else if ( Matches ( " COMMENT " , " ON " , " EVENT " , " TRIGGER " ) )
2014-04-14 14:44:21 +02:00
COMPLETE_WITH_QUERY ( Query_for_list_of_event_triggers ) ;
2018-09-22 02:50:18 +02:00
else if ( Matches ( " COMMENT " , " ON " , MatchAny , MatchAnyExcept ( " IS " ) ) | |
Matches ( " COMMENT " , " ON " , MatchAny , MatchAny , MatchAnyExcept ( " IS " ) ) | |
Matches ( " COMMENT " , " ON " , MatchAny , MatchAny , MatchAny , MatchAnyExcept ( " IS " ) ) )
COMPLETE_WITH ( " IS " ) ;
2000-06-25 16:25:51 +02:00
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
/* COPY */
2000-04-12 19:17:23 +02:00
/*
2016-01-21 03:27:46 +01:00
* If we have COPY , offer list of tables or " ( " ( Also cover the analogous
* backslash command ) .
2000-04-12 19:17:23 +02:00
*/
2018-09-22 02:50:18 +02:00
else if ( Matches ( " COPY| \\ copy " ) )
2016-01-21 03:27:46 +01:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_tables ,
" UNION ALL SELECT '(' " ) ;
/* If we have COPY BINARY, complete with list of tables */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " COPY " , " BINARY " ) )
2003-10-30 22:37:38 +01:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_tables , NULL ) ;
2016-01-21 03:27:46 +01:00
/* If we have COPY (, complete it with legal commands */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " COPY| \\ copy " , " ( " ) )
COMPLETE_WITH ( " SELECT " , " TABLE " , " VALUES " , " INSERT " , " UPDATE " , " DELETE " , " WITH " ) ;
In psql's tab completion, change most TailMatches patterns to Matches.
In the refactoring in commit d37b816dc9e8f976c8913296781e08cbd45c5af1,
we mostly kept to the original design whereby only the last few words
on the line were matched to identify a completable pattern. However,
after commit d854118c8df8c413d069f7e88bb01b9e18e4c8ed, there's really
no reason to do it like that: where it's sensible, we can use patterns
that expect to match the entire input line. And mostly, it's sensible.
Matching the entire line greatly reduces the odds of a false match that
leads to offering irrelevant completions. Moreover (though I've not
tried to measure this), it should make tab completion faster since
many of the patterns will be discarded after a single integer comparison
that finds that the wrong number of words appear on the line.
There are certain identifiable places where we still need to use
TailMatches because the statement in question is allowed to appear
embedded in a larger statement. These are just a small minority of
the existing patterns, though, so the benefit of switching where
possible is large.
It's possible that this patch has removed some within-line matching
behaviors that are in fact desirable, but we can put those back when
we get complaints. Most of the removed behaviors are certainly silly.
Michael Paquier, with some further adjustments by me
2016-01-05 02:08:08 +01:00
/* If we have COPY [BINARY] <sth>, complete it with "TO" or "FROM" */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " COPY| \\ copy " , MatchAny ) | |
Matches ( " COPY " , " BINARY " , MatchAny ) )
COMPLETE_WITH ( " FROM " , " TO " ) ;
In psql's tab completion, change most TailMatches patterns to Matches.
In the refactoring in commit d37b816dc9e8f976c8913296781e08cbd45c5af1,
we mostly kept to the original design whereby only the last few words
on the line were matched to identify a completable pattern. However,
after commit d854118c8df8c413d069f7e88bb01b9e18e4c8ed, there's really
no reason to do it like that: where it's sensible, we can use patterns
that expect to match the entire input line. And mostly, it's sensible.
Matching the entire line greatly reduces the odds of a false match that
leads to offering irrelevant completions. Moreover (though I've not
tried to measure this), it should make tab completion faster since
many of the patterns will be discarded after a single integer comparison
that finds that the wrong number of words appear on the line.
There are certain identifiable places where we still need to use
TailMatches because the statement in question is allowed to appear
embedded in a larger statement. These are just a small minority of
the existing patterns, though, so the benefit of switching where
possible is large.
It's possible that this patch has removed some within-line matching
behaviors that are in fact desirable, but we can put those back when
we get complaints. Most of the removed behaviors are certainly silly.
Michael Paquier, with some further adjustments by me
2016-01-05 02:08:08 +01:00
/* If we have COPY [BINARY] <sth> FROM|TO, complete with filename */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " COPY| \\ copy " , MatchAny , " FROM|TO " ) | |
Matches ( " COPY " , " BINARY " , MatchAny , " FROM|TO " ) )
2012-02-28 05:06:29 +01:00
{
completion_charp = " " ;
matches = completion_matches ( text , complete_from_files ) ;
}
2004-09-22 06:25:16 +02:00
In psql's tab completion, change most TailMatches patterns to Matches.
In the refactoring in commit d37b816dc9e8f976c8913296781e08cbd45c5af1,
we mostly kept to the original design whereby only the last few words
on the line were matched to identify a completable pattern. However,
after commit d854118c8df8c413d069f7e88bb01b9e18e4c8ed, there's really
no reason to do it like that: where it's sensible, we can use patterns
that expect to match the entire input line. And mostly, it's sensible.
Matching the entire line greatly reduces the odds of a false match that
leads to offering irrelevant completions. Moreover (though I've not
tried to measure this), it should make tab completion faster since
many of the patterns will be discarded after a single integer comparison
that finds that the wrong number of words appear on the line.
There are certain identifiable places where we still need to use
TailMatches because the statement in question is allowed to appear
embedded in a larger statement. These are just a small minority of
the existing patterns, though, so the benefit of switching where
possible is large.
It's possible that this patch has removed some within-line matching
behaviors that are in fact desirable, but we can put those back when
we get complaints. Most of the removed behaviors are certainly silly.
Michael Paquier, with some further adjustments by me
2016-01-05 02:08:08 +01:00
/* Handle COPY [BINARY] <sth> FROM|TO filename */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " COPY| \\ copy " , MatchAny , " FROM|TO " , MatchAny ) | |
Matches ( " COPY " , " BINARY " , MatchAny , " FROM|TO " , MatchAny ) )
Remove WITH OIDS support, change oid catalog column visibility.
Previously tables declared WITH OIDS, including a significant fraction
of the catalog tables, stored the oid column not as a normal column,
but as part of the tuple header.
This special column was not shown by default, which was somewhat odd,
as it's often (consider e.g. pg_class.oid) one of the more important
parts of a row. Neither pg_dump nor COPY included the contents of the
oid column by default.
The fact that the oid column was not an ordinary column necessitated a
significant amount of special case code to support oid columns. That
already was painful for the existing, but upcoming work aiming to make
table storage pluggable, would have required expanding and duplicating
that "specialness" significantly.
WITH OIDS has been deprecated since 2005 (commit ff02d0a05280e0).
Remove it.
Removing includes:
- CREATE TABLE and ALTER TABLE syntax for declaring the table to be
WITH OIDS has been removed (WITH (oids[ = true]) will error out)
- pg_dump does not support dumping tables declared WITH OIDS and will
issue a warning when dumping one (and ignore the oid column).
- restoring an pg_dump archive with pg_restore will warn when
restoring a table with oid contents (and ignore the oid column)
- COPY will refuse to load binary dump that includes oids.
- pg_upgrade will error out when encountering tables declared WITH
OIDS, they have to be altered to remove the oid column first.
- Functionality to access the oid of the last inserted row (like
plpgsql's RESULT_OID, spi's SPI_lastoid, ...) has been removed.
The syntax for declaring a table WITHOUT OIDS (or WITH (oids = false)
for CREATE TABLE) is still supported. While that requires a bit of
support code, it seems unnecessary to break applications / dumps that
do not use oids, and are explicit about not using them.
The biggest user of WITH OID columns was postgres' catalog. This
commit changes all 'magic' oid columns to be columns that are normally
declared and stored. To reduce unnecessary query breakage all the
newly added columns are still named 'oid', even if a table's column
naming scheme would indicate 'reloid' or such. This obviously
requires adapting a lot code, mostly replacing oid access via
HeapTupleGetOid() with access to the underlying Form_pg_*->oid column.
The bootstrap process now assigns oids for all oid columns in
genbki.pl that do not have an explicit value (starting at the largest
oid previously used), only oids assigned later by oids will be above
FirstBootstrapObjectId. As the oid column now is a normal column the
special bootstrap syntax for oids has been removed.
Oids are not automatically assigned during insertion anymore, all
backend code explicitly assigns oids with GetNewOidWithIndex(). For
the rare case that insertions into the catalog via SQL are called for
the new pg_nextoid() function can be used (which only works on catalog
tables).
The fact that oid columns on system tables are now normal columns
means that they will be included in the set of columns expanded
by * (i.e. SELECT * FROM pg_class will now include the table's oid,
previously it did not). It'd not technically be hard to hide oid
column by default, but that'd mean confusing behavior would either
have to be carried forward forever, or it'd cause breakage down the
line.
While it's not unlikely that further adjustments are needed, the
scope/invasiveness of the patch makes it worthwhile to get merge this
now. It's painful to maintain externally, too complicated to commit
after the code code freeze, and a dependency of a number of other
patches.
Catversion bump, for obvious reasons.
Author: Andres Freund, with contributions by John Naylor
Discussion: https://postgr.es/m/20180930034810.ywp2c7awz7opzcfr@alap3.anarazel.de
2018-11-21 00:36:57 +01:00
COMPLETE_WITH ( " BINARY " , " DELIMITER " , " NULL " , " CSV " ,
2018-09-22 02:50:18 +02:00
" ENCODING " ) ;
2004-09-22 06:25:16 +02:00
In psql's tab completion, change most TailMatches patterns to Matches.
In the refactoring in commit d37b816dc9e8f976c8913296781e08cbd45c5af1,
we mostly kept to the original design whereby only the last few words
on the line were matched to identify a completable pattern. However,
after commit d854118c8df8c413d069f7e88bb01b9e18e4c8ed, there's really
no reason to do it like that: where it's sensible, we can use patterns
that expect to match the entire input line. And mostly, it's sensible.
Matching the entire line greatly reduces the odds of a false match that
leads to offering irrelevant completions. Moreover (though I've not
tried to measure this), it should make tab completion faster since
many of the patterns will be discarded after a single integer comparison
that finds that the wrong number of words appear on the line.
There are certain identifiable places where we still need to use
TailMatches because the statement in question is allowed to appear
embedded in a larger statement. These are just a small minority of
the existing patterns, though, so the benefit of switching where
possible is large.
It's possible that this patch has removed some within-line matching
behaviors that are in fact desirable, but we can put those back when
we get complaints. Most of the removed behaviors are certainly silly.
Michael Paquier, with some further adjustments by me
2016-01-05 02:08:08 +01:00
/* Handle COPY [BINARY] <sth> FROM|TO filename CSV */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " COPY| \\ copy " , MatchAny , " FROM|TO " , MatchAny , " CSV " ) | |
Matches ( " COPY " , " BINARY " , MatchAny , " FROM|TO " , MatchAny , " CSV " ) )
COMPLETE_WITH ( " HEADER " , " QUOTE " , " ESCAPE " , " FORCE QUOTE " ,
" FORCE NOT NULL " ) ;
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
2016-03-28 18:32:13 +02:00
/* CREATE ACCESS METHOD */
/* Complete "CREATE ACCESS METHOD <name>" */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " ACCESS " , " METHOD " , MatchAny ) )
COMPLETE_WITH ( " TYPE " ) ;
2016-03-28 18:32:13 +02:00
/* Complete "CREATE ACCESS METHOD <name> TYPE" */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " ACCESS " , " METHOD " , MatchAny , " TYPE " ) )
COMPLETE_WITH ( " INDEX " ) ;
2016-03-28 18:32:13 +02:00
/* Complete "CREATE ACCESS METHOD <name> TYPE <type>" */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " ACCESS " , " METHOD " , MatchAny , " TYPE " , MatchAny ) )
COMPLETE_WITH ( " HANDLER " ) ;
2016-03-28 18:32:13 +02:00
2005-08-14 20:49:30 +02:00
/* CREATE DATABASE */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " DATABASE " , MatchAny ) )
COMPLETE_WITH ( " OWNER " , " TEMPLATE " , " ENCODING " , " TABLESPACE " ,
" IS_TEMPLATE " ,
" ALLOW_CONNECTIONS " , " CONNECTION LIMIT " ,
" LC_COLLATE " , " LC_CTYPE " ) ;
2005-08-14 20:49:30 +02:00
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " DATABASE " , MatchAny , " TEMPLATE " ) )
2007-09-14 06:25:24 +02:00
COMPLETE_WITH_QUERY ( Query_for_list_of_template_databases ) ;
2011-02-08 22:08:41 +01:00
/* CREATE EXTENSION */
/* Complete with available extensions rather than installed ones. */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " EXTENSION " ) )
2011-02-08 22:08:41 +01:00
COMPLETE_WITH_QUERY ( Query_for_list_of_available_extensions ) ;
/* CREATE EXTENSION <name> */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " EXTENSION " , MatchAny ) )
COMPLETE_WITH ( " WITH SCHEMA " , " CASCADE " , " VERSION " ) ;
2015-10-20 16:27:20 +02:00
/* CREATE EXTENSION <name> VERSION */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " EXTENSION " , MatchAny , " VERSION " ) )
2015-10-20 16:27:20 +02:00
{
completion_info_charp = prev2_wd ;
COMPLETE_WITH_QUERY ( Query_for_list_of_available_extension_versions ) ;
}
2011-02-08 22:08:41 +01:00
2011-01-02 05:48:11 +01:00
/* CREATE FOREIGN */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " FOREIGN " ) )
COMPLETE_WITH ( " DATA WRAPPER " , " TABLE " ) ;
2011-01-02 05:48:11 +01:00
2008-12-19 17:25:19 +01:00
/* CREATE FOREIGN DATA WRAPPER */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " FOREIGN " , " DATA " , " WRAPPER " , MatchAny ) )
COMPLETE_WITH ( " HANDLER " , " VALIDATOR " , " OPTIONS " ) ;
2008-12-19 17:25:19 +01:00
In psql's tab completion, change most TailMatches patterns to Matches.
In the refactoring in commit d37b816dc9e8f976c8913296781e08cbd45c5af1,
we mostly kept to the original design whereby only the last few words
on the line were matched to identify a completable pattern. However,
after commit d854118c8df8c413d069f7e88bb01b9e18e4c8ed, there's really
no reason to do it like that: where it's sensible, we can use patterns
that expect to match the entire input line. And mostly, it's sensible.
Matching the entire line greatly reduces the odds of a false match that
leads to offering irrelevant completions. Moreover (though I've not
tried to measure this), it should make tab completion faster since
many of the patterns will be discarded after a single integer comparison
that finds that the wrong number of words appear on the line.
There are certain identifiable places where we still need to use
TailMatches because the statement in question is allowed to appear
embedded in a larger statement. These are just a small minority of
the existing patterns, though, so the benefit of switching where
possible is large.
It's possible that this patch has removed some within-line matching
behaviors that are in fact desirable, but we can put those back when
we get complaints. Most of the removed behaviors are certainly silly.
Michael Paquier, with some further adjustments by me
2016-01-05 02:08:08 +01:00
/* CREATE INDEX --- is allowed inside CREATE SCHEMA, so use TailMatches */
2000-04-12 19:17:23 +02:00
/* First off we complete CREATE UNIQUE with "INDEX" */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " CREATE " , " UNIQUE " ) )
COMPLETE_WITH ( " INDEX " ) ;
2016-06-10 00:02:36 +02:00
/*
* If we have CREATE | UNIQUE INDEX , then add " ON " , " CONCURRENTLY " , and
* existing indexes
*/
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " CREATE|UNIQUE " , " INDEX " ) )
2010-02-17 05:09:40 +01:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_indexes ,
" UNION SELECT 'ON' "
" UNION SELECT 'CONCURRENTLY' " ) ;
2018-04-26 20:47:16 +02:00
Local partitioned indexes
When CREATE INDEX is run on a partitioned table, create catalog entries
for an index on the partitioned table (which is just a placeholder since
the table proper has no data of its own), and recurse to create actual
indexes on the existing partitions; create them in future partitions
also.
As a convenience gadget, if the new index definition matches some
existing index in partitions, these are picked up and used instead of
creating new ones. Whichever way these indexes come about, they become
attached to the index on the parent table and are dropped alongside it,
and cannot be dropped on isolation unless they are detached first.
To support pg_dump'ing these indexes, add commands
CREATE INDEX ON ONLY <table>
(which creates the index on the parent partitioned table, without
recursing) and
ALTER INDEX ATTACH PARTITION
(which is used after the indexes have been created individually on each
partition, to attach them to the parent index). These reconstruct prior
database state exactly.
Reviewed-by: (in alphabetical order) Peter Eisentraut, Robert Haas, Amit
Langote, Jesper Pedersen, Simon Riggs, David Rowley
Discussion: https://postgr.es/m/20171113170646.gzweigyrgg6pwsg4@alvherre.pgsql
2018-01-19 15:49:22 +01:00
/*
* Complete . . . INDEX | CONCURRENTLY [ < name > ] ON with a list of relations
2018-09-21 18:41:00 +02:00
* that indexes can be created on
Local partitioned indexes
When CREATE INDEX is run on a partitioned table, create catalog entries
for an index on the partitioned table (which is just a placeholder since
the table proper has no data of its own), and recurse to create actual
indexes on the existing partitions; create them in future partitions
also.
As a convenience gadget, if the new index definition matches some
existing index in partitions, these are picked up and used instead of
creating new ones. Whichever way these indexes come about, they become
attached to the index on the parent table and are dropped alongside it,
and cannot be dropped on isolation unless they are detached first.
To support pg_dump'ing these indexes, add commands
CREATE INDEX ON ONLY <table>
(which creates the index on the parent partitioned table, without
recursing) and
ALTER INDEX ATTACH PARTITION
(which is used after the indexes have been created individually on each
partition, to attach them to the parent index). These reconstruct prior
database state exactly.
Reviewed-by: (in alphabetical order) Peter Eisentraut, Robert Haas, Amit
Langote, Jesper Pedersen, Simon Riggs, David Rowley
Discussion: https://postgr.es/m/20171113170646.gzweigyrgg6pwsg4@alvherre.pgsql
2018-01-19 15:49:22 +01:00
*/
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " INDEX|CONCURRENTLY " , MatchAny , " ON " ) | |
TailMatches ( " INDEX|CONCURRENTLY " , " ON " ) )
2018-09-21 18:41:00 +02:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_indexables , NULL ) ;
2016-06-10 00:02:36 +02:00
/*
* Complete CREATE | UNIQUE INDEX CONCURRENTLY with " ON " and existing
* indexes
*/
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " CREATE|UNIQUE " , " INDEX " , " CONCURRENTLY " ) )
2016-01-13 02:31:43 +01:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_indexes ,
" UNION SELECT 'ON' " ) ;
/* Complete CREATE|UNIQUE INDEX [CONCURRENTLY] <sth> with "ON" */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " CREATE|UNIQUE " , " INDEX " , MatchAny ) | |
TailMatches ( " CREATE|UNIQUE " , " INDEX " , " CONCURRENTLY " , MatchAny ) )
COMPLETE_WITH ( " ON " ) ;
2000-04-12 19:17:23 +02:00
/*
2005-10-15 04:49:52 +02:00
* Complete INDEX < name > ON < table > with a list of table columns ( which
* should really be in parens )
2000-04-12 19:17:23 +02:00
*/
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " INDEX " , MatchAny , " ON " , MatchAny ) | |
TailMatches ( " INDEX|CONCURRENTLY " , " ON " , MatchAny ) )
COMPLETE_WITH ( " ( " , " USING " ) ;
else if ( TailMatches ( " INDEX " , MatchAny , " ON " , MatchAny , " ( " ) | |
TailMatches ( " INDEX|CONCURRENTLY " , " ON " , MatchAny , " ( " ) )
2006-02-12 08:21:40 +01:00
COMPLETE_WITH_ATTR ( prev2_wd , " " ) ;
2000-04-12 19:17:23 +02:00
/* same if you put in USING */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " ON " , MatchAny , " USING " , MatchAny , " ( " ) )
2010-02-17 05:09:40 +01:00
COMPLETE_WITH_ATTR ( prev4_wd , " " ) ;
2000-04-12 19:17:23 +02:00
/* Complete USING with an index method */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " INDEX " , MatchAny , MatchAny , " ON " , MatchAny , " USING " ) | |
TailMatches ( " INDEX " , MatchAny , " ON " , MatchAny , " USING " ) | |
TailMatches ( " INDEX " , " ON " , MatchAny , " USING " ) )
2010-02-17 05:09:40 +01:00
COMPLETE_WITH_QUERY ( Query_for_list_of_access_methods ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " ON " , MatchAny , " USING " , MatchAny ) & &
! TailMatches ( " POLICY " , MatchAny , MatchAny , MatchAny , MatchAny , MatchAny ) & &
! TailMatches ( " FOR " , MatchAny , MatchAny , MatchAny ) )
COMPLETE_WITH ( " ( " ) ;
2000-04-12 19:17:23 +02:00
Row-Level Security Policies (RLS)
Building on the updatable security-barrier views work, add the
ability to define policies on tables to limit the set of rows
which are returned from a query and which are allowed to be added
to a table. Expressions defined by the policy for filtering are
added to the security barrier quals of the query, while expressions
defined to check records being added to a table are added to the
with-check options of the query.
New top-level commands are CREATE/ALTER/DROP POLICY and are
controlled by the table owner. Row Security is able to be enabled
and disabled by the owner on a per-table basis using
ALTER TABLE .. ENABLE/DISABLE ROW SECURITY.
Per discussion, ROW SECURITY is disabled on tables by default and
must be enabled for policies on the table to be used. If no
policies exist on a table with ROW SECURITY enabled, a default-deny
policy is used and no records will be visible.
By default, row security is applied at all times except for the
table owner and the superuser. A new GUC, row_security, is added
which can be set to ON, OFF, or FORCE. When set to FORCE, row
security will be applied even for the table owner and superusers.
When set to OFF, row security will be disabled when allowed and an
error will be thrown if the user does not have rights to bypass row
security.
Per discussion, pg_dump sets row_security = OFF by default to ensure
that exports and backups will have all data in the table or will
error if there are insufficient privileges to bypass row security.
A new option has been added to pg_dump, --enable-row-security, to
ask pg_dump to export with row security enabled.
A new role capability, BYPASSRLS, which can only be set by the
superuser, is added to allow other users to be able to bypass row
security using row_security = OFF.
Many thanks to the various individuals who have helped with the
design, particularly Robert Haas for his feedback.
Authors include Craig Ringer, KaiGai Kohei, Adam Brightwell, Dean
Rasheed, with additional changes and rework by me.
Reviewers have included all of the above, Greg Smith,
Jeff McCormick, and Robert Haas.
2014-09-19 17:18:35 +02:00
/* CREATE POLICY */
/* Complete "CREATE POLICY <name> ON" */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " POLICY " , MatchAny ) )
COMPLETE_WITH ( " ON " ) ;
Row-Level Security Policies (RLS)
Building on the updatable security-barrier views work, add the
ability to define policies on tables to limit the set of rows
which are returned from a query and which are allowed to be added
to a table. Expressions defined by the policy for filtering are
added to the security barrier quals of the query, while expressions
defined to check records being added to a table are added to the
with-check options of the query.
New top-level commands are CREATE/ALTER/DROP POLICY and are
controlled by the table owner. Row Security is able to be enabled
and disabled by the owner on a per-table basis using
ALTER TABLE .. ENABLE/DISABLE ROW SECURITY.
Per discussion, ROW SECURITY is disabled on tables by default and
must be enabled for policies on the table to be used. If no
policies exist on a table with ROW SECURITY enabled, a default-deny
policy is used and no records will be visible.
By default, row security is applied at all times except for the
table owner and the superuser. A new GUC, row_security, is added
which can be set to ON, OFF, or FORCE. When set to FORCE, row
security will be applied even for the table owner and superusers.
When set to OFF, row security will be disabled when allowed and an
error will be thrown if the user does not have rights to bypass row
security.
Per discussion, pg_dump sets row_security = OFF by default to ensure
that exports and backups will have all data in the table or will
error if there are insufficient privileges to bypass row security.
A new option has been added to pg_dump, --enable-row-security, to
ask pg_dump to export with row security enabled.
A new role capability, BYPASSRLS, which can only be set by the
superuser, is added to allow other users to be able to bypass row
security using row_security = OFF.
Many thanks to the various individuals who have helped with the
design, particularly Robert Haas for his feedback.
Authors include Craig Ringer, KaiGai Kohei, Adam Brightwell, Dean
Rasheed, with additional changes and rework by me.
Reviewers have included all of the above, Greg Smith,
Jeff McCormick, and Robert Haas.
2014-09-19 17:18:35 +02:00
/* Complete "CREATE POLICY <name> ON <table>" */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " POLICY " , MatchAny , " ON " ) )
Row-Level Security Policies (RLS)
Building on the updatable security-barrier views work, add the
ability to define policies on tables to limit the set of rows
which are returned from a query and which are allowed to be added
to a table. Expressions defined by the policy for filtering are
added to the security barrier quals of the query, while expressions
defined to check records being added to a table are added to the
with-check options of the query.
New top-level commands are CREATE/ALTER/DROP POLICY and are
controlled by the table owner. Row Security is able to be enabled
and disabled by the owner on a per-table basis using
ALTER TABLE .. ENABLE/DISABLE ROW SECURITY.
Per discussion, ROW SECURITY is disabled on tables by default and
must be enabled for policies on the table to be used. If no
policies exist on a table with ROW SECURITY enabled, a default-deny
policy is used and no records will be visible.
By default, row security is applied at all times except for the
table owner and the superuser. A new GUC, row_security, is added
which can be set to ON, OFF, or FORCE. When set to FORCE, row
security will be applied even for the table owner and superusers.
When set to OFF, row security will be disabled when allowed and an
error will be thrown if the user does not have rights to bypass row
security.
Per discussion, pg_dump sets row_security = OFF by default to ensure
that exports and backups will have all data in the table or will
error if there are insufficient privileges to bypass row security.
A new option has been added to pg_dump, --enable-row-security, to
ask pg_dump to export with row security enabled.
A new role capability, BYPASSRLS, which can only be set by the
superuser, is added to allow other users to be able to bypass row
security using row_security = OFF.
Many thanks to the various individuals who have helped with the
design, particularly Robert Haas for his feedback.
Authors include Craig Ringer, KaiGai Kohei, Adam Brightwell, Dean
Rasheed, with additional changes and rework by me.
Reviewers have included all of the above, Greg Smith,
Jeff McCormick, and Robert Haas.
2014-09-19 17:18:35 +02:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_tables , NULL ) ;
2016-12-05 21:50:55 +01:00
/* Complete "CREATE POLICY <name> ON <table> AS|FOR|TO|USING|WITH CHECK" */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " POLICY " , MatchAny , " ON " , MatchAny ) )
COMPLETE_WITH ( " AS " , " FOR " , " TO " , " USING ( " , " WITH CHECK ( " ) ;
2016-12-05 21:50:55 +01:00
/* CREATE POLICY <name> ON <table> AS PERMISSIVE|RESTRICTIVE */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " POLICY " , MatchAny , " ON " , MatchAny , " AS " ) )
COMPLETE_WITH ( " PERMISSIVE " , " RESTRICTIVE " ) ;
2017-05-17 22:31:56 +02:00
/*
* CREATE POLICY < name > ON < table > AS PERMISSIVE | RESTRICTIVE
* FOR | TO | USING | WITH CHECK
*/
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " POLICY " , MatchAny , " ON " , MatchAny , " AS " , MatchAny ) )
COMPLETE_WITH ( " FOR " , " TO " , " USING " , " WITH CHECK " ) ;
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
/* CREATE POLICY <name> ON <table> FOR ALL|SELECT|INSERT|UPDATE|DELETE */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " POLICY " , MatchAny , " ON " , MatchAny , " FOR " ) )
COMPLETE_WITH ( " ALL " , " SELECT " , " INSERT " , " UPDATE " , " DELETE " ) ;
Row-Level Security Policies (RLS)
Building on the updatable security-barrier views work, add the
ability to define policies on tables to limit the set of rows
which are returned from a query and which are allowed to be added
to a table. Expressions defined by the policy for filtering are
added to the security barrier quals of the query, while expressions
defined to check records being added to a table are added to the
with-check options of the query.
New top-level commands are CREATE/ALTER/DROP POLICY and are
controlled by the table owner. Row Security is able to be enabled
and disabled by the owner on a per-table basis using
ALTER TABLE .. ENABLE/DISABLE ROW SECURITY.
Per discussion, ROW SECURITY is disabled on tables by default and
must be enabled for policies on the table to be used. If no
policies exist on a table with ROW SECURITY enabled, a default-deny
policy is used and no records will be visible.
By default, row security is applied at all times except for the
table owner and the superuser. A new GUC, row_security, is added
which can be set to ON, OFF, or FORCE. When set to FORCE, row
security will be applied even for the table owner and superusers.
When set to OFF, row security will be disabled when allowed and an
error will be thrown if the user does not have rights to bypass row
security.
Per discussion, pg_dump sets row_security = OFF by default to ensure
that exports and backups will have all data in the table or will
error if there are insufficient privileges to bypass row security.
A new option has been added to pg_dump, --enable-row-security, to
ask pg_dump to export with row security enabled.
A new role capability, BYPASSRLS, which can only be set by the
superuser, is added to allow other users to be able to bypass row
security using row_security = OFF.
Many thanks to the various individuals who have helped with the
design, particularly Robert Haas for his feedback.
Authors include Craig Ringer, KaiGai Kohei, Adam Brightwell, Dean
Rasheed, with additional changes and rework by me.
Reviewers have included all of the above, Greg Smith,
Jeff McCormick, and Robert Haas.
2014-09-19 17:18:35 +02:00
/* Complete "CREATE POLICY <name> ON <table> FOR INSERT TO|WITH CHECK" */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " POLICY " , MatchAny , " ON " , MatchAny , " FOR " , " INSERT " ) )
COMPLETE_WITH ( " TO " , " WITH CHECK ( " ) ;
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
/* Complete "CREATE POLICY <name> ON <table> FOR SELECT|DELETE TO|USING" */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " POLICY " , MatchAny , " ON " , MatchAny , " FOR " , " SELECT|DELETE " ) )
COMPLETE_WITH ( " TO " , " USING ( " ) ;
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
/* CREATE POLICY <name> ON <table> FOR ALL|UPDATE TO|USING|WITH CHECK */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " POLICY " , MatchAny , " ON " , MatchAny , " FOR " , " ALL|UPDATE " ) )
COMPLETE_WITH ( " TO " , " USING ( " , " WITH CHECK ( " ) ;
Row-Level Security Policies (RLS)
Building on the updatable security-barrier views work, add the
ability to define policies on tables to limit the set of rows
which are returned from a query and which are allowed to be added
to a table. Expressions defined by the policy for filtering are
added to the security barrier quals of the query, while expressions
defined to check records being added to a table are added to the
with-check options of the query.
New top-level commands are CREATE/ALTER/DROP POLICY and are
controlled by the table owner. Row Security is able to be enabled
and disabled by the owner on a per-table basis using
ALTER TABLE .. ENABLE/DISABLE ROW SECURITY.
Per discussion, ROW SECURITY is disabled on tables by default and
must be enabled for policies on the table to be used. If no
policies exist on a table with ROW SECURITY enabled, a default-deny
policy is used and no records will be visible.
By default, row security is applied at all times except for the
table owner and the superuser. A new GUC, row_security, is added
which can be set to ON, OFF, or FORCE. When set to FORCE, row
security will be applied even for the table owner and superusers.
When set to OFF, row security will be disabled when allowed and an
error will be thrown if the user does not have rights to bypass row
security.
Per discussion, pg_dump sets row_security = OFF by default to ensure
that exports and backups will have all data in the table or will
error if there are insufficient privileges to bypass row security.
A new option has been added to pg_dump, --enable-row-security, to
ask pg_dump to export with row security enabled.
A new role capability, BYPASSRLS, which can only be set by the
superuser, is added to allow other users to be able to bypass row
security using row_security = OFF.
Many thanks to the various individuals who have helped with the
design, particularly Robert Haas for his feedback.
Authors include Craig Ringer, KaiGai Kohei, Adam Brightwell, Dean
Rasheed, with additional changes and rework by me.
Reviewers have included all of the above, Greg Smith,
Jeff McCormick, and Robert Haas.
2014-09-19 17:18:35 +02:00
/* Complete "CREATE POLICY <name> ON <table> TO <role>" */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " POLICY " , MatchAny , " ON " , MatchAny , " TO " ) )
Row-Level Security Policies (RLS)
Building on the updatable security-barrier views work, add the
ability to define policies on tables to limit the set of rows
which are returned from a query and which are allowed to be added
to a table. Expressions defined by the policy for filtering are
added to the security barrier quals of the query, while expressions
defined to check records being added to a table are added to the
with-check options of the query.
New top-level commands are CREATE/ALTER/DROP POLICY and are
controlled by the table owner. Row Security is able to be enabled
and disabled by the owner on a per-table basis using
ALTER TABLE .. ENABLE/DISABLE ROW SECURITY.
Per discussion, ROW SECURITY is disabled on tables by default and
must be enabled for policies on the table to be used. If no
policies exist on a table with ROW SECURITY enabled, a default-deny
policy is used and no records will be visible.
By default, row security is applied at all times except for the
table owner and the superuser. A new GUC, row_security, is added
which can be set to ON, OFF, or FORCE. When set to FORCE, row
security will be applied even for the table owner and superusers.
When set to OFF, row security will be disabled when allowed and an
error will be thrown if the user does not have rights to bypass row
security.
Per discussion, pg_dump sets row_security = OFF by default to ensure
that exports and backups will have all data in the table or will
error if there are insufficient privileges to bypass row security.
A new option has been added to pg_dump, --enable-row-security, to
ask pg_dump to export with row security enabled.
A new role capability, BYPASSRLS, which can only be set by the
superuser, is added to allow other users to be able to bypass row
security using row_security = OFF.
Many thanks to the various individuals who have helped with the
design, particularly Robert Haas for his feedback.
Authors include Craig Ringer, KaiGai Kohei, Adam Brightwell, Dean
Rasheed, with additional changes and rework by me.
Reviewers have included all of the above, Greg Smith,
Jeff McCormick, and Robert Haas.
2014-09-19 17:18:35 +02:00
COMPLETE_WITH_QUERY ( Query_for_list_of_grant_roles ) ;
/* Complete "CREATE POLICY <name> ON <table> USING (" */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " POLICY " , MatchAny , " ON " , MatchAny , " USING " ) )
COMPLETE_WITH ( " ( " ) ;
2017-05-17 22:31:56 +02:00
/*
* CREATE POLICY < name > ON < table > AS PERMISSIVE | RESTRICTIVE FOR
* ALL | SELECT | INSERT | UPDATE | DELETE
*/
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " POLICY " , MatchAny , " ON " , MatchAny , " AS " , MatchAny , " FOR " ) )
COMPLETE_WITH ( " ALL " , " SELECT " , " INSERT " , " UPDATE " , " DELETE " ) ;
2017-05-17 22:31:56 +02:00
/*
* Complete " CREATE POLICY <name> ON <table> AS PERMISSIVE|RESTRICTIVE FOR
* INSERT TO | WITH CHECK "
*/
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " POLICY " , MatchAny , " ON " , MatchAny , " AS " , MatchAny , " FOR " , " INSERT " ) )
COMPLETE_WITH ( " TO " , " WITH CHECK ( " ) ;
2017-05-17 22:31:56 +02:00
/*
* Complete " CREATE POLICY <name> ON <table> AS PERMISSIVE|RESTRICTIVE FOR
* SELECT | DELETE TO | USING "
*/
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " POLICY " , MatchAny , " ON " , MatchAny , " AS " , MatchAny , " FOR " , " SELECT|DELETE " ) )
COMPLETE_WITH ( " TO " , " USING ( " ) ;
2017-05-17 22:31:56 +02:00
/*
* CREATE POLICY < name > ON < table > AS PERMISSIVE | RESTRICTIVE FOR
* ALL | UPDATE TO | USING | WITH CHECK
*/
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " POLICY " , MatchAny , " ON " , MatchAny , " AS " , MatchAny , " FOR " , " ALL|UPDATE " ) )
COMPLETE_WITH ( " TO " , " USING ( " , " WITH CHECK ( " ) ;
2017-05-17 22:31:56 +02:00
/*
* Complete " CREATE POLICY <name> ON <table> AS PERMISSIVE|RESTRICTIVE TO
* < role > "
*/
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " POLICY " , MatchAny , " ON " , MatchAny , " AS " , MatchAny , " TO " ) )
2016-12-05 21:50:55 +01:00
COMPLETE_WITH_QUERY ( Query_for_list_of_grant_roles ) ;
2017-05-17 22:31:56 +02:00
/*
* Complete " CREATE POLICY <name> ON <table> AS PERMISSIVE|RESTRICTIVE
* USING ( "
*/
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " POLICY " , MatchAny , " ON " , MatchAny , " AS " , MatchAny , " USING " ) )
COMPLETE_WITH ( " ( " ) ;
2016-12-05 21:50:55 +01:00
Row-Level Security Policies (RLS)
Building on the updatable security-barrier views work, add the
ability to define policies on tables to limit the set of rows
which are returned from a query and which are allowed to be added
to a table. Expressions defined by the policy for filtering are
added to the security barrier quals of the query, while expressions
defined to check records being added to a table are added to the
with-check options of the query.
New top-level commands are CREATE/ALTER/DROP POLICY and are
controlled by the table owner. Row Security is able to be enabled
and disabled by the owner on a per-table basis using
ALTER TABLE .. ENABLE/DISABLE ROW SECURITY.
Per discussion, ROW SECURITY is disabled on tables by default and
must be enabled for policies on the table to be used. If no
policies exist on a table with ROW SECURITY enabled, a default-deny
policy is used and no records will be visible.
By default, row security is applied at all times except for the
table owner and the superuser. A new GUC, row_security, is added
which can be set to ON, OFF, or FORCE. When set to FORCE, row
security will be applied even for the table owner and superusers.
When set to OFF, row security will be disabled when allowed and an
error will be thrown if the user does not have rights to bypass row
security.
Per discussion, pg_dump sets row_security = OFF by default to ensure
that exports and backups will have all data in the table or will
error if there are insufficient privileges to bypass row security.
A new option has been added to pg_dump, --enable-row-security, to
ask pg_dump to export with row security enabled.
A new role capability, BYPASSRLS, which can only be set by the
superuser, is added to allow other users to be able to bypass row
security using row_security = OFF.
Many thanks to the various individuals who have helped with the
design, particularly Robert Haas for his feedback.
Authors include Craig Ringer, KaiGai Kohei, Adam Brightwell, Dean
Rasheed, with additional changes and rework by me.
Reviewers have included all of the above, Greg Smith,
Jeff McCormick, and Robert Haas.
2014-09-19 17:18:35 +02:00
2017-01-19 18:00:00 +01:00
/* CREATE PUBLICATION */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " PUBLICATION " , MatchAny ) )
COMPLETE_WITH ( " FOR TABLE " , " FOR ALL TABLES " , " WITH ( " ) ;
else if ( Matches ( " CREATE " , " PUBLICATION " , MatchAny , " FOR " ) )
COMPLETE_WITH ( " TABLE " , " ALL TABLES " ) ;
2018-09-21 21:58:37 +02:00
/* Complete "CREATE PUBLICATION <name> FOR TABLE <table>, ..." */
2018-09-22 02:50:18 +02:00
else if ( HeadMatches ( " CREATE " , " PUBLICATION " , MatchAny , " FOR " , " TABLE " ) )
2017-01-19 18:00:00 +01:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_tables , NULL ) ;
/* Complete "CREATE PUBLICATION <name> [...] WITH" */
2018-09-22 02:50:18 +02:00
else if ( HeadMatches ( " CREATE " , " PUBLICATION " ) & & TailMatches ( " WITH " , " ( " ) )
COMPLETE_WITH ( " publish " ) ;
2017-01-19 18:00:00 +01:00
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
/* CREATE RULE */
In psql's tab completion, change most TailMatches patterns to Matches.
In the refactoring in commit d37b816dc9e8f976c8913296781e08cbd45c5af1,
we mostly kept to the original design whereby only the last few words
on the line were matched to identify a completable pattern. However,
after commit d854118c8df8c413d069f7e88bb01b9e18e4c8ed, there's really
no reason to do it like that: where it's sensible, we can use patterns
that expect to match the entire input line. And mostly, it's sensible.
Matching the entire line greatly reduces the odds of a false match that
leads to offering irrelevant completions. Moreover (though I've not
tried to measure this), it should make tab completion faster since
many of the patterns will be discarded after a single integer comparison
that finds that the wrong number of words appear on the line.
There are certain identifiable places where we still need to use
TailMatches because the statement in question is allowed to appear
embedded in a larger statement. These are just a small minority of
the existing patterns, though, so the benefit of switching where
possible is large.
It's possible that this patch has removed some within-line matching
behaviors that are in fact desirable, but we can put those back when
we get complaints. Most of the removed behaviors are certainly silly.
Michael Paquier, with some further adjustments by me
2016-01-05 02:08:08 +01:00
/* Complete "CREATE RULE <sth>" with "AS ON" */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " RULE " , MatchAny ) )
COMPLETE_WITH ( " AS ON " ) ;
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
/* Complete "CREATE RULE <sth> AS" with "ON" */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " RULE " , MatchAny , " AS " ) )
COMPLETE_WITH ( " ON " ) ;
In psql's tab completion, change most TailMatches patterns to Matches.
In the refactoring in commit d37b816dc9e8f976c8913296781e08cbd45c5af1,
we mostly kept to the original design whereby only the last few words
on the line were matched to identify a completable pattern. However,
after commit d854118c8df8c413d069f7e88bb01b9e18e4c8ed, there's really
no reason to do it like that: where it's sensible, we can use patterns
that expect to match the entire input line. And mostly, it's sensible.
Matching the entire line greatly reduces the odds of a false match that
leads to offering irrelevant completions. Moreover (though I've not
tried to measure this), it should make tab completion faster since
many of the patterns will be discarded after a single integer comparison
that finds that the wrong number of words appear on the line.
There are certain identifiable places where we still need to use
TailMatches because the statement in question is allowed to appear
embedded in a larger statement. These are just a small minority of
the existing patterns, though, so the benefit of switching where
possible is large.
It's possible that this patch has removed some within-line matching
behaviors that are in fact desirable, but we can put those back when
we get complaints. Most of the removed behaviors are certainly silly.
Michael Paquier, with some further adjustments by me
2016-01-05 02:08:08 +01:00
/* Complete "CREATE RULE <sth> AS ON" with SELECT|UPDATE|INSERT|DELETE */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " RULE " , MatchAny , " AS " , " ON " ) )
COMPLETE_WITH ( " SELECT " , " UPDATE " , " INSERT " , " DELETE " ) ;
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
/* Complete "AS ON SELECT|UPDATE|INSERT|DELETE" with a "TO" */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " AS " , " ON " , " SELECT|UPDATE|INSERT|DELETE " ) )
COMPLETE_WITH ( " TO " ) ;
2000-04-12 19:17:23 +02:00
/* Complete "AS ON <sth> TO" with a table name */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " AS " , " ON " , " SELECT|UPDATE|INSERT|DELETE " , " TO " ) )
2003-10-30 22:37:38 +01:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_tables , NULL ) ;
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
In psql's tab completion, change most TailMatches patterns to Matches.
In the refactoring in commit d37b816dc9e8f976c8913296781e08cbd45c5af1,
we mostly kept to the original design whereby only the last few words
on the line were matched to identify a completable pattern. However,
after commit d854118c8df8c413d069f7e88bb01b9e18e4c8ed, there's really
no reason to do it like that: where it's sensible, we can use patterns
that expect to match the entire input line. And mostly, it's sensible.
Matching the entire line greatly reduces the odds of a false match that
leads to offering irrelevant completions. Moreover (though I've not
tried to measure this), it should make tab completion faster since
many of the patterns will be discarded after a single integer comparison
that finds that the wrong number of words appear on the line.
There are certain identifiable places where we still need to use
TailMatches because the statement in question is allowed to appear
embedded in a larger statement. These are just a small minority of
the existing patterns, though, so the benefit of switching where
possible is large.
It's possible that this patch has removed some within-line matching
behaviors that are in fact desirable, but we can put those back when
we get complaints. Most of the removed behaviors are certainly silly.
Michael Paquier, with some further adjustments by me
2016-01-05 02:08:08 +01:00
/* CREATE SEQUENCE --- is allowed inside CREATE SCHEMA, so use TailMatches */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " CREATE " , " SEQUENCE " , MatchAny ) | |
TailMatches ( " CREATE " , " TEMP|TEMPORARY " , " SEQUENCE " , MatchAny ) )
COMPLETE_WITH ( " INCREMENT BY " , " MINVALUE " , " MAXVALUE " , " NO " , " CACHE " ,
" CYCLE " , " OWNED BY " , " START WITH " ) ;
else if ( TailMatches ( " CREATE " , " SEQUENCE " , MatchAny , " NO " ) | |
TailMatches ( " CREATE " , " TEMP|TEMPORARY " , " SEQUENCE " , MatchAny , " NO " ) )
COMPLETE_WITH ( " MINVALUE " , " MAXVALUE " , " CYCLE " ) ;
2015-08-04 18:29:20 +02:00
2008-12-19 17:25:19 +01:00
/* CREATE SERVER <name> */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " SERVER " , MatchAny ) )
COMPLETE_WITH ( " TYPE " , " VERSION " , " FOREIGN DATA WRAPPER " ) ;
2008-12-19 17:25:19 +01:00
Change CREATE STATISTICS syntax
Previously, we had the WITH clause in the middle of the command, where
you'd specify both generic options as well as statistic types. Few
people liked this, so this commit changes it to remove the WITH keyword
from that clause and makes it accept statistic types only. (We
currently don't have any generic options, but if we invent in the
future, we will gain a new WITH clause, probably at the end of the
command).
Also, the column list is now specified without parens, which makes the
whole command look more similar to a SELECT command. This change will
let us expand the command to supporting expressions (not just columns
names) as well as multiple tables and their join conditions.
Tom added lots of code comments and fixed some parts of the CREATE
STATISTICS reference page, too; more changes in this area are
forthcoming. He also fixed a potential problem in the alter_generic
regression test, reducing verbosity on a cascaded drop to avoid
dependency on message ordering, as we do in other tests.
Tom also closed a security bug: we documented that table ownership was
required in order to create a statistics object on it, but didn't
actually implement it.
Implement tab-completion for statistics objects. This can stand some
more improvement.
Authors: Alvaro Herrera, with lots of cleanup by Tom Lane
Discussion: https://postgr.es/m/20170420212426.ltvgyhnefvhixm6i@alvherre.pgsql
2017-05-12 19:59:23 +02:00
/* CREATE STATISTICS <name> */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " STATISTICS " , MatchAny ) )
COMPLETE_WITH ( " ( " , " ON " ) ;
else if ( Matches ( " CREATE " , " STATISTICS " , MatchAny , " ( " ) )
Add support for multivariate MCV lists
Introduce a third extended statistic type, supported by the CREATE
STATISTICS command - MCV lists, a generalization of the statistic
already built and used for individual columns.
Compared to the already supported types (n-distinct coefficients and
functional dependencies), MCV lists are more complex, include column
values and allow estimation of much wider range of common clauses
(equality and inequality conditions, IS NULL, IS NOT NULL etc.).
Similarly to the other types, a new pseudo-type (pg_mcv_list) is used.
Author: Tomas Vondra
Reviewed-by: Dean Rasheed, David Rowley, Mark Dilger, Alvaro Herrera
Discussion: https://postgr.es/m/dfdac334-9cf2-2597-fb27-f0fb3753f435@2ndquadrant.com
2019-03-27 18:32:18 +01:00
COMPLETE_WITH ( " ndistinct " , " dependencies " , " mcv " ) ;
2018-11-28 00:48:51 +01:00
else if ( Matches ( " CREATE " , " STATISTICS " , MatchAny , " (*) " ) )
2018-09-22 02:50:18 +02:00
COMPLETE_WITH ( " ON " ) ;
else if ( HeadMatches ( " CREATE " , " STATISTICS " , MatchAny ) & &
TailMatches ( " FROM " ) )
Change CREATE STATISTICS syntax
Previously, we had the WITH clause in the middle of the command, where
you'd specify both generic options as well as statistic types. Few
people liked this, so this commit changes it to remove the WITH keyword
from that clause and makes it accept statistic types only. (We
currently don't have any generic options, but if we invent in the
future, we will gain a new WITH clause, probably at the end of the
command).
Also, the column list is now specified without parens, which makes the
whole command look more similar to a SELECT command. This change will
let us expand the command to supporting expressions (not just columns
names) as well as multiple tables and their join conditions.
Tom added lots of code comments and fixed some parts of the CREATE
STATISTICS reference page, too; more changes in this area are
forthcoming. He also fixed a potential problem in the alter_generic
regression test, reducing verbosity on a cascaded drop to avoid
dependency on message ordering, as we do in other tests.
Tom also closed a security bug: we documented that table ownership was
required in order to create a statistics object on it, but didn't
actually implement it.
Implement tab-completion for statistics objects. This can stand some
more improvement.
Authors: Alvaro Herrera, with lots of cleanup by Tom Lane
Discussion: https://postgr.es/m/20170420212426.ltvgyhnefvhixm6i@alvherre.pgsql
2017-05-12 19:59:23 +02:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_tables , NULL ) ;
In psql's tab completion, change most TailMatches patterns to Matches.
In the refactoring in commit d37b816dc9e8f976c8913296781e08cbd45c5af1,
we mostly kept to the original design whereby only the last few words
on the line were matched to identify a completable pattern. However,
after commit d854118c8df8c413d069f7e88bb01b9e18e4c8ed, there's really
no reason to do it like that: where it's sensible, we can use patterns
that expect to match the entire input line. And mostly, it's sensible.
Matching the entire line greatly reduces the odds of a false match that
leads to offering irrelevant completions. Moreover (though I've not
tried to measure this), it should make tab completion faster since
many of the patterns will be discarded after a single integer comparison
that finds that the wrong number of words appear on the line.
There are certain identifiable places where we still need to use
TailMatches because the statement in question is allowed to appear
embedded in a larger statement. These are just a small minority of
the existing patterns, though, so the benefit of switching where
possible is large.
It's possible that this patch has removed some within-line matching
behaviors that are in fact desirable, but we can put those back when
we get complaints. Most of the removed behaviors are certainly silly.
Michael Paquier, with some further adjustments by me
2016-01-05 02:08:08 +01:00
/* CREATE TABLE --- is allowed inside CREATE SCHEMA, so use TailMatches */
2007-04-27 00:25:56 +02:00
/* Complete "CREATE TEMP/TEMPORARY" with the possible temp objects */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " CREATE " , " TEMP|TEMPORARY " ) )
COMPLETE_WITH ( " SEQUENCE " , " TABLE " , " VIEW " ) ;
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
/* Complete "CREATE UNLOGGED" with TABLE or MATVIEW */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " CREATE " , " UNLOGGED " ) )
COMPLETE_WITH ( " TABLE " , " MATERIALIZED VIEW " ) ;
2017-02-26 18:20:00 +01:00
/* Complete PARTITION BY with RANGE ( or LIST ( or ... */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " PARTITION " , " BY " ) )
COMPLETE_WITH ( " RANGE ( " , " LIST ( " , " HASH ( " ) ;
2017-02-26 18:20:00 +01:00
/* If we have xxx PARTITION OF, provide a list of partitioned tables */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " PARTITION " , " OF " ) )
2017-02-26 18:20:00 +01:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_partitioned_tables , " " ) ;
/* Limited completion support for partition bound specification */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " PARTITION " , " OF " , MatchAny ) )
COMPLETE_WITH ( " FOR VALUES " , " DEFAULT " ) ;
2018-12-20 06:24:42 +01:00
/* Complete CREATE TABLE <name> with '(', OF or PARTITION OF */
else if ( TailMatches ( " CREATE " , " TABLE " , MatchAny ) | |
TailMatches ( " CREATE " , " TEMP|TEMPORARY|UNLOGGED " , " TABLE " , MatchAny ) )
COMPLETE_WITH ( " ( " , " OF " , " PARTITION OF " ) ;
/* Complete CREATE TABLE <name> OF with list of composite types */
else if ( TailMatches ( " CREATE " , " TABLE " , MatchAny , " OF " ) | |
TailMatches ( " CREATE " , " TEMP|TEMPORARY|UNLOGGED " , " TABLE " , MatchAny , " OF " ) )
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_composite_datatypes , NULL ) ;
/* Complete CREATE TABLE name (...) with supported options */
else if ( TailMatches ( " CREATE " , " TABLE " , MatchAny , " (*) " ) | |
TailMatches ( " CREATE " , " UNLOGGED " , " TABLE " , MatchAny , " (*) " ) )
COMPLETE_WITH ( " INHERITS ( " , " PARTITION BY " , " TABLESPACE " , " WITH ( " ) ;
else if ( TailMatches ( " CREATE " , " TEMP|TEMPORARY " , " TABLE " , MatchAny , " (*) " ) )
COMPLETE_WITH ( " INHERITS ( " , " ON COMMIT " , " PARTITION BY " ,
" TABLESPACE " , " WITH ( " ) ;
2018-12-23 01:33:49 +01:00
/* Complete CREATE TABLE (...) WITH with storage parameters */
else if ( TailMatches ( " CREATE " , " TABLE " , MatchAny , " (*) " , " WITH " , " ( " ) | |
TailMatches ( " CREATE " , " TEMP|TEMPORARY|UNLOGGED " , " TABLE " , MatchAny , " (*) " , " WITH " , " ( " ) )
COMPLETE_WITH_LIST ( table_storage_parameters ) ;
2018-12-20 06:24:42 +01:00
/* Complete CREATE TABLE ON COMMIT with actions */
else if ( TailMatches ( " CREATE " , " TEMP|TEMPORARY " , " TABLE " , MatchAny , " (*) " , " ON " , " COMMIT " ) )
COMPLETE_WITH ( " DELETE ROWS " , " DROP " , " PRESERVE ROWS " ) ;
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
2004-11-02 17:10:05 +01:00
/* CREATE TABLESPACE */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " TABLESPACE " , MatchAny ) )
COMPLETE_WITH ( " OWNER " , " LOCATION " ) ;
2004-11-02 17:10:05 +01:00
/* Complete CREATE TABLESPACE name OWNER name with "LOCATION" */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " TABLESPACE " , MatchAny , " OWNER " , MatchAny ) )
COMPLETE_WITH ( " LOCATION " ) ;
2004-11-02 17:10:05 +01:00
2007-09-14 06:25:24 +02:00
/* CREATE TEXT SEARCH */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " TEXT " , " SEARCH " ) )
COMPLETE_WITH ( " CONFIGURATION " , " DICTIONARY " , " PARSER " , " TEMPLATE " ) ;
else if ( Matches ( " CREATE " , " TEXT " , " SEARCH " , " CONFIGURATION " , MatchAny ) )
COMPLETE_WITH ( " ( " ) ;
2007-09-14 06:25:24 +02:00
2017-01-19 18:00:00 +01:00
/* CREATE SUBSCRIPTION */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " SUBSCRIPTION " , MatchAny ) )
COMPLETE_WITH ( " CONNECTION " ) ;
else if ( Matches ( " CREATE " , " SUBSCRIPTION " , MatchAny , " CONNECTION " , MatchAny ) )
COMPLETE_WITH ( " PUBLICATION " ) ;
else if ( Matches ( " CREATE " , " SUBSCRIPTION " , MatchAny , " CONNECTION " ,
MatchAny , " PUBLICATION " ) )
2017-03-03 20:13:48 +01:00
{
/* complete with nothing here as this refers to remote publications */
}
2018-09-22 02:50:18 +02:00
else if ( HeadMatches ( " CREATE " , " SUBSCRIPTION " ) & & TailMatches ( " PUBLICATION " , MatchAny ) )
COMPLETE_WITH ( " WITH ( " ) ;
2017-01-19 18:00:00 +01:00
/* Complete "CREATE SUBSCRIPTION <name> ... WITH ( <opt>" */
2018-09-22 02:50:18 +02:00
else if ( HeadMatches ( " CREATE " , " SUBSCRIPTION " ) & & TailMatches ( " WITH " , " ( " ) )
COMPLETE_WITH ( " copy_data " , " connect " , " create_slot " , " enabled " ,
" slot_name " , " synchronous_commit " ) ;
2017-01-19 18:00:00 +01:00
In psql's tab completion, change most TailMatches patterns to Matches.
In the refactoring in commit d37b816dc9e8f976c8913296781e08cbd45c5af1,
we mostly kept to the original design whereby only the last few words
on the line were matched to identify a completable pattern. However,
after commit d854118c8df8c413d069f7e88bb01b9e18e4c8ed, there's really
no reason to do it like that: where it's sensible, we can use patterns
that expect to match the entire input line. And mostly, it's sensible.
Matching the entire line greatly reduces the odds of a false match that
leads to offering irrelevant completions. Moreover (though I've not
tried to measure this), it should make tab completion faster since
many of the patterns will be discarded after a single integer comparison
that finds that the wrong number of words appear on the line.
There are certain identifiable places where we still need to use
TailMatches because the statement in question is allowed to appear
embedded in a larger statement. These are just a small minority of
the existing patterns, though, so the benefit of switching where
possible is large.
It's possible that this patch has removed some within-line matching
behaviors that are in fact desirable, but we can put those back when
we get complaints. Most of the removed behaviors are certainly silly.
Michael Paquier, with some further adjustments by me
2016-01-05 02:08:08 +01:00
/* CREATE TRIGGER --- is allowed inside CREATE SCHEMA, so use TailMatches */
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
/* complete CREATE TRIGGER <name> with BEFORE,AFTER,INSTEAD OF */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " CREATE " , " TRIGGER " , MatchAny ) )
COMPLETE_WITH ( " BEFORE " , " AFTER " , " INSTEAD OF " ) ;
2010-02-17 05:09:40 +01:00
/* complete CREATE TRIGGER <name> BEFORE,AFTER with an event */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " CREATE " , " TRIGGER " , MatchAny , " BEFORE|AFTER " ) )
COMPLETE_WITH ( " INSERT " , " DELETE " , " UPDATE " , " TRUNCATE " ) ;
2011-02-24 13:05:40 +01:00
/* complete CREATE TRIGGER <name> INSTEAD OF with an event */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " CREATE " , " TRIGGER " , MatchAny , " INSTEAD " , " OF " ) )
COMPLETE_WITH ( " INSERT " , " DELETE " , " UPDATE " ) ;
2011-02-24 13:05:40 +01:00
/* complete CREATE TRIGGER <name> BEFORE,AFTER sth with OR,ON */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " CREATE " , " TRIGGER " , MatchAny , " BEFORE|AFTER " , MatchAny ) | |
TailMatches ( " CREATE " , " TRIGGER " , MatchAny , " INSTEAD " , " OF " , MatchAny ) )
COMPLETE_WITH ( " ON " , " OR " ) ;
2010-02-26 03:01:40 +01:00
/*
* complete CREATE TRIGGER < name > BEFORE , AFTER event ON with a list of
2018-10-26 02:30:43 +02:00
* tables . EXECUTE FUNCTION is the recommended grammar instead of EXECUTE
* PROCEDURE in version 11 and upwards .
2010-02-26 03:01:40 +01:00
*/
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " CREATE " , " TRIGGER " , MatchAny , " BEFORE|AFTER " , MatchAny , " ON " ) )
2010-02-17 05:09:40 +01:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_tables , NULL ) ;
2011-02-24 13:05:40 +01:00
/* complete CREATE TRIGGER ... INSTEAD OF event ON with a list of views */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " CREATE " , " TRIGGER " , MatchAny , " INSTEAD " , " OF " , MatchAny , " ON " ) )
2011-02-24 13:05:40 +01:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_views , NULL ) ;
2018-09-22 02:50:18 +02:00
else if ( HeadMatches ( " CREATE " , " TRIGGER " ) & & TailMatches ( " ON " , MatchAny ) )
2018-10-26 02:30:43 +02:00
{
if ( pset . sversion > = 110000 )
COMPLETE_WITH ( " NOT DEFERRABLE " , " DEFERRABLE " , " INITIALLY " ,
" REFERENCING " , " FOR " , " WHEN ( " , " EXECUTE FUNCTION " ) ;
else
COMPLETE_WITH ( " NOT DEFERRABLE " , " DEFERRABLE " , " INITIALLY " ,
" REFERENCING " , " FOR " , " WHEN ( " , " EXECUTE PROCEDURE " ) ;
}
2018-09-22 02:50:18 +02:00
else if ( HeadMatches ( " CREATE " , " TRIGGER " ) & &
( TailMatches ( " DEFERRABLE " ) | | TailMatches ( " INITIALLY " , " IMMEDIATE|DEFERRED " ) ) )
2018-10-26 02:30:43 +02:00
{
if ( pset . sversion > = 110000 )
COMPLETE_WITH ( " REFERENCING " , " FOR " , " WHEN ( " , " EXECUTE FUNCTION " ) ;
else
COMPLETE_WITH ( " REFERENCING " , " FOR " , " WHEN ( " , " EXECUTE PROCEDURE " ) ;
}
2018-09-22 02:50:18 +02:00
else if ( HeadMatches ( " CREATE " , " TRIGGER " ) & & TailMatches ( " REFERENCING " ) )
COMPLETE_WITH ( " OLD TABLE " , " NEW TABLE " ) ;
else if ( HeadMatches ( " CREATE " , " TRIGGER " ) & & TailMatches ( " OLD|NEW " , " TABLE " ) )
COMPLETE_WITH ( " AS " ) ;
else if ( HeadMatches ( " CREATE " , " TRIGGER " ) & &
( TailMatches ( " REFERENCING " , " OLD " , " TABLE " , " AS " , MatchAny ) | |
TailMatches ( " REFERENCING " , " OLD " , " TABLE " , MatchAny ) ) )
2018-10-26 02:30:43 +02:00
{
if ( pset . sversion > = 110000 )
COMPLETE_WITH ( " NEW TABLE " , " FOR " , " WHEN ( " , " EXECUTE FUNCTION " ) ;
else
COMPLETE_WITH ( " NEW TABLE " , " FOR " , " WHEN ( " , " EXECUTE PROCEDURE " ) ;
}
2018-09-22 02:50:18 +02:00
else if ( HeadMatches ( " CREATE " , " TRIGGER " ) & &
( TailMatches ( " REFERENCING " , " NEW " , " TABLE " , " AS " , MatchAny ) | |
TailMatches ( " REFERENCING " , " NEW " , " TABLE " , MatchAny ) ) )
2018-10-26 02:30:43 +02:00
{
if ( pset . sversion > = 110000 )
COMPLETE_WITH ( " OLD TABLE " , " FOR " , " WHEN ( " , " EXECUTE FUNCTION " ) ;
else
COMPLETE_WITH ( " OLD TABLE " , " FOR " , " WHEN ( " , " EXECUTE PROCEDURE " ) ;
}
2018-09-22 02:50:18 +02:00
else if ( HeadMatches ( " CREATE " , " TRIGGER " ) & &
( TailMatches ( " REFERENCING " , " OLD|NEW " , " TABLE " , " AS " , MatchAny , " OLD|NEW " , " TABLE " , " AS " , MatchAny ) | |
TailMatches ( " REFERENCING " , " OLD|NEW " , " TABLE " , MatchAny , " OLD|NEW " , " TABLE " , " AS " , MatchAny ) | |
TailMatches ( " REFERENCING " , " OLD|NEW " , " TABLE " , " AS " , MatchAny , " OLD|NEW " , " TABLE " , MatchAny ) | |
TailMatches ( " REFERENCING " , " OLD|NEW " , " TABLE " , MatchAny , " OLD|NEW " , " TABLE " , MatchAny ) ) )
2018-10-26 02:30:43 +02:00
{
if ( pset . sversion > = 110000 )
COMPLETE_WITH ( " FOR " , " WHEN ( " , " EXECUTE FUNCTION " ) ;
else
COMPLETE_WITH ( " FOR " , " WHEN ( " , " EXECUTE PROCEDURE " ) ;
}
2018-09-22 02:50:18 +02:00
else if ( HeadMatches ( " CREATE " , " TRIGGER " ) & & TailMatches ( " FOR " ) )
COMPLETE_WITH ( " EACH " , " ROW " , " STATEMENT " ) ;
else if ( HeadMatches ( " CREATE " , " TRIGGER " ) & & TailMatches ( " FOR " , " EACH " ) )
COMPLETE_WITH ( " ROW " , " STATEMENT " ) ;
else if ( HeadMatches ( " CREATE " , " TRIGGER " ) & &
( TailMatches ( " FOR " , " EACH " , " ROW|STATEMENT " ) | |
TailMatches ( " FOR " , " ROW|STATEMENT " ) ) )
2018-10-26 02:30:43 +02:00
{
if ( pset . sversion > = 110000 )
COMPLETE_WITH ( " WHEN ( " , " EXECUTE FUNCTION " ) ;
else
COMPLETE_WITH ( " WHEN ( " , " EXECUTE PROCEDURE " ) ;
}
else if ( HeadMatches ( " CREATE " , " TRIGGER " ) & & TailMatches ( " WHEN " , " (*) " ) )
{
if ( pset . sversion > = 110000 )
COMPLETE_WITH ( " EXECUTE FUNCTION " ) ;
else
COMPLETE_WITH ( " EXECUTE PROCEDURE " ) ;
}
/* complete CREATE TRIGGER ... EXECUTE with PROCEDURE|FUNCTION */
2018-09-22 02:50:18 +02:00
else if ( HeadMatches ( " CREATE " , " TRIGGER " ) & & TailMatches ( " EXECUTE " ) )
2018-10-26 02:30:43 +02:00
{
if ( pset . sversion > = 110000 )
COMPLETE_WITH ( " FUNCTION " ) ;
else
COMPLETE_WITH ( " PROCEDURE " ) ;
}
else if ( HeadMatches ( " CREATE " , " TRIGGER " ) & &
TailMatches ( " EXECUTE " , " FUNCTION|PROCEDURE " ) )
2018-03-05 21:37:23 +01:00
COMPLETE_WITH_VERSIONED_SCHEMA_QUERY ( Query_for_list_of_functions , NULL ) ;
2005-08-14 20:49:30 +02:00
2012-04-18 15:55:01 +02:00
/* CREATE ROLE,USER,GROUP <name> */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " ROLE|GROUP|USER " , MatchAny ) & &
! TailMatches ( " USER " , " MAPPING " ) )
COMPLETE_WITH ( " ADMIN " , " BYPASSRLS " , " CONNECTION LIMIT " , " CREATEDB " ,
" CREATEROLE " , " ENCRYPTED PASSWORD " , " IN " , " INHERIT " ,
" LOGIN " , " NOBYPASSRLS " ,
" NOCREATEDB " , " NOCREATEROLE " , " NOINHERIT " ,
" NOLOGIN " , " NOREPLICATION " , " NOSUPERUSER " , " PASSWORD " ,
" REPLICATION " , " ROLE " , " SUPERUSER " , " SYSID " ,
" VALID UNTIL " , " WITH " ) ;
2005-10-15 04:49:52 +02:00
2012-04-18 15:55:01 +02:00
/* CREATE ROLE,USER,GROUP <name> WITH */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " ROLE|GROUP|USER " , MatchAny , " WITH " ) )
2012-04-18 15:55:01 +02:00
/* Similar to the above, but don't complete "WITH" again. */
2018-09-22 02:50:18 +02:00
COMPLETE_WITH ( " ADMIN " , " BYPASSRLS " , " CONNECTION LIMIT " , " CREATEDB " ,
" CREATEROLE " , " ENCRYPTED PASSWORD " , " IN " , " INHERIT " ,
" LOGIN " , " NOBYPASSRLS " ,
" NOCREATEDB " , " NOCREATEROLE " , " NOINHERIT " ,
" NOLOGIN " , " NOREPLICATION " , " NOSUPERUSER " , " PASSWORD " ,
" REPLICATION " , " ROLE " , " SUPERUSER " , " SYSID " ,
" VALID UNTIL " ) ;
2012-04-18 15:55:01 +02:00
2005-08-14 20:49:30 +02:00
/* complete CREATE ROLE,USER,GROUP <name> IN with ROLE,GROUP */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " ROLE|USER|GROUP " , MatchAny , " IN " ) )
COMPLETE_WITH ( " GROUP " , " ROLE " ) ;
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
In psql's tab completion, change most TailMatches patterns to Matches.
In the refactoring in commit d37b816dc9e8f976c8913296781e08cbd45c5af1,
we mostly kept to the original design whereby only the last few words
on the line were matched to identify a completable pattern. However,
after commit d854118c8df8c413d069f7e88bb01b9e18e4c8ed, there's really
no reason to do it like that: where it's sensible, we can use patterns
that expect to match the entire input line. And mostly, it's sensible.
Matching the entire line greatly reduces the odds of a false match that
leads to offering irrelevant completions. Moreover (though I've not
tried to measure this), it should make tab completion faster since
many of the patterns will be discarded after a single integer comparison
that finds that the wrong number of words appear on the line.
There are certain identifiable places where we still need to use
TailMatches because the statement in question is allowed to appear
embedded in a larger statement. These are just a small minority of
the existing patterns, though, so the benefit of switching where
possible is large.
It's possible that this patch has removed some within-line matching
behaviors that are in fact desirable, but we can put those back when
we get complaints. Most of the removed behaviors are certainly silly.
Michael Paquier, with some further adjustments by me
2016-01-05 02:08:08 +01:00
/* CREATE VIEW --- is allowed inside CREATE SCHEMA, so use TailMatches */
2005-08-14 20:49:30 +02:00
/* Complete CREATE VIEW <name> with AS */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " CREATE " , " VIEW " , MatchAny ) )
COMPLETE_WITH ( " AS " ) ;
2000-04-12 19:17:23 +02:00
/* Complete "CREATE VIEW <sth> AS with "SELECT" */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " CREATE " , " VIEW " , MatchAny , " AS " ) )
COMPLETE_WITH ( " SELECT " ) ;
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
2013-03-04 01:23:31 +01:00
/* CREATE MATERIALIZED VIEW */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " MATERIALIZED " ) )
COMPLETE_WITH ( " VIEW " ) ;
2013-03-04 01:23:31 +01:00
/* Complete CREATE MATERIALIZED VIEW <name> with AS */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " MATERIALIZED " , " VIEW " , MatchAny ) )
COMPLETE_WITH ( " AS " ) ;
2013-03-04 01:23:31 +01:00
/* Complete "CREATE MATERIALIZED VIEW <sth> AS with "SELECT" */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " MATERIALIZED " , " VIEW " , MatchAny , " AS " ) )
COMPLETE_WITH ( " SELECT " ) ;
2013-03-04 01:23:31 +01:00
2014-04-14 14:44:21 +02:00
/* CREATE EVENT TRIGGER */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " EVENT " ) )
COMPLETE_WITH ( " TRIGGER " ) ;
2014-04-14 14:44:21 +02:00
/* Complete CREATE EVENT TRIGGER <name> with ON */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " EVENT " , " TRIGGER " , MatchAny ) )
COMPLETE_WITH ( " ON " ) ;
2014-04-14 14:44:21 +02:00
/* Complete CREATE EVENT TRIGGER <name> ON with event_type */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE " , " EVENT " , " TRIGGER " , MatchAny , " ON " ) )
COMPLETE_WITH ( " ddl_command_start " , " ddl_command_end " , " sql_drop " ) ;
2018-11-26 21:18:55 +01:00
2018-10-26 06:46:20 +02:00
/*
* Complete CREATE EVENT TRIGGER < name > ON < event_type > . EXECUTE FUNCTION
* is the recommended grammar instead of EXECUTE PROCEDURE in version 11
* and upwards .
*/
else if ( Matches ( " CREATE " , " EVENT " , " TRIGGER " , MatchAny , " ON " , MatchAny ) )
{
if ( pset . sversion > = 110000 )
COMPLETE_WITH ( " WHEN TAG IN ( " , " EXECUTE FUNCTION " ) ;
else
COMPLETE_WITH ( " WHEN TAG IN ( " , " EXECUTE PROCEDURE " ) ;
}
else if ( HeadMatches ( " CREATE " , " EVENT " , " TRIGGER " ) & &
TailMatches ( " WHEN|AND " , MatchAny , " IN " , " (*) " ) )
{
if ( pset . sversion > = 110000 )
COMPLETE_WITH ( " EXECUTE FUNCTION " ) ;
else
COMPLETE_WITH ( " EXECUTE PROCEDURE " ) ;
}
else if ( HeadMatches ( " CREATE " , " EVENT " , " TRIGGER " ) & &
TailMatches ( " EXECUTE " , " FUNCTION|PROCEDURE " ) )
COMPLETE_WITH_VERSIONED_SCHEMA_QUERY ( Query_for_list_of_functions , NULL ) ;
2014-04-14 14:44:21 +02:00
2017-03-01 14:51:57 +01:00
/* DEALLOCATE */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " DEALLOCATE " ) )
2017-03-01 14:51:57 +01:00
COMPLETE_WITH_QUERY ( Query_for_list_of_prepared_statements ) ;
2005-05-18 06:47:40 +02:00
/* DECLARE */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " DECLARE " , MatchAny ) )
COMPLETE_WITH ( " BINARY " , " INSENSITIVE " , " SCROLL " , " NO SCROLL " ,
" CURSOR " ) ;
else if ( HeadMatches ( " DECLARE " ) & & TailMatches ( " CURSOR " ) )
COMPLETE_WITH ( " WITH HOLD " , " WITHOUT HOLD " , " FOR " ) ;
2005-05-18 06:47:40 +02:00
In psql's tab completion, change most TailMatches patterns to Matches.
In the refactoring in commit d37b816dc9e8f976c8913296781e08cbd45c5af1,
we mostly kept to the original design whereby only the last few words
on the line were matched to identify a completable pattern. However,
after commit d854118c8df8c413d069f7e88bb01b9e18e4c8ed, there's really
no reason to do it like that: where it's sensible, we can use patterns
that expect to match the entire input line. And mostly, it's sensible.
Matching the entire line greatly reduces the odds of a false match that
leads to offering irrelevant completions. Moreover (though I've not
tried to measure this), it should make tab completion faster since
many of the patterns will be discarded after a single integer comparison
that finds that the wrong number of words appear on the line.
There are certain identifiable places where we still need to use
TailMatches because the statement in question is allowed to appear
embedded in a larger statement. These are just a small minority of
the existing patterns, though, so the benefit of switching where
possible is large.
It's possible that this patch has removed some within-line matching
behaviors that are in fact desirable, but we can put those back when
we get complaints. Most of the removed behaviors are certainly silly.
Michael Paquier, with some further adjustments by me
2016-01-05 02:08:08 +01:00
/* DELETE --- can be inside EXPLAIN, RULE, etc */
/* ... despite which, only complete DELETE with FROM at start of line */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " DELETE " ) )
COMPLETE_WITH ( " FROM " ) ;
2000-04-12 19:17:23 +02:00
/* Complete DELETE FROM with a list of tables */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " DELETE " , " FROM " ) )
2013-10-23 19:16:25 +02:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_updatables , NULL ) ;
2005-04-07 03:51:41 +02:00
/* Complete DELETE FROM <table> */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " DELETE " , " FROM " , MatchAny ) )
COMPLETE_WITH ( " USING " , " WHERE " ) ;
2005-04-07 03:51:41 +02:00
/* XXX: implement tab completion for DELETE ... USING */
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
2007-04-26 18:13:15 +02:00
/* DISCARD */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " DISCARD " ) )
COMPLETE_WITH ( " ALL " , " PLANS " , " SEQUENCES " , " TEMP " ) ;
2007-04-26 18:13:15 +02:00
2010-02-15 03:55:01 +01:00
/* DO */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " DO " ) )
COMPLETE_WITH ( " LANGUAGE " ) ;
2010-02-15 03:55:01 +01:00
In psql's tab completion, change most TailMatches patterns to Matches.
In the refactoring in commit d37b816dc9e8f976c8913296781e08cbd45c5af1,
we mostly kept to the original design whereby only the last few words
on the line were matched to identify a completable pattern. However,
after commit d854118c8df8c413d069f7e88bb01b9e18e4c8ed, there's really
no reason to do it like that: where it's sensible, we can use patterns
that expect to match the entire input line. And mostly, it's sensible.
Matching the entire line greatly reduces the odds of a false match that
leads to offering irrelevant completions. Moreover (though I've not
tried to measure this), it should make tab completion faster since
many of the patterns will be discarded after a single integer comparison
that finds that the wrong number of words appear on the line.
There are certain identifiable places where we still need to use
TailMatches because the statement in question is allowed to appear
embedded in a larger statement. These are just a small minority of
the existing patterns, though, so the benefit of switching where
possible is large.
It's possible that this patch has removed some within-line matching
behaviors that are in fact desirable, but we can put those back when
we get complaints. Most of the removed behaviors are certainly silly.
Michael Paquier, with some further adjustments by me
2016-01-05 02:08:08 +01:00
/* DROP */
/* Complete DROP object with CASCADE / RESTRICT */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " DROP " ,
" COLLATION|CONVERSION|DOMAIN|EXTENSION|LANGUAGE|PUBLICATION|SCHEMA|SEQUENCE|SERVER|SUBSCRIPTION|STATISTICS|TABLE|TYPE|VIEW " ,
MatchAny ) | |
Matches ( " DROP " , " ACCESS " , " METHOD " , MatchAny ) | |
( Matches ( " DROP " , " AGGREGATE|FUNCTION|PROCEDURE|ROUTINE " , MatchAny , MatchAny ) & &
In psql's tab completion, change most TailMatches patterns to Matches.
In the refactoring in commit d37b816dc9e8f976c8913296781e08cbd45c5af1,
we mostly kept to the original design whereby only the last few words
on the line were matched to identify a completable pattern. However,
after commit d854118c8df8c413d069f7e88bb01b9e18e4c8ed, there's really
no reason to do it like that: where it's sensible, we can use patterns
that expect to match the entire input line. And mostly, it's sensible.
Matching the entire line greatly reduces the odds of a false match that
leads to offering irrelevant completions. Moreover (though I've not
tried to measure this), it should make tab completion faster since
many of the patterns will be discarded after a single integer comparison
that finds that the wrong number of words appear on the line.
There are certain identifiable places where we still need to use
TailMatches because the statement in question is allowed to appear
embedded in a larger statement. These are just a small minority of
the existing patterns, though, so the benefit of switching where
possible is large.
It's possible that this patch has removed some within-line matching
behaviors that are in fact desirable, but we can put those back when
we get complaints. Most of the removed behaviors are certainly silly.
Michael Paquier, with some further adjustments by me
2016-01-05 02:08:08 +01:00
ends_with ( prev_wd , ' ) ' ) ) | |
2018-09-22 02:50:18 +02:00
Matches ( " DROP " , " EVENT " , " TRIGGER " , MatchAny ) | |
Matches ( " DROP " , " FOREIGN " , " DATA " , " WRAPPER " , MatchAny ) | |
Matches ( " DROP " , " FOREIGN " , " TABLE " , MatchAny ) | |
Matches ( " DROP " , " TEXT " , " SEARCH " , " CONFIGURATION|DICTIONARY|PARSER|TEMPLATE " , MatchAny ) )
COMPLETE_WITH ( " CASCADE " , " RESTRICT " ) ;
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
/* help completing some of the variants */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " DROP " , " AGGREGATE|FUNCTION|PROCEDURE|ROUTINE " , MatchAny ) )
COMPLETE_WITH ( " ( " ) ;
else if ( Matches ( " DROP " , " AGGREGATE|FUNCTION|PROCEDURE|ROUTINE " , MatchAny , " ( " ) )
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
COMPLETE_WITH_FUNCTION_ARG ( prev2_wd ) ;
2018-09-22 02:50:18 +02:00
else if ( Matches ( " DROP " , " FOREIGN " ) )
COMPLETE_WITH ( " DATA WRAPPER " , " TABLE " ) ;
2013-03-04 01:23:31 +01:00
2016-01-17 02:46:14 +01:00
/* DROP INDEX */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " DROP " , " INDEX " ) )
2016-01-17 02:46:14 +01:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_indexes ,
" UNION SELECT 'CONCURRENTLY' " ) ;
2018-09-22 02:50:18 +02:00
else if ( Matches ( " DROP " , " INDEX " , " CONCURRENTLY " ) )
2016-01-17 02:46:14 +01:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_indexes , NULL ) ;
2018-09-22 02:50:18 +02:00
else if ( Matches ( " DROP " , " INDEX " , MatchAny ) )
COMPLETE_WITH ( " CASCADE " , " RESTRICT " ) ;
else if ( Matches ( " DROP " , " INDEX " , " CONCURRENTLY " , MatchAny ) )
COMPLETE_WITH ( " CASCADE " , " RESTRICT " ) ;
2016-01-17 02:46:14 +01:00
2013-03-04 01:23:31 +01:00
/* DROP MATERIALIZED VIEW */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " DROP " , " MATERIALIZED " ) )
COMPLETE_WITH ( " VIEW " ) ;
else if ( Matches ( " DROP " , " MATERIALIZED " , " VIEW " ) )
2013-03-04 01:23:31 +01:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_matviews , NULL ) ;
2006-04-02 11:02:41 +02:00
/* DROP OWNED BY */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " DROP " , " OWNED " ) )
COMPLETE_WITH ( " BY " ) ;
else if ( Matches ( " DROP " , " OWNED " , " BY " ) )
2006-04-02 11:02:41 +02:00
COMPLETE_WITH_QUERY ( Query_for_list_of_roles ) ;
2005-12-08 22:33:58 +01:00
2017-03-16 23:54:28 +01:00
/* DROP TEXT SEARCH */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " DROP " , " TEXT " , " SEARCH " ) )
COMPLETE_WITH ( " CONFIGURATION " , " DICTIONARY " , " PARSER " , " TEMPLATE " ) ;
2007-11-15 22:14:46 +01:00
2014-06-23 22:47:39 +02:00
/* DROP TRIGGER */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " DROP " , " TRIGGER " , MatchAny ) )
COMPLETE_WITH ( " ON " ) ;
else if ( Matches ( " DROP " , " TRIGGER " , MatchAny , " ON " ) )
2014-06-23 22:47:39 +02:00
{
completion_info_charp = prev2_wd ;
COMPLETE_WITH_QUERY ( Query_for_list_of_tables_for_trigger ) ;
}
2018-09-22 02:50:18 +02:00
else if ( Matches ( " DROP " , " TRIGGER " , MatchAny , " ON " , MatchAny ) )
COMPLETE_WITH ( " CASCADE " , " RESTRICT " ) ;
2014-06-23 22:47:39 +02:00
2016-06-07 23:59:34 +02:00
/* DROP ACCESS METHOD */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " DROP " , " ACCESS " ) )
COMPLETE_WITH ( " METHOD " ) ;
else if ( Matches ( " DROP " , " ACCESS " , " METHOD " ) )
2016-06-07 23:59:34 +02:00
COMPLETE_WITH_QUERY ( Query_for_list_of_access_methods ) ;
2014-04-14 14:44:21 +02:00
/* DROP EVENT TRIGGER */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " DROP " , " EVENT " ) )
COMPLETE_WITH ( " TRIGGER " ) ;
else if ( Matches ( " DROP " , " EVENT " , " TRIGGER " ) )
2014-04-14 14:44:21 +02:00
COMPLETE_WITH_QUERY ( Query_for_list_of_event_triggers ) ;
2015-07-20 15:37:17 +02:00
/* DROP POLICY <name> */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " DROP " , " POLICY " ) )
2015-07-20 15:37:17 +02:00
COMPLETE_WITH_QUERY ( Query_for_list_of_policies ) ;
Row-Level Security Policies (RLS)
Building on the updatable security-barrier views work, add the
ability to define policies on tables to limit the set of rows
which are returned from a query and which are allowed to be added
to a table. Expressions defined by the policy for filtering are
added to the security barrier quals of the query, while expressions
defined to check records being added to a table are added to the
with-check options of the query.
New top-level commands are CREATE/ALTER/DROP POLICY and are
controlled by the table owner. Row Security is able to be enabled
and disabled by the owner on a per-table basis using
ALTER TABLE .. ENABLE/DISABLE ROW SECURITY.
Per discussion, ROW SECURITY is disabled on tables by default and
must be enabled for policies on the table to be used. If no
policies exist on a table with ROW SECURITY enabled, a default-deny
policy is used and no records will be visible.
By default, row security is applied at all times except for the
table owner and the superuser. A new GUC, row_security, is added
which can be set to ON, OFF, or FORCE. When set to FORCE, row
security will be applied even for the table owner and superusers.
When set to OFF, row security will be disabled when allowed and an
error will be thrown if the user does not have rights to bypass row
security.
Per discussion, pg_dump sets row_security = OFF by default to ensure
that exports and backups will have all data in the table or will
error if there are insufficient privileges to bypass row security.
A new option has been added to pg_dump, --enable-row-security, to
ask pg_dump to export with row security enabled.
A new role capability, BYPASSRLS, which can only be set by the
superuser, is added to allow other users to be able to bypass row
security using row_security = OFF.
Many thanks to the various individuals who have helped with the
design, particularly Robert Haas for his feedback.
Authors include Craig Ringer, KaiGai Kohei, Adam Brightwell, Dean
Rasheed, with additional changes and rework by me.
Reviewers have included all of the above, Greg Smith,
Jeff McCormick, and Robert Haas.
2014-09-19 17:18:35 +02:00
/* DROP POLICY <name> ON */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " DROP " , " POLICY " , MatchAny ) )
COMPLETE_WITH ( " ON " ) ;
Row-Level Security Policies (RLS)
Building on the updatable security-barrier views work, add the
ability to define policies on tables to limit the set of rows
which are returned from a query and which are allowed to be added
to a table. Expressions defined by the policy for filtering are
added to the security barrier quals of the query, while expressions
defined to check records being added to a table are added to the
with-check options of the query.
New top-level commands are CREATE/ALTER/DROP POLICY and are
controlled by the table owner. Row Security is able to be enabled
and disabled by the owner on a per-table basis using
ALTER TABLE .. ENABLE/DISABLE ROW SECURITY.
Per discussion, ROW SECURITY is disabled on tables by default and
must be enabled for policies on the table to be used. If no
policies exist on a table with ROW SECURITY enabled, a default-deny
policy is used and no records will be visible.
By default, row security is applied at all times except for the
table owner and the superuser. A new GUC, row_security, is added
which can be set to ON, OFF, or FORCE. When set to FORCE, row
security will be applied even for the table owner and superusers.
When set to OFF, row security will be disabled when allowed and an
error will be thrown if the user does not have rights to bypass row
security.
Per discussion, pg_dump sets row_security = OFF by default to ensure
that exports and backups will have all data in the table or will
error if there are insufficient privileges to bypass row security.
A new option has been added to pg_dump, --enable-row-security, to
ask pg_dump to export with row security enabled.
A new role capability, BYPASSRLS, which can only be set by the
superuser, is added to allow other users to be able to bypass row
security using row_security = OFF.
Many thanks to the various individuals who have helped with the
design, particularly Robert Haas for his feedback.
Authors include Craig Ringer, KaiGai Kohei, Adam Brightwell, Dean
Rasheed, with additional changes and rework by me.
Reviewers have included all of the above, Greg Smith,
Jeff McCormick, and Robert Haas.
2014-09-19 17:18:35 +02:00
/* DROP POLICY <name> ON <table> */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " DROP " , " POLICY " , MatchAny , " ON " ) )
2015-07-20 15:37:17 +02:00
{
completion_info_charp = prev2_wd ;
COMPLETE_WITH_QUERY ( Query_for_list_of_tables_for_policy ) ;
}
Row-Level Security Policies (RLS)
Building on the updatable security-barrier views work, add the
ability to define policies on tables to limit the set of rows
which are returned from a query and which are allowed to be added
to a table. Expressions defined by the policy for filtering are
added to the security barrier quals of the query, while expressions
defined to check records being added to a table are added to the
with-check options of the query.
New top-level commands are CREATE/ALTER/DROP POLICY and are
controlled by the table owner. Row Security is able to be enabled
and disabled by the owner on a per-table basis using
ALTER TABLE .. ENABLE/DISABLE ROW SECURITY.
Per discussion, ROW SECURITY is disabled on tables by default and
must be enabled for policies on the table to be used. If no
policies exist on a table with ROW SECURITY enabled, a default-deny
policy is used and no records will be visible.
By default, row security is applied at all times except for the
table owner and the superuser. A new GUC, row_security, is added
which can be set to ON, OFF, or FORCE. When set to FORCE, row
security will be applied even for the table owner and superusers.
When set to OFF, row security will be disabled when allowed and an
error will be thrown if the user does not have rights to bypass row
security.
Per discussion, pg_dump sets row_security = OFF by default to ensure
that exports and backups will have all data in the table or will
error if there are insufficient privileges to bypass row security.
A new option has been added to pg_dump, --enable-row-security, to
ask pg_dump to export with row security enabled.
A new role capability, BYPASSRLS, which can only be set by the
superuser, is added to allow other users to be able to bypass row
security using row_security = OFF.
Many thanks to the various individuals who have helped with the
design, particularly Robert Haas for his feedback.
Authors include Craig Ringer, KaiGai Kohei, Adam Brightwell, Dean
Rasheed, with additional changes and rework by me.
Reviewers have included all of the above, Greg Smith,
Jeff McCormick, and Robert Haas.
2014-09-19 17:18:35 +02:00
2014-06-23 22:47:39 +02:00
/* DROP RULE */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " DROP " , " RULE " , MatchAny ) )
COMPLETE_WITH ( " ON " ) ;
else if ( Matches ( " DROP " , " RULE " , MatchAny , " ON " ) )
2014-06-23 22:47:39 +02:00
{
completion_info_charp = prev2_wd ;
COMPLETE_WITH_QUERY ( Query_for_list_of_tables_for_rule ) ;
}
2018-09-22 02:50:18 +02:00
else if ( Matches ( " DROP " , " RULE " , MatchAny , " ON " , MatchAny ) )
COMPLETE_WITH ( " CASCADE " , " RESTRICT " ) ;
2014-06-23 22:47:39 +02:00
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
/* EXECUTE */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " EXECUTE " ) )
2011-10-24 01:25:34 +02:00
COMPLETE_WITH_QUERY ( Query_for_list_of_prepared_statements ) ;
Improve tab completion for ANALYZE, EXPLAIN, and VACUUM.
Previously, we made no attempt to provide tab completion in these
statements' optional parenthesized options lists. This patch teaches
psql to do so.
To prevent the option completions from being offered after we've already
seen a complete parenthesized option list, it's necessary to improve
word_matches() so that it allows a wildcard '*' in the middle of an
alternative, not only at the end as formerly. That requires only a
little more code than before, and it allows us to test for "incomplete
parenthesized options" with a test like
else if (HeadMatches2("EXPLAIN", "(*") &&
!HeadMatches2("EXPLAIN", "(*)"))
In addition, add some logic to offer column names in the context of
"ANALYZE tablename ( ...", and likewise for VACUUM. This isn't real
complete; it won't offer column names again after a comma. But it's
better than before, and it doesn't take much code.
Justin Pryzby, reviewed at various times by Álvaro Herrera, Arthur
Zakirov, and Edmund Horner; some additional fixups by me
Discussion: https://postgr.es/m/20180529000623.GA21896@telsasoft.com
2018-09-21 21:22:26 +02:00
/*
* EXPLAIN [ ( option [ , . . . ] ) ] statement
* EXPLAIN [ ANALYZE ] [ VERBOSE ] statement
*/
2018-09-22 02:50:18 +02:00
else if ( Matches ( " EXPLAIN " ) )
COMPLETE_WITH ( " SELECT " , " INSERT " , " DELETE " , " UPDATE " , " DECLARE " ,
" ANALYZE " , " VERBOSE " ) ;
else if ( HeadMatches ( " EXPLAIN " , " (* " ) & &
! HeadMatches ( " EXPLAIN " , " (*) " ) )
Improve tab completion for ANALYZE, EXPLAIN, and VACUUM.
Previously, we made no attempt to provide tab completion in these
statements' optional parenthesized options lists. This patch teaches
psql to do so.
To prevent the option completions from being offered after we've already
seen a complete parenthesized option list, it's necessary to improve
word_matches() so that it allows a wildcard '*' in the middle of an
alternative, not only at the end as formerly. That requires only a
little more code than before, and it allows us to test for "incomplete
parenthesized options" with a test like
else if (HeadMatches2("EXPLAIN", "(*") &&
!HeadMatches2("EXPLAIN", "(*)"))
In addition, add some logic to offer column names in the context of
"ANALYZE tablename ( ...", and likewise for VACUUM. This isn't real
complete; it won't offer column names again after a comma. But it's
better than before, and it doesn't take much code.
Justin Pryzby, reviewed at various times by Álvaro Herrera, Arthur
Zakirov, and Edmund Horner; some additional fixups by me
Discussion: https://postgr.es/m/20180529000623.GA21896@telsasoft.com
2018-09-21 21:22:26 +02:00
{
/*
* This fires if we ' re in an unfinished parenthesized option list .
* get_previous_words treats a completed parenthesized option list as
* one word , so the above test is correct .
*/
if ( ends_with ( prev_wd , ' ( ' ) | | ends_with ( prev_wd , ' , ' ) )
2018-09-22 02:50:18 +02:00
COMPLETE_WITH ( " ANALYZE " , " VERBOSE " , " COSTS " , " BUFFERS " ,
" TIMING " , " SUMMARY " , " FORMAT " ) ;
else if ( TailMatches ( " ANALYZE|VERBOSE|COSTS|BUFFERS|TIMING|SUMMARY " ) )
COMPLETE_WITH ( " ON " , " OFF " ) ;
else if ( TailMatches ( " FORMAT " ) )
COMPLETE_WITH ( " TEXT " , " XML " , " JSON " , " YAML " ) ;
Improve tab completion for ANALYZE, EXPLAIN, and VACUUM.
Previously, we made no attempt to provide tab completion in these
statements' optional parenthesized options lists. This patch teaches
psql to do so.
To prevent the option completions from being offered after we've already
seen a complete parenthesized option list, it's necessary to improve
word_matches() so that it allows a wildcard '*' in the middle of an
alternative, not only at the end as formerly. That requires only a
little more code than before, and it allows us to test for "incomplete
parenthesized options" with a test like
else if (HeadMatches2("EXPLAIN", "(*") &&
!HeadMatches2("EXPLAIN", "(*)"))
In addition, add some logic to offer column names in the context of
"ANALYZE tablename ( ...", and likewise for VACUUM. This isn't real
complete; it won't offer column names again after a comma. But it's
better than before, and it doesn't take much code.
Justin Pryzby, reviewed at various times by Álvaro Herrera, Arthur
Zakirov, and Edmund Horner; some additional fixups by me
Discussion: https://postgr.es/m/20180529000623.GA21896@telsasoft.com
2018-09-21 21:22:26 +02:00
}
2018-09-22 02:50:18 +02:00
else if ( Matches ( " EXPLAIN " , " ANALYZE " ) )
COMPLETE_WITH ( " SELECT " , " INSERT " , " DELETE " , " UPDATE " , " DECLARE " ,
" VERBOSE " ) ;
else if ( Matches ( " EXPLAIN " , " (*) " ) | |
Matches ( " EXPLAIN " , " VERBOSE " ) | |
Matches ( " EXPLAIN " , " ANALYZE " , " VERBOSE " ) )
COMPLETE_WITH ( " SELECT " , " INSERT " , " DELETE " , " UPDATE " , " DECLARE " ) ;
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
/* FETCH && MOVE */
2000-04-12 19:17:23 +02:00
/* Complete FETCH with one of FORWARD, BACKWARD, RELATIVE */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " FETCH|MOVE " ) )
COMPLETE_WITH ( " ABSOLUTE " , " BACKWARD " , " FORWARD " , " RELATIVE " ) ;
2000-04-12 19:17:23 +02:00
/* Complete FETCH <sth> with one of ALL, NEXT, PRIOR */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " FETCH|MOVE " , MatchAny ) )
COMPLETE_WITH ( " ALL " , " NEXT " , " PRIOR " ) ;
2000-04-12 19:17:23 +02:00
/*
2005-10-15 04:49:52 +02:00
* Complete FETCH < sth1 > < sth2 > with " FROM " or " IN " . These are equivalent ,
* but we may as well tab - complete both : perhaps some users prefer one
* variant or the other .
2000-04-12 19:17:23 +02:00
*/
2018-09-22 02:50:18 +02:00
else if ( Matches ( " FETCH|MOVE " , MatchAny , MatchAny ) )
COMPLETE_WITH ( " FROM " , " IN " ) ;
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
2008-12-19 17:25:19 +01:00
/* FOREIGN DATA WRAPPER */
/* applies in ALTER/DROP FDW and in CREATE SERVER */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " FOREIGN " , " DATA " , " WRAPPER " ) & &
! TailMatches ( " CREATE " , MatchAny , MatchAny , MatchAny ) )
2008-12-19 17:25:19 +01:00
COMPLETE_WITH_QUERY ( Query_for_list_of_fdws ) ;
2016-01-23 12:57:42 +01:00
/* applies in CREATE SERVER */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " FOREIGN " , " DATA " , " WRAPPER " , MatchAny ) & &
HeadMatches ( " CREATE " , " SERVER " ) )
COMPLETE_WITH ( " OPTIONS " ) ;
2008-12-19 17:25:19 +01:00
2011-01-02 05:48:11 +01:00
/* FOREIGN TABLE */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " FOREIGN " , " TABLE " ) & &
! TailMatches ( " CREATE " , MatchAny , MatchAny ) )
2011-04-10 17:42:00 +02:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_foreign_tables , NULL ) ;
2011-01-02 05:48:11 +01:00
2015-09-08 18:58:29 +02:00
/* FOREIGN SERVER */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " FOREIGN " , " SERVER " ) )
2015-09-08 18:58:29 +02:00
COMPLETE_WITH_QUERY ( Query_for_list_of_servers ) ;
Fix tab completion in psql for ALTER DEFAULT PRIVILEGES
When providing tab completion for ALTER DEFAULT PRIVILEGES, we are
including the list of roles as possible options for completion after the
GRANT or REVOKE. Further, we accept FOR ROLE/IN SCHEMA at the same time
and in either order, but the tab completion was only working for one or
the other. Lastly, we weren't using the actual list of allowed kinds of
objects for default privileges for completion after the 'GRANT X ON' but
instead were completeing to what 'GRANT X ON' supports, which isn't the
ssame at all.
Address these issues by improving the forward tab-completion for ALTER
DEFAULT PRIVILEGES and then constrain and correct how the tail
completion is done when it is for ALTER DEFAULT PRIVILEGES.
Back-patch the forward/tail tab-completion to 9.6, where we made it easy
to handle such cases.
For 9.5 and earlier, correct the initial tab-completion to at least be
correct as far as it goes and then add a check for GRANT/REVOKE to only
tab-complete when the GRANT/REVOKE is the start of the command, so we
don't try to do tab-completion after we get to the GRANT/REVOKE part of
the ALTER DEFAULT PRIVILEGES command, which is better than providing
incorrect completions.
Initial patch for master and 9.6 by Gilles Darold, though I cleaned it
up and added a few comments. All bugs in the 9.5 and earlier patch are
mine.
Discussion: https://www.postgresql.org/message-id/1614593c-e356-5b27-6dba-66320a9bc68b@dalibo.com
2016-12-24 03:01:29 +01:00
/*
* GRANT and REVOKE are allowed inside CREATE SCHEMA and
* ALTER DEFAULT PRIVILEGES , so use TailMatches
*/
2012-01-21 18:46:55 +01:00
/* Complete GRANT/REVOKE with a list of roles and privileges */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " GRANT|REVOKE " ) )
2017-05-17 02:36:35 +02:00
{
Fix tab completion in psql for ALTER DEFAULT PRIVILEGES
When providing tab completion for ALTER DEFAULT PRIVILEGES, we are
including the list of roles as possible options for completion after the
GRANT or REVOKE. Further, we accept FOR ROLE/IN SCHEMA at the same time
and in either order, but the tab completion was only working for one or
the other. Lastly, we weren't using the actual list of allowed kinds of
objects for default privileges for completion after the 'GRANT X ON' but
instead were completeing to what 'GRANT X ON' supports, which isn't the
ssame at all.
Address these issues by improving the forward tab-completion for ALTER
DEFAULT PRIVILEGES and then constrain and correct how the tail
completion is done when it is for ALTER DEFAULT PRIVILEGES.
Back-patch the forward/tail tab-completion to 9.6, where we made it easy
to handle such cases.
For 9.5 and earlier, correct the initial tab-completion to at least be
correct as far as it goes and then add a check for GRANT/REVOKE to only
tab-complete when the GRANT/REVOKE is the start of the command, so we
don't try to do tab-completion after we get to the GRANT/REVOKE part of
the ALTER DEFAULT PRIVILEGES command, which is better than providing
incorrect completions.
Initial patch for master and 9.6 by Gilles Darold, though I cleaned it
up and added a few comments. All bugs in the 9.5 and earlier patch are
mine.
Discussion: https://www.postgresql.org/message-id/1614593c-e356-5b27-6dba-66320a9bc68b@dalibo.com
2016-12-24 03:01:29 +01:00
/*
2017-05-17 22:31:56 +02:00
* With ALTER DEFAULT PRIVILEGES , restrict completion to grantable
* privileges ( can ' t grant roles )
Fix tab completion in psql for ALTER DEFAULT PRIVILEGES
When providing tab completion for ALTER DEFAULT PRIVILEGES, we are
including the list of roles as possible options for completion after the
GRANT or REVOKE. Further, we accept FOR ROLE/IN SCHEMA at the same time
and in either order, but the tab completion was only working for one or
the other. Lastly, we weren't using the actual list of allowed kinds of
objects for default privileges for completion after the 'GRANT X ON' but
instead were completeing to what 'GRANT X ON' supports, which isn't the
ssame at all.
Address these issues by improving the forward tab-completion for ALTER
DEFAULT PRIVILEGES and then constrain and correct how the tail
completion is done when it is for ALTER DEFAULT PRIVILEGES.
Back-patch the forward/tail tab-completion to 9.6, where we made it easy
to handle such cases.
For 9.5 and earlier, correct the initial tab-completion to at least be
correct as far as it goes and then add a check for GRANT/REVOKE to only
tab-complete when the GRANT/REVOKE is the start of the command, so we
don't try to do tab-completion after we get to the GRANT/REVOKE part of
the ALTER DEFAULT PRIVILEGES command, which is better than providing
incorrect completions.
Initial patch for master and 9.6 by Gilles Darold, though I cleaned it
up and added a few comments. All bugs in the 9.5 and earlier patch are
mine.
Discussion: https://www.postgresql.org/message-id/1614593c-e356-5b27-6dba-66320a9bc68b@dalibo.com
2016-12-24 03:01:29 +01:00
*/
2018-09-22 02:50:18 +02:00
if ( HeadMatches ( " ALTER " , " DEFAULT " , " PRIVILEGES " ) )
COMPLETE_WITH ( " SELECT " , " INSERT " , " UPDATE " ,
" DELETE " , " TRUNCATE " , " REFERENCES " , " TRIGGER " ,
" EXECUTE " , " USAGE " , " ALL " ) ;
Fix tab completion in psql for ALTER DEFAULT PRIVILEGES
When providing tab completion for ALTER DEFAULT PRIVILEGES, we are
including the list of roles as possible options for completion after the
GRANT or REVOKE. Further, we accept FOR ROLE/IN SCHEMA at the same time
and in either order, but the tab completion was only working for one or
the other. Lastly, we weren't using the actual list of allowed kinds of
objects for default privileges for completion after the 'GRANT X ON' but
instead were completeing to what 'GRANT X ON' supports, which isn't the
ssame at all.
Address these issues by improving the forward tab-completion for ALTER
DEFAULT PRIVILEGES and then constrain and correct how the tail
completion is done when it is for ALTER DEFAULT PRIVILEGES.
Back-patch the forward/tail tab-completion to 9.6, where we made it easy
to handle such cases.
For 9.5 and earlier, correct the initial tab-completion to at least be
correct as far as it goes and then add a check for GRANT/REVOKE to only
tab-complete when the GRANT/REVOKE is the start of the command, so we
don't try to do tab-completion after we get to the GRANT/REVOKE part of
the ALTER DEFAULT PRIVILEGES command, which is better than providing
incorrect completions.
Initial patch for master and 9.6 by Gilles Darold, though I cleaned it
up and added a few comments. All bugs in the 9.5 and earlier patch are
mine.
Discussion: https://www.postgresql.org/message-id/1614593c-e356-5b27-6dba-66320a9bc68b@dalibo.com
2016-12-24 03:01:29 +01:00
else
COMPLETE_WITH_QUERY ( Query_for_list_of_roles
2017-05-17 22:31:56 +02:00
" UNION SELECT 'SELECT' "
" UNION SELECT 'INSERT' "
" UNION SELECT 'UPDATE' "
" UNION SELECT 'DELETE' "
" UNION SELECT 'TRUNCATE' "
" UNION SELECT 'REFERENCES' "
" UNION SELECT 'TRIGGER' "
" UNION SELECT 'CREATE' "
" UNION SELECT 'CONNECT' "
" UNION SELECT 'TEMPORARY' "
" UNION SELECT 'EXECUTE' "
" UNION SELECT 'USAGE' "
" UNION SELECT 'ALL' " ) ;
2017-05-17 02:36:35 +02:00
}
2017-05-17 22:31:56 +02:00
2012-06-10 21:20:04 +02:00
/*
* Complete GRANT / REVOKE < privilege > with " ON " , GRANT / REVOKE < role > with
* TO / FROM
*/
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " GRANT|REVOKE " , MatchAny ) )
2012-01-21 18:46:55 +01:00
{
2018-09-22 02:50:18 +02:00
if ( TailMatches ( " SELECT|INSERT|UPDATE|DELETE|TRUNCATE|REFERENCES|TRIGGER|CREATE|CONNECT|TEMPORARY|TEMP|EXECUTE|USAGE|ALL " ) )
COMPLETE_WITH ( " ON " ) ;
else if ( TailMatches ( " GRANT " , MatchAny ) )
COMPLETE_WITH ( " TO " ) ;
2012-01-21 18:46:55 +01:00
else
2018-09-22 02:50:18 +02:00
COMPLETE_WITH ( " FROM " ) ;
2012-01-21 18:46:55 +01:00
}
2000-04-12 19:17:23 +02:00
/*
2018-09-21 18:41:00 +02:00
* Complete GRANT / REVOKE < sth > ON with a list of appropriate relations .
2002-08-10 05:56:24 +02:00
*
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
* Keywords like DATABASE , FUNCTION , LANGUAGE and SCHEMA added to query
* result via UNION ; seems to work intuitively .
2003-08-04 02:43:34 +02:00
*
2005-10-15 04:49:52 +02:00
* Note : GRANT / REVOKE can get quite complex ; tab - completion as implemented
* here will only work if the privilege list contains exactly one
2015-09-08 18:58:29 +02:00
* privilege .
2000-04-12 19:17:23 +02:00
*/
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " GRANT|REVOKE " , MatchAny , " ON " ) )
2017-05-17 02:36:35 +02:00
{
Fix tab completion in psql for ALTER DEFAULT PRIVILEGES
When providing tab completion for ALTER DEFAULT PRIVILEGES, we are
including the list of roles as possible options for completion after the
GRANT or REVOKE. Further, we accept FOR ROLE/IN SCHEMA at the same time
and in either order, but the tab completion was only working for one or
the other. Lastly, we weren't using the actual list of allowed kinds of
objects for default privileges for completion after the 'GRANT X ON' but
instead were completeing to what 'GRANT X ON' supports, which isn't the
ssame at all.
Address these issues by improving the forward tab-completion for ALTER
DEFAULT PRIVILEGES and then constrain and correct how the tail
completion is done when it is for ALTER DEFAULT PRIVILEGES.
Back-patch the forward/tail tab-completion to 9.6, where we made it easy
to handle such cases.
For 9.5 and earlier, correct the initial tab-completion to at least be
correct as far as it goes and then add a check for GRANT/REVOKE to only
tab-complete when the GRANT/REVOKE is the start of the command, so we
don't try to do tab-completion after we get to the GRANT/REVOKE part of
the ALTER DEFAULT PRIVILEGES command, which is better than providing
incorrect completions.
Initial patch for master and 9.6 by Gilles Darold, though I cleaned it
up and added a few comments. All bugs in the 9.5 and earlier patch are
mine.
Discussion: https://www.postgresql.org/message-id/1614593c-e356-5b27-6dba-66320a9bc68b@dalibo.com
2016-12-24 03:01:29 +01:00
/*
2017-05-17 22:31:56 +02:00
* With ALTER DEFAULT PRIVILEGES , restrict completion to the kinds of
* objects supported .
Fix tab completion in psql for ALTER DEFAULT PRIVILEGES
When providing tab completion for ALTER DEFAULT PRIVILEGES, we are
including the list of roles as possible options for completion after the
GRANT or REVOKE. Further, we accept FOR ROLE/IN SCHEMA at the same time
and in either order, but the tab completion was only working for one or
the other. Lastly, we weren't using the actual list of allowed kinds of
objects for default privileges for completion after the 'GRANT X ON' but
instead were completeing to what 'GRANT X ON' supports, which isn't the
ssame at all.
Address these issues by improving the forward tab-completion for ALTER
DEFAULT PRIVILEGES and then constrain and correct how the tail
completion is done when it is for ALTER DEFAULT PRIVILEGES.
Back-patch the forward/tail tab-completion to 9.6, where we made it easy
to handle such cases.
For 9.5 and earlier, correct the initial tab-completion to at least be
correct as far as it goes and then add a check for GRANT/REVOKE to only
tab-complete when the GRANT/REVOKE is the start of the command, so we
don't try to do tab-completion after we get to the GRANT/REVOKE part of
the ALTER DEFAULT PRIVILEGES command, which is better than providing
incorrect completions.
Initial patch for master and 9.6 by Gilles Darold, though I cleaned it
up and added a few comments. All bugs in the 9.5 and earlier patch are
mine.
Discussion: https://www.postgresql.org/message-id/1614593c-e356-5b27-6dba-66320a9bc68b@dalibo.com
2016-12-24 03:01:29 +01:00
*/
2018-09-22 02:50:18 +02:00
if ( HeadMatches ( " ALTER " , " DEFAULT " , " PRIVILEGES " ) )
COMPLETE_WITH ( " TABLES " , " SEQUENCES " , " FUNCTIONS " , " PROCEDURES " , " ROUTINES " , " TYPES " , " SCHEMAS " ) ;
Fix tab completion in psql for ALTER DEFAULT PRIVILEGES
When providing tab completion for ALTER DEFAULT PRIVILEGES, we are
including the list of roles as possible options for completion after the
GRANT or REVOKE. Further, we accept FOR ROLE/IN SCHEMA at the same time
and in either order, but the tab completion was only working for one or
the other. Lastly, we weren't using the actual list of allowed kinds of
objects for default privileges for completion after the 'GRANT X ON' but
instead were completeing to what 'GRANT X ON' supports, which isn't the
ssame at all.
Address these issues by improving the forward tab-completion for ALTER
DEFAULT PRIVILEGES and then constrain and correct how the tail
completion is done when it is for ALTER DEFAULT PRIVILEGES.
Back-patch the forward/tail tab-completion to 9.6, where we made it easy
to handle such cases.
For 9.5 and earlier, correct the initial tab-completion to at least be
correct as far as it goes and then add a check for GRANT/REVOKE to only
tab-complete when the GRANT/REVOKE is the start of the command, so we
don't try to do tab-completion after we get to the GRANT/REVOKE part of
the ALTER DEFAULT PRIVILEGES command, which is better than providing
incorrect completions.
Initial patch for master and 9.6 by Gilles Darold, though I cleaned it
up and added a few comments. All bugs in the 9.5 and earlier patch are
mine.
Discussion: https://www.postgresql.org/message-id/1614593c-e356-5b27-6dba-66320a9bc68b@dalibo.com
2016-12-24 03:01:29 +01:00
else
2018-09-21 18:41:00 +02:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_grantables ,
Phase 3 of pgindent updates.
Don't move parenthesized lines to the left, even if that means they
flow past the right margin.
By default, BSD indent lines up statement continuation lines that are
within parentheses so that they start just to the right of the preceding
left parenthesis. However, traditionally, if that resulted in the
continuation line extending to the right of the desired right margin,
then indent would push it left just far enough to not overrun the margin,
if it could do so without making the continuation line start to the left of
the current statement indent. That makes for a weird mix of indentations
unless one has been completely rigid about never violating the 80-column
limit.
This behavior has been pretty universally panned by Postgres developers.
Hence, disable it with indent's new -lpl switch, so that parenthesized
lines are always lined up with the preceding left paren.
This patch is much less interesting than the first round of indent
changes, but also bulkier, so I thought it best to separate the effects.
Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org
Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us
2017-06-21 21:35:54 +02:00
" UNION SELECT 'ALL FUNCTIONS IN SCHEMA' "
2017-11-30 14:46:13 +01:00
" UNION SELECT 'ALL PROCEDURES IN SCHEMA' "
" UNION SELECT 'ALL ROUTINES IN SCHEMA' "
Phase 3 of pgindent updates.
Don't move parenthesized lines to the left, even if that means they
flow past the right margin.
By default, BSD indent lines up statement continuation lines that are
within parentheses so that they start just to the right of the preceding
left parenthesis. However, traditionally, if that resulted in the
continuation line extending to the right of the desired right margin,
then indent would push it left just far enough to not overrun the margin,
if it could do so without making the continuation line start to the left of
the current statement indent. That makes for a weird mix of indentations
unless one has been completely rigid about never violating the 80-column
limit.
This behavior has been pretty universally panned by Postgres developers.
Hence, disable it with indent's new -lpl switch, so that parenthesized
lines are always lined up with the preceding left paren.
This patch is much less interesting than the first round of indent
changes, but also bulkier, so I thought it best to separate the effects.
Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org
Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us
2017-06-21 21:35:54 +02:00
" UNION SELECT 'ALL SEQUENCES IN SCHEMA' "
2017-05-17 22:31:56 +02:00
" UNION SELECT 'ALL TABLES IN SCHEMA' "
" UNION SELECT 'DATABASE' "
" UNION SELECT 'DOMAIN' "
" UNION SELECT 'FOREIGN DATA WRAPPER' "
" UNION SELECT 'FOREIGN SERVER' "
" UNION SELECT 'FUNCTION' "
" UNION SELECT 'LANGUAGE' "
" UNION SELECT 'LARGE OBJECT' "
2017-11-30 14:46:13 +01:00
" UNION SELECT 'PROCEDURE' "
" UNION SELECT 'ROUTINE' "
2017-05-17 22:31:56 +02:00
" UNION SELECT 'SCHEMA' "
" UNION SELECT 'SEQUENCE' "
" UNION SELECT 'TABLE' "
" UNION SELECT 'TABLESPACE' "
" UNION SELECT 'TYPE' " ) ;
2017-05-17 02:36:35 +02:00
}
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " GRANT|REVOKE " , MatchAny , " ON " , " ALL " ) )
COMPLETE_WITH ( " FUNCTIONS IN SCHEMA " ,
" PROCEDURES IN SCHEMA " ,
" ROUTINES IN SCHEMA " ,
" SEQUENCES IN SCHEMA " ,
" TABLES IN SCHEMA " ) ;
else if ( TailMatches ( " GRANT|REVOKE " , MatchAny , " ON " , " FOREIGN " ) )
COMPLETE_WITH ( " DATA WRAPPER " , " SERVER " ) ;
2003-03-27 17:45:01 +01:00
2015-09-08 18:58:29 +02:00
/*
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
* Complete " GRANT/REVOKE * ON DATABASE/DOMAIN/... " with a list of
2015-09-08 18:58:29 +02:00
* appropriate objects .
*
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
* Complete " GRANT/REVOKE * ON * " with " TO/FROM " .
2015-09-08 18:58:29 +02:00
*/
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " GRANT|REVOKE " , MatchAny , " ON " , MatchAny ) )
2003-03-27 17:45:01 +01:00
{
2018-09-22 02:50:18 +02:00
if ( TailMatches ( " DATABASE " ) )
2003-03-27 17:45:01 +01:00
COMPLETE_WITH_QUERY ( Query_for_list_of_databases ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " DOMAIN " ) )
2011-12-19 23:05:19 +01:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_domains , NULL ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " FUNCTION " ) )
2018-03-05 21:37:23 +01:00
COMPLETE_WITH_VERSIONED_SCHEMA_QUERY ( Query_for_list_of_functions , NULL ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " LANGUAGE " ) )
2003-03-27 17:45:01 +01:00
COMPLETE_WITH_QUERY ( Query_for_list_of_languages ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " PROCEDURE " ) )
2018-03-05 21:37:23 +01:00
COMPLETE_WITH_VERSIONED_SCHEMA_QUERY ( Query_for_list_of_procedures , NULL ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " ROUTINE " ) )
2017-11-30 14:46:13 +01:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_routines , NULL ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " SCHEMA " ) )
2003-03-27 17:45:01 +01:00
COMPLETE_WITH_QUERY ( Query_for_list_of_schemas ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " SEQUENCE " ) )
2015-09-08 18:58:29 +02:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_sequences , NULL ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " TABLE " ) )
2018-09-21 18:41:00 +02:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_grantables , NULL ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " TABLESPACE " ) )
Attached is the third version of my patch that adds/fixes several things
to/in the psql-tabcomplete code. This diff includes the still missing
tab-complete support for TABLESPACE I already sent earlier. New in this
version of the patch is a small adaption of the tab-complete code to
support the adjusted SAVEPOINT-Syntax commited by Tom, as well as
completion of the only half working (and I think only by accident)
tabcomplete-suppport for "BEGIN [ TRANSACTION | WORK ]".
below is a complete list of the things I have changed with this patch:
*) add tablespace support for CREATE/DROP/ALTER and \db
*) sync the list of possible commands following ALTER with the docs (by
adding
AGGREGATE,CONVERSATION,DOMAIN,FUNCTION,LANGUAGE,OPERATOR,SEQUENCE,TABLESPACE
and TYPE)
*) provide a list of valid users after "OWNER TO"
*) tab-complete support for ALTER (AGGREGATE|CONVERSION|FUNCTION)
*) basic tab-complete support for ALTER DOMAIN
*) provide a list of suitable indexes following ALTER TABLE <sth>
CLUSTER ON(?)
*) add "CLUSTER ON" and "SET" to the ALTER TABLE <sth> - tab-complete
list(fixes incorrect/wrong tab-complete with ALTER TABLE <sth> SET
+<TAB> too)
*) provide a list of possible indexes following ALTER TABLE <sth> CLUSTER ON
*) provide list of possible commands(WITHOUT CLUSTER,WITHOUT OIDS,
TABLESPACE) following ALTER TABLE <sth> SET
*) sync "COMMENT ON" with docs by adding "CAST","CONVERSION","FUNCTION"
*) add ABSOLUT to the list of possible commands after FETCH
*) "END" was missing from the sql-commands overview (though it had
completion support!) - i know it's depreciated but we have ABORT and
others still in ...
*) fixes small buglet with ALTER (TRIGGER|CLUSTER) ON autocomplete
(CLUSTER ON +<TAB> would produce CLUSTER ON ON - same for TRIGGER ON)
*) adapt to new SAVEPOINT syntax
*) fix incomplete Support for BEGIN [ TRANSACTION | WORK ]
Stefan Kaltenbrunn
2004-08-20 21:24:59 +02:00
COMPLETE_WITH_QUERY ( Query_for_list_of_tablespaces ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " TYPE " ) )
2011-12-19 23:05:19 +01:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_datatypes , NULL ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " GRANT " , MatchAny , MatchAny , MatchAny ) )
COMPLETE_WITH ( " TO " ) ;
2005-05-18 06:47:40 +02:00
else
2018-09-22 02:50:18 +02:00
COMPLETE_WITH ( " FROM " ) ;
2003-03-27 17:45:01 +01:00
}
2000-04-12 19:17:23 +02:00
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
/*
* Complete " GRANT/REVOKE ... TO/FROM " with username , PUBLIC ,
* CURRENT_USER , or SESSION_USER .
*/
2018-09-22 02:50:18 +02:00
else if ( ( HeadMatches ( " GRANT " ) & & TailMatches ( " TO " ) ) | |
( HeadMatches ( " REVOKE " ) & & TailMatches ( " FROM " ) ) )
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
COMPLETE_WITH_QUERY ( Query_for_list_of_grant_roles ) ;
Fix tab completion in psql for ALTER DEFAULT PRIVILEGES
When providing tab completion for ALTER DEFAULT PRIVILEGES, we are
including the list of roles as possible options for completion after the
GRANT or REVOKE. Further, we accept FOR ROLE/IN SCHEMA at the same time
and in either order, but the tab completion was only working for one or
the other. Lastly, we weren't using the actual list of allowed kinds of
objects for default privileges for completion after the 'GRANT X ON' but
instead were completeing to what 'GRANT X ON' supports, which isn't the
ssame at all.
Address these issues by improving the forward tab-completion for ALTER
DEFAULT PRIVILEGES and then constrain and correct how the tail
completion is done when it is for ALTER DEFAULT PRIVILEGES.
Back-patch the forward/tail tab-completion to 9.6, where we made it easy
to handle such cases.
For 9.5 and earlier, correct the initial tab-completion to at least be
correct as far as it goes and then add a check for GRANT/REVOKE to only
tab-complete when the GRANT/REVOKE is the start of the command, so we
don't try to do tab-completion after we get to the GRANT/REVOKE part of
the ALTER DEFAULT PRIVILEGES command, which is better than providing
incorrect completions.
Initial patch for master and 9.6 by Gilles Darold, though I cleaned it
up and added a few comments. All bugs in the 9.5 and earlier patch are
mine.
Discussion: https://www.postgresql.org/message-id/1614593c-e356-5b27-6dba-66320a9bc68b@dalibo.com
2016-12-24 03:01:29 +01:00
/* Complete "ALTER DEFAULT PRIVILEGES ... GRANT/REVOKE ... TO/FROM */
2018-09-22 02:50:18 +02:00
else if ( HeadMatches ( " ALTER " , " DEFAULT " , " PRIVILEGES " ) & & TailMatches ( " TO|FROM " ) )
Fix tab completion in psql for ALTER DEFAULT PRIVILEGES
When providing tab completion for ALTER DEFAULT PRIVILEGES, we are
including the list of roles as possible options for completion after the
GRANT or REVOKE. Further, we accept FOR ROLE/IN SCHEMA at the same time
and in either order, but the tab completion was only working for one or
the other. Lastly, we weren't using the actual list of allowed kinds of
objects for default privileges for completion after the 'GRANT X ON' but
instead were completeing to what 'GRANT X ON' supports, which isn't the
ssame at all.
Address these issues by improving the forward tab-completion for ALTER
DEFAULT PRIVILEGES and then constrain and correct how the tail
completion is done when it is for ALTER DEFAULT PRIVILEGES.
Back-patch the forward/tail tab-completion to 9.6, where we made it easy
to handle such cases.
For 9.5 and earlier, correct the initial tab-completion to at least be
correct as far as it goes and then add a check for GRANT/REVOKE to only
tab-complete when the GRANT/REVOKE is the start of the command, so we
don't try to do tab-completion after we get to the GRANT/REVOKE part of
the ALTER DEFAULT PRIVILEGES command, which is better than providing
incorrect completions.
Initial patch for master and 9.6 by Gilles Darold, though I cleaned it
up and added a few comments. All bugs in the 9.5 and earlier patch are
mine.
Discussion: https://www.postgresql.org/message-id/1614593c-e356-5b27-6dba-66320a9bc68b@dalibo.com
2016-12-24 03:01:29 +01:00
COMPLETE_WITH_QUERY ( Query_for_list_of_grant_roles ) ;
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
/* Complete "GRANT/REVOKE ... ON * *" with TO/FROM */
2018-09-22 02:50:18 +02:00
else if ( HeadMatches ( " GRANT " ) & & TailMatches ( " ON " , MatchAny , MatchAny ) )
COMPLETE_WITH ( " TO " ) ;
else if ( HeadMatches ( " REVOKE " ) & & TailMatches ( " ON " , MatchAny , MatchAny ) )
COMPLETE_WITH ( " FROM " ) ;
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
2015-09-08 18:58:29 +02:00
/* Complete "GRANT/REVOKE * ON ALL * IN SCHEMA *" with TO/FROM */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " GRANT|REVOKE " , MatchAny , " ON " , " ALL " , MatchAny , " IN " , " SCHEMA " , MatchAny ) )
2010-02-17 05:09:40 +01:00
{
2018-09-22 02:50:18 +02:00
if ( TailMatches ( " GRANT " , MatchAny , MatchAny , MatchAny , MatchAny , MatchAny , MatchAny , MatchAny ) )
COMPLETE_WITH ( " TO " ) ;
2010-02-17 05:09:40 +01:00
else
2018-09-22 02:50:18 +02:00
COMPLETE_WITH ( " FROM " ) ;
2015-09-08 18:58:29 +02:00
}
/* Complete "GRANT/REVOKE * ON FOREIGN DATA WRAPPER *" with TO/FROM */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " GRANT|REVOKE " , MatchAny , " ON " , " FOREIGN " , " DATA " , " WRAPPER " , MatchAny ) )
2015-09-08 18:58:29 +02:00
{
2018-09-22 02:50:18 +02:00
if ( TailMatches ( " GRANT " , MatchAny , MatchAny , MatchAny , MatchAny , MatchAny , MatchAny ) )
COMPLETE_WITH ( " TO " ) ;
2015-09-08 18:58:29 +02:00
else
2018-09-22 02:50:18 +02:00
COMPLETE_WITH ( " FROM " ) ;
2010-02-17 05:09:40 +01:00
}
2015-09-08 18:58:29 +02:00
/* Complete "GRANT/REVOKE * ON FOREIGN SERVER *" with TO/FROM */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " GRANT|REVOKE " , MatchAny , " ON " , " FOREIGN " , " SERVER " , MatchAny ) )
2010-02-17 05:09:40 +01:00
{
2018-09-22 02:50:18 +02:00
if ( TailMatches ( " GRANT " , MatchAny , MatchAny , MatchAny , MatchAny , MatchAny ) )
COMPLETE_WITH ( " TO " ) ;
2010-02-17 05:09:40 +01:00
else
2018-09-22 02:50:18 +02:00
COMPLETE_WITH ( " FROM " ) ;
2010-02-17 05:09:40 +01:00
}
2005-05-18 06:47:40 +02:00
/* GROUP BY */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " FROM " , MatchAny , " GROUP " ) )
COMPLETE_WITH ( " BY " ) ;
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
2014-07-10 21:01:31 +02:00
/* IMPORT FOREIGN SCHEMA */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " IMPORT " ) )
COMPLETE_WITH ( " FOREIGN SCHEMA " ) ;
else if ( Matches ( " IMPORT " , " FOREIGN " ) )
COMPLETE_WITH ( " SCHEMA " ) ;
2014-07-10 21:01:31 +02:00
In psql's tab completion, change most TailMatches patterns to Matches.
In the refactoring in commit d37b816dc9e8f976c8913296781e08cbd45c5af1,
we mostly kept to the original design whereby only the last few words
on the line were matched to identify a completable pattern. However,
after commit d854118c8df8c413d069f7e88bb01b9e18e4c8ed, there's really
no reason to do it like that: where it's sensible, we can use patterns
that expect to match the entire input line. And mostly, it's sensible.
Matching the entire line greatly reduces the odds of a false match that
leads to offering irrelevant completions. Moreover (though I've not
tried to measure this), it should make tab completion faster since
many of the patterns will be discarded after a single integer comparison
that finds that the wrong number of words appear on the line.
There are certain identifiable places where we still need to use
TailMatches because the statement in question is allowed to appear
embedded in a larger statement. These are just a small minority of
the existing patterns, though, so the benefit of switching where
possible is large.
It's possible that this patch has removed some within-line matching
behaviors that are in fact desirable, but we can put those back when
we get complaints. Most of the removed behaviors are certainly silly.
Michael Paquier, with some further adjustments by me
2016-01-05 02:08:08 +01:00
/* INSERT --- can be inside EXPLAIN, RULE, etc */
2000-04-12 19:17:23 +02:00
/* Complete INSERT with "INTO" */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " INSERT " ) )
COMPLETE_WITH ( " INTO " ) ;
2000-04-12 19:17:23 +02:00
/* Complete INSERT INTO with table names */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " INSERT " , " INTO " ) )
2013-10-23 19:16:25 +02:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_updatables , NULL ) ;
2002-07-30 18:35:05 +02:00
/* Complete "INSERT INTO <table> (" with attribute names */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " INSERT " , " INTO " , MatchAny , " ( " ) )
2010-02-17 05:09:40 +01:00
COMPLETE_WITH_ATTR ( prev2_wd , " " ) ;
2001-10-25 07:50:21 +02:00
/*
2010-02-26 03:01:40 +01:00
* Complete INSERT INTO < table > with " ( " or " VALUES " or " SELECT " or
2017-04-06 14:33:16 +02:00
* " TABLE " or " DEFAULT VALUES " or " OVERRIDING "
2001-10-25 07:50:21 +02:00
*/
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " INSERT " , " INTO " , MatchAny ) )
COMPLETE_WITH ( " ( " , " DEFAULT VALUES " , " SELECT " , " TABLE " , " VALUES " , " OVERRIDING " ) ;
2009-06-11 16:49:15 +02:00
/*
* Complete INSERT INTO < table > ( attribs ) with " VALUES " or " SELECT " or
2017-04-06 14:33:16 +02:00
* " TABLE " or " OVERRIDING "
2009-06-11 16:49:15 +02:00
*/
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " INSERT " , " INTO " , MatchAny , MatchAny ) & &
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
ends_with ( prev_wd , ' ) ' ) )
2018-09-22 02:50:18 +02:00
COMPLETE_WITH ( " SELECT " , " TABLE " , " VALUES " , " OVERRIDING " ) ;
2017-04-06 14:33:16 +02:00
/* Complete OVERRIDING */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " OVERRIDING " ) )
COMPLETE_WITH ( " SYSTEM VALUE " , " USER VALUE " ) ;
2017-04-06 14:33:16 +02:00
/* Complete after OVERRIDING clause */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " OVERRIDING " , MatchAny , " VALUE " ) )
COMPLETE_WITH ( " SELECT " , " TABLE " , " VALUES " ) ;
2002-07-30 18:35:05 +02:00
2000-04-12 19:17:23 +02:00
/* Insert an open parenthesis after "VALUES" */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " VALUES " ) & & ! TailMatches ( " DEFAULT " , " VALUES " ) )
COMPLETE_WITH ( " ( " ) ;
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
/* LOCK */
2002-07-30 18:35:05 +02:00
/* Complete LOCK [TABLE] with a list of tables */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " LOCK " ) )
2006-02-12 08:21:40 +01:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_tables ,
" UNION SELECT 'TABLE' " ) ;
2018-09-22 02:50:18 +02:00
else if ( Matches ( " LOCK " , " TABLE " ) )
2006-02-12 08:21:40 +01:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_tables , " " ) ;
2002-07-30 18:35:05 +02:00
/* For the following, handle the case of a single table only for now */
/* Complete LOCK [TABLE] <table> with "IN" */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " LOCK " , MatchAnyExcept ( " TABLE " ) ) | |
Matches ( " LOCK " , " TABLE " , MatchAny ) )
COMPLETE_WITH ( " IN " ) ;
2002-07-30 18:35:05 +02:00
/* Complete LOCK [TABLE] <table> IN with a lock mode */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " LOCK " , MatchAny , " IN " ) | |
Matches ( " LOCK " , " TABLE " , MatchAny , " IN " ) )
COMPLETE_WITH ( " ACCESS SHARE MODE " ,
" ROW SHARE MODE " , " ROW EXCLUSIVE MODE " ,
" SHARE UPDATE EXCLUSIVE MODE " , " SHARE MODE " ,
" SHARE ROW EXCLUSIVE MODE " ,
" EXCLUSIVE MODE " , " ACCESS EXCLUSIVE MODE " ) ;
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
2016-11-03 16:42:13 +01:00
/* Complete LOCK [TABLE] <table> IN ACCESS|ROW with rest of lock mode */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " LOCK " , MatchAny , " IN " , " ACCESS|ROW " ) | |
Matches ( " LOCK " , " TABLE " , MatchAny , " IN " , " ACCESS|ROW " ) )
COMPLETE_WITH ( " EXCLUSIVE MODE " , " SHARE MODE " ) ;
2016-11-03 16:42:13 +01:00
/* Complete LOCK [TABLE] <table> IN SHARE with rest of lock mode */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " LOCK " , MatchAny , " IN " , " SHARE " ) | |
Matches ( " LOCK " , " TABLE " , MatchAny , " IN " , " SHARE " ) )
COMPLETE_WITH ( " MODE " , " ROW EXCLUSIVE MODE " ,
" UPDATE EXCLUSIVE MODE " ) ;
2016-11-03 16:42:13 +01:00
In psql's tab completion, change most TailMatches patterns to Matches.
In the refactoring in commit d37b816dc9e8f976c8913296781e08cbd45c5af1,
we mostly kept to the original design whereby only the last few words
on the line were matched to identify a completable pattern. However,
after commit d854118c8df8c413d069f7e88bb01b9e18e4c8ed, there's really
no reason to do it like that: where it's sensible, we can use patterns
that expect to match the entire input line. And mostly, it's sensible.
Matching the entire line greatly reduces the odds of a false match that
leads to offering irrelevant completions. Moreover (though I've not
tried to measure this), it should make tab completion faster since
many of the patterns will be discarded after a single integer comparison
that finds that the wrong number of words appear on the line.
There are certain identifiable places where we still need to use
TailMatches because the statement in question is allowed to appear
embedded in a larger statement. These are just a small minority of
the existing patterns, though, so the benefit of switching where
possible is large.
It's possible that this patch has removed some within-line matching
behaviors that are in fact desirable, but we can put those back when
we get complaints. Most of the removed behaviors are certainly silly.
Michael Paquier, with some further adjustments by me
2016-01-05 02:08:08 +01:00
/* NOTIFY --- can be inside EXPLAIN, RULE, etc */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " NOTIFY " ) )
2010-02-16 23:34:57 +01:00
COMPLETE_WITH_QUERY ( " SELECT pg_catalog.quote_ident(channel) FROM pg_catalog.pg_listening_channels() AS channel WHERE substring(pg_catalog.quote_ident(channel),1,%d)='%s' " ) ;
2005-05-18 06:47:40 +02:00
2008-12-19 17:25:19 +01:00
/* OPTIONS */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " OPTIONS " ) )
COMPLETE_WITH ( " ( " ) ;
2008-12-19 17:25:19 +01:00
2006-04-02 11:02:41 +02:00
/* OWNER TO - complete with available roles */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " OWNER " , " TO " ) )
2005-08-14 20:49:30 +02:00
COMPLETE_WITH_QUERY ( Query_for_list_of_roles ) ;
2005-05-18 06:47:40 +02:00
/* ORDER BY */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " FROM " , MatchAny , " ORDER " ) )
COMPLETE_WITH ( " BY " ) ;
else if ( TailMatches ( " FROM " , MatchAny , " ORDER " , " BY " ) )
2006-02-12 08:21:40 +01:00
COMPLETE_WITH_ATTR ( prev3_wd , " " ) ;
2005-05-18 06:47:40 +02:00
/* PREPARE xx AS */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " PREPARE " , MatchAny , " AS " ) )
COMPLETE_WITH ( " SELECT " , " UPDATE " , " INSERT " , " DELETE FROM " ) ;
2005-05-18 06:47:40 +02:00
2010-01-25 19:23:10 +01:00
/*
* PREPARE TRANSACTION is missing on purpose . It ' s intended for transaction
* managers , not for manual use in interactive sessions .
*/
2006-04-02 11:02:41 +02:00
/* REASSIGN OWNED BY xxx TO yyy */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " REASSIGN " ) )
COMPLETE_WITH ( " OWNED BY " ) ;
else if ( Matches ( " REASSIGN " , " OWNED " ) )
COMPLETE_WITH ( " BY " ) ;
else if ( Matches ( " REASSIGN " , " OWNED " , " BY " ) )
2006-04-02 11:02:41 +02:00
COMPLETE_WITH_QUERY ( Query_for_list_of_roles ) ;
2018-09-22 02:50:18 +02:00
else if ( Matches ( " REASSIGN " , " OWNED " , " BY " , MatchAny ) )
COMPLETE_WITH ( " TO " ) ;
else if ( Matches ( " REASSIGN " , " OWNED " , " BY " , MatchAny , " TO " ) )
2006-04-02 11:02:41 +02:00
COMPLETE_WITH_QUERY ( Query_for_list_of_roles ) ;
2005-05-18 06:47:40 +02:00
2013-03-04 01:23:31 +01:00
/* REFRESH MATERIALIZED VIEW */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " REFRESH " ) )
COMPLETE_WITH ( " MATERIALIZED VIEW " ) ;
else if ( Matches ( " REFRESH " , " MATERIALIZED " ) )
COMPLETE_WITH ( " VIEW " ) ;
else if ( Matches ( " REFRESH " , " MATERIALIZED " , " VIEW " ) )
2013-07-16 19:55:44 +02:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_matviews ,
" UNION SELECT 'CONCURRENTLY' " ) ;
2018-09-22 02:50:18 +02:00
else if ( Matches ( " REFRESH " , " MATERIALIZED " , " VIEW " , " CONCURRENTLY " ) )
2013-03-04 01:23:31 +01:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_matviews , NULL ) ;
2018-09-22 02:50:18 +02:00
else if ( Matches ( " REFRESH " , " MATERIALIZED " , " VIEW " , MatchAny ) )
COMPLETE_WITH ( " WITH " ) ;
else if ( Matches ( " REFRESH " , " MATERIALIZED " , " VIEW " , " CONCURRENTLY " , MatchAny ) )
COMPLETE_WITH ( " WITH " ) ;
else if ( Matches ( " REFRESH " , " MATERIALIZED " , " VIEW " , MatchAny , " WITH " ) )
COMPLETE_WITH ( " NO DATA " , " DATA " ) ;
else if ( Matches ( " REFRESH " , " MATERIALIZED " , " VIEW " , " CONCURRENTLY " , MatchAny , " WITH " ) )
COMPLETE_WITH ( " NO DATA " , " DATA " ) ;
else if ( Matches ( " REFRESH " , " MATERIALIZED " , " VIEW " , MatchAny , " WITH " , " NO " ) )
COMPLETE_WITH ( " DATA " ) ;
else if ( Matches ( " REFRESH " , " MATERIALIZED " , " VIEW " , " CONCURRENTLY " , MatchAny , " WITH " , " NO " ) )
COMPLETE_WITH ( " DATA " ) ;
2013-03-04 01:23:31 +01:00
2000-06-25 16:25:51 +02:00
/* REINDEX */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " REINDEX " ) )
COMPLETE_WITH ( " TABLE " , " INDEX " , " SYSTEM " , " SCHEMA " , " DATABASE " ) ;
else if ( Matches ( " REINDEX " , " TABLE " ) )
2019-03-29 08:25:20 +01:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_indexables ,
" UNION SELECT 'CONCURRENTLY' " ) ;
2018-09-22 02:50:18 +02:00
else if ( Matches ( " REINDEX " , " INDEX " ) )
2019-03-29 08:25:20 +01:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_indexes ,
" UNION SELECT 'CONCURRENTLY' " ) ;
2018-09-22 02:50:18 +02:00
else if ( Matches ( " REINDEX " , " SCHEMA " ) )
2019-03-29 08:25:20 +01:00
COMPLETE_WITH_QUERY ( Query_for_list_of_schemas
" UNION SELECT 'CONCURRENTLY' " ) ;
2018-09-22 02:50:18 +02:00
else if ( Matches ( " REINDEX " , " SYSTEM|DATABASE " ) )
2019-03-29 08:25:20 +01:00
COMPLETE_WITH_QUERY ( Query_for_list_of_databases
" UNION SELECT 'CONCURRENTLY' " ) ;
else if ( Matches ( " REINDEX " , " TABLE " , " CONCURRENTLY " ) )
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_indexables , NULL ) ;
else if ( Matches ( " REINDEX " , " INDEX " , " CONCURRENTLY " ) )
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_indexes , NULL ) ;
else if ( Matches ( " REINDEX " , " SCHEMA " , " CONCURRENTLY " ) )
COMPLETE_WITH_QUERY ( Query_for_list_of_schemas ) ;
else if ( Matches ( " REINDEX " , " SYSTEM|DATABASE " , " CONCURRENTLY " ) )
In psql's tab completion, change most TailMatches patterns to Matches.
In the refactoring in commit d37b816dc9e8f976c8913296781e08cbd45c5af1,
we mostly kept to the original design whereby only the last few words
on the line were matched to identify a completable pattern. However,
after commit d854118c8df8c413d069f7e88bb01b9e18e4c8ed, there's really
no reason to do it like that: where it's sensible, we can use patterns
that expect to match the entire input line. And mostly, it's sensible.
Matching the entire line greatly reduces the odds of a false match that
leads to offering irrelevant completions. Moreover (though I've not
tried to measure this), it should make tab completion faster since
many of the patterns will be discarded after a single integer comparison
that finds that the wrong number of words appear on the line.
There are certain identifiable places where we still need to use
TailMatches because the statement in question is allowed to appear
embedded in a larger statement. These are just a small minority of
the existing patterns, though, so the benefit of switching where
possible is large.
It's possible that this patch has removed some within-line matching
behaviors that are in fact desirable, but we can put those back when
we get complaints. Most of the removed behaviors are certainly silly.
Michael Paquier, with some further adjustments by me
2016-01-05 02:08:08 +01:00
COMPLETE_WITH_QUERY ( Query_for_list_of_databases ) ;
2000-06-25 16:25:51 +02:00
2010-09-28 02:55:27 +02:00
/* SECURITY LABEL */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " SECURITY " ) )
COMPLETE_WITH ( " LABEL " ) ;
else if ( Matches ( " SECURITY " , " LABEL " ) )
COMPLETE_WITH ( " ON " , " FOR " ) ;
else if ( Matches ( " SECURITY " , " LABEL " , " FOR " , MatchAny ) )
COMPLETE_WITH ( " ON " ) ;
else if ( Matches ( " SECURITY " , " LABEL " , " ON " ) | |
Matches ( " SECURITY " , " LABEL " , " FOR " , MatchAny , " ON " ) )
COMPLETE_WITH ( " TABLE " , " COLUMN " , " AGGREGATE " , " DATABASE " , " DOMAIN " ,
" EVENT TRIGGER " , " FOREIGN TABLE " , " FUNCTION " ,
" LARGE OBJECT " , " MATERIALIZED VIEW " , " LANGUAGE " ,
" PUBLICATION " , " PROCEDURE " , " ROLE " , " ROUTINE " , " SCHEMA " ,
" SEQUENCE " , " SUBSCRIPTION " , " TABLESPACE " , " TYPE " , " VIEW " ) ;
else if ( Matches ( " SECURITY " , " LABEL " , " ON " , MatchAny , MatchAny ) )
COMPLETE_WITH ( " IS " ) ;
2010-09-28 02:55:27 +02:00
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
/* SELECT */
2000-04-12 19:17:23 +02:00
/* naah . . . */
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
/* SET, RESET, SHOW */
2000-04-12 19:17:23 +02:00
/* Complete with a variable name */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " SET|RESET " ) & & ! TailMatches ( " UPDATE " , MatchAny , " SET " ) )
2005-08-14 20:49:30 +02:00
COMPLETE_WITH_QUERY ( Query_for_list_of_set_vars ) ;
2018-09-22 02:50:18 +02:00
else if ( Matches ( " SHOW " ) )
2005-08-14 20:49:30 +02:00
COMPLETE_WITH_QUERY ( Query_for_list_of_show_vars ) ;
2003-01-10 23:03:30 +01:00
/* Complete "SET TRANSACTION" */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " SET " , " TRANSACTION " ) )
COMPLETE_WITH ( " SNAPSHOT " , " ISOLATION LEVEL " , " READ " , " DEFERRABLE " , " NOT DEFERRABLE " ) ;
else if ( Matches ( " BEGIN|START " , " TRANSACTION " ) | |
Matches ( " BEGIN " , " WORK " ) | |
Matches ( " BEGIN " ) | |
Matches ( " SET " , " SESSION " , " CHARACTERISTICS " , " AS " , " TRANSACTION " ) )
COMPLETE_WITH ( " ISOLATION LEVEL " , " READ " , " DEFERRABLE " , " NOT DEFERRABLE " ) ;
else if ( Matches ( " SET|BEGIN|START " , " TRANSACTION|WORK " , " NOT " ) | |
Matches ( " BEGIN " , " NOT " ) | |
Matches ( " SET " , " SESSION " , " CHARACTERISTICS " , " AS " , " TRANSACTION " , " NOT " ) )
COMPLETE_WITH ( " DEFERRABLE " ) ;
else if ( Matches ( " SET|BEGIN|START " , " TRANSACTION|WORK " , " ISOLATION " ) | |
Matches ( " BEGIN " , " ISOLATION " ) | |
Matches ( " SET " , " SESSION " , " CHARACTERISTICS " , " AS " , " TRANSACTION " , " ISOLATION " ) )
COMPLETE_WITH ( " LEVEL " ) ;
else if ( Matches ( " SET|BEGIN|START " , " TRANSACTION|WORK " , " ISOLATION " , " LEVEL " ) | |
Matches ( " BEGIN " , " ISOLATION " , " LEVEL " ) | |
Matches ( " SET " , " SESSION " , " CHARACTERISTICS " , " AS " , " TRANSACTION " , " ISOLATION " , " LEVEL " ) )
COMPLETE_WITH ( " READ " , " REPEATABLE READ " , " SERIALIZABLE " ) ;
else if ( Matches ( " SET|BEGIN|START " , " TRANSACTION|WORK " , " ISOLATION " , " LEVEL " , " READ " ) | |
Matches ( " BEGIN " , " ISOLATION " , " LEVEL " , " READ " ) | |
Matches ( " SET " , " SESSION " , " CHARACTERISTICS " , " AS " , " TRANSACTION " , " ISOLATION " , " LEVEL " , " READ " ) )
COMPLETE_WITH ( " UNCOMMITTED " , " COMMITTED " ) ;
else if ( Matches ( " SET|BEGIN|START " , " TRANSACTION|WORK " , " ISOLATION " , " LEVEL " , " REPEATABLE " ) | |
Matches ( " BEGIN " , " ISOLATION " , " LEVEL " , " REPEATABLE " ) | |
Matches ( " SET " , " SESSION " , " CHARACTERISTICS " , " AS " , " TRANSACTION " , " ISOLATION " , " LEVEL " , " REPEATABLE " ) )
COMPLETE_WITH ( " READ " ) ;
else if ( Matches ( " SET|BEGIN|START " , " TRANSACTION|WORK " , " READ " ) | |
Matches ( " BEGIN " , " READ " ) | |
Matches ( " SET " , " SESSION " , " CHARACTERISTICS " , " AS " , " TRANSACTION " , " READ " ) )
COMPLETE_WITH ( " ONLY " , " WRITE " ) ;
2012-09-15 04:11:17 +02:00
/* SET CONSTRAINTS */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " SET " , " CONSTRAINTS " ) )
2012-09-15 04:11:17 +02:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_constraints_with_schema , " UNION SELECT 'ALL' " ) ;
2000-06-25 16:25:51 +02:00
/* Complete SET CONSTRAINTS <foo> with DEFERRED|IMMEDIATE */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " SET " , " CONSTRAINTS " , MatchAny ) )
COMPLETE_WITH ( " DEFERRED " , " IMMEDIATE " ) ;
2005-08-14 20:49:30 +02:00
/* Complete SET ROLE */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " SET " , " ROLE " ) )
2005-08-14 20:49:30 +02:00
COMPLETE_WITH_QUERY ( Query_for_list_of_roles ) ;
2001-05-08 23:06:43 +02:00
/* Complete SET SESSION with AUTHORIZATION or CHARACTERISTICS... */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " SET " , " SESSION " ) )
COMPLETE_WITH ( " AUTHORIZATION " , " CHARACTERISTICS AS TRANSACTION " ) ;
2001-05-08 23:06:43 +02:00
/* Complete SET SESSION AUTHORIZATION with username */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " SET " , " SESSION " , " AUTHORIZATION " ) )
2006-02-12 16:25:04 +01:00
COMPLETE_WITH_QUERY ( Query_for_list_of_roles " UNION SELECT 'DEFAULT' " ) ;
2005-11-18 17:31:11 +01:00
/* Complete RESET SESSION with AUTHORIZATION */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " RESET " , " SESSION " ) )
COMPLETE_WITH ( " AUTHORIZATION " ) ;
2000-04-12 19:17:23 +02:00
/* Complete SET <var> with "TO" */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " SET " , MatchAny ) )
COMPLETE_WITH ( " TO " ) ;
2018-04-26 20:47:16 +02:00
/*
* Complete ALTER DATABASE | FUNCTION | | PROCEDURE | ROLE | ROUTINE | USER . . . SET
* < name >
*/
2018-09-22 02:50:18 +02:00
else if ( HeadMatches ( " ALTER " , " DATABASE|FUNCTION|PROCEDURE|ROLE|ROUTINE|USER " ) & &
TailMatches ( " SET " , MatchAny ) )
COMPLETE_WITH ( " FROM CURRENT " , " TO " ) ;
2000-04-12 19:17:23 +02:00
/* Suggest possible variable values */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " SET " , MatchAny , " TO|= " ) )
2000-04-12 19:17:23 +02:00
{
2015-09-08 20:57:35 +02:00
/* special cased code for individual GUCs */
2018-09-22 02:50:18 +02:00
if ( TailMatches ( " DateStyle " , " TO|= " ) )
COMPLETE_WITH ( " ISO " , " SQL " , " Postgres " , " German " ,
" YMD " , " DMY " , " MDY " ,
" US " , " European " , " NonEuropean " ,
" DEFAULT " ) ;
else if ( TailMatches ( " search_path " , " TO|= " ) )
2014-07-12 15:44:39 +02:00
COMPLETE_WITH_QUERY ( Query_for_list_of_schemas
" AND nspname not like 'pg \\ _toast%%' "
" AND nspname not like 'pg \\ _temp%%' "
" UNION SELECT 'DEFAULT' " ) ;
2000-04-12 19:17:23 +02:00
else
{
2015-09-08 20:57:35 +02:00
/* generic, type based, GUC support */
char * guctype = get_guctype ( prev2_wd ) ;
if ( guctype & & strcmp ( guctype , " enum " ) = = 0 )
{
char querybuf [ 1024 ] ;
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
snprintf ( querybuf , sizeof ( querybuf ) , Query_for_enum , prev2_wd ) ;
2015-09-08 20:57:35 +02:00
COMPLETE_WITH_QUERY ( querybuf ) ;
}
else if ( guctype & & strcmp ( guctype , " bool " ) = = 0 )
2018-09-22 02:50:18 +02:00
COMPLETE_WITH ( " on " , " off " , " true " , " false " , " yes " , " no " ,
" 1 " , " 0 " , " DEFAULT " ) ;
2015-09-08 20:57:35 +02:00
else
2018-09-22 02:50:18 +02:00
COMPLETE_WITH ( " DEFAULT " ) ;
2015-09-08 20:57:35 +02:00
if ( guctype )
free ( guctype ) ;
2000-04-12 19:17:23 +02:00
}
}
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
2003-11-06 23:08:15 +01:00
/* START TRANSACTION */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " START " ) )
COMPLETE_WITH ( " TRANSACTION " ) ;
2003-11-06 23:08:15 +01:00
2011-10-24 13:22:59 +02:00
/* TABLE, but not TABLE embedded in other commands */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " TABLE " ) )
2018-09-21 18:41:00 +02:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_selectables , NULL ) ;
2011-10-24 13:22:59 +02:00
2015-06-22 20:13:56 +02:00
/* TABLESAMPLE */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " TABLESAMPLE " ) )
2015-06-22 20:13:56 +02:00
COMPLETE_WITH_QUERY ( Query_for_list_of_tablesample_methods ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " TABLESAMPLE " , MatchAny ) )
COMPLETE_WITH ( " ( " ) ;
2015-06-22 20:13:56 +02:00
2000-06-25 16:25:51 +02:00
/* TRUNCATE */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " TRUNCATE " ) )
2003-10-30 22:37:38 +01:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_tables , NULL ) ;
2000-06-25 16:25:51 +02:00
/* UNLISTEN */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " UNLISTEN " ) )
2010-02-16 23:34:57 +01:00
COMPLETE_WITH_QUERY ( " SELECT pg_catalog.quote_ident(channel) FROM pg_catalog.pg_listening_channels() AS channel WHERE substring(pg_catalog.quote_ident(channel),1,%d)='%s' UNION SELECT '*' " ) ;
2000-06-25 16:25:51 +02:00
In psql's tab completion, change most TailMatches patterns to Matches.
In the refactoring in commit d37b816dc9e8f976c8913296781e08cbd45c5af1,
we mostly kept to the original design whereby only the last few words
on the line were matched to identify a completable pattern. However,
after commit d854118c8df8c413d069f7e88bb01b9e18e4c8ed, there's really
no reason to do it like that: where it's sensible, we can use patterns
that expect to match the entire input line. And mostly, it's sensible.
Matching the entire line greatly reduces the odds of a false match that
leads to offering irrelevant completions. Moreover (though I've not
tried to measure this), it should make tab completion faster since
many of the patterns will be discarded after a single integer comparison
that finds that the wrong number of words appear on the line.
There are certain identifiable places where we still need to use
TailMatches because the statement in question is allowed to appear
embedded in a larger statement. These are just a small minority of
the existing patterns, though, so the benefit of switching where
possible is large.
It's possible that this patch has removed some within-line matching
behaviors that are in fact desirable, but we can put those back when
we get complaints. Most of the removed behaviors are certainly silly.
Michael Paquier, with some further adjustments by me
2016-01-05 02:08:08 +01:00
/* UPDATE --- can be inside EXPLAIN, RULE, etc */
2000-04-12 19:17:23 +02:00
/* If prev. word is UPDATE suggest a list of tables */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " UPDATE " ) )
2010-12-14 04:37:55 +01:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_updatables , NULL ) ;
2000-04-12 19:17:23 +02:00
/* Complete UPDATE <table> with "SET" */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " UPDATE " , MatchAny ) )
COMPLETE_WITH ( " SET " ) ;
In psql's tab completion, change most TailMatches patterns to Matches.
In the refactoring in commit d37b816dc9e8f976c8913296781e08cbd45c5af1,
we mostly kept to the original design whereby only the last few words
on the line were matched to identify a completable pattern. However,
after commit d854118c8df8c413d069f7e88bb01b9e18e4c8ed, there's really
no reason to do it like that: where it's sensible, we can use patterns
that expect to match the entire input line. And mostly, it's sensible.
Matching the entire line greatly reduces the odds of a false match that
leads to offering irrelevant completions. Moreover (though I've not
tried to measure this), it should make tab completion faster since
many of the patterns will be discarded after a single integer comparison
that finds that the wrong number of words appear on the line.
There are certain identifiable places where we still need to use
TailMatches because the statement in question is allowed to appear
embedded in a larger statement. These are just a small minority of
the existing patterns, though, so the benefit of switching where
possible is large.
It's possible that this patch has removed some within-line matching
behaviors that are in fact desirable, but we can put those back when
we get complaints. Most of the removed behaviors are certainly silly.
Michael Paquier, with some further adjustments by me
2016-01-05 02:08:08 +01:00
/* Complete UPDATE <table> SET with list of attributes */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " UPDATE " , MatchAny , " SET " ) )
2006-02-12 08:21:40 +01:00
COMPLETE_WITH_ATTR ( prev2_wd , " " ) ;
In psql's tab completion, change most TailMatches patterns to Matches.
In the refactoring in commit d37b816dc9e8f976c8913296781e08cbd45c5af1,
we mostly kept to the original design whereby only the last few words
on the line were matched to identify a completable pattern. However,
after commit d854118c8df8c413d069f7e88bb01b9e18e4c8ed, there's really
no reason to do it like that: where it's sensible, we can use patterns
that expect to match the entire input line. And mostly, it's sensible.
Matching the entire line greatly reduces the odds of a false match that
leads to offering irrelevant completions. Moreover (though I've not
tried to measure this), it should make tab completion faster since
many of the patterns will be discarded after a single integer comparison
that finds that the wrong number of words appear on the line.
There are certain identifiable places where we still need to use
TailMatches because the statement in question is allowed to appear
embedded in a larger statement. These are just a small minority of
the existing patterns, though, so the benefit of switching where
possible is large.
It's possible that this patch has removed some within-line matching
behaviors that are in fact desirable, but we can put those back when
we get complaints. Most of the removed behaviors are certainly silly.
Michael Paquier, with some further adjustments by me
2016-01-05 02:08:08 +01:00
/* UPDATE <table> SET <attr> = */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " UPDATE " , MatchAny , " SET " , MatchAny ) )
COMPLETE_WITH ( " = " ) ;
2005-05-18 06:47:40 +02:00
2008-12-19 17:25:19 +01:00
/* USER MAPPING */
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER|CREATE|DROP " , " USER " , " MAPPING " ) )
COMPLETE_WITH ( " FOR " ) ;
else if ( Matches ( " CREATE " , " USER " , " MAPPING " , " FOR " ) )
2010-04-07 05:51:19 +02:00
COMPLETE_WITH_QUERY ( Query_for_list_of_roles
" UNION SELECT 'CURRENT_USER' "
" UNION SELECT 'PUBLIC' "
" UNION SELECT 'USER' " ) ;
2018-09-22 02:50:18 +02:00
else if ( Matches ( " ALTER|DROP " , " USER " , " MAPPING " , " FOR " ) )
2008-12-19 17:25:19 +01:00
COMPLETE_WITH_QUERY ( Query_for_list_of_user_mappings ) ;
2018-09-22 02:50:18 +02:00
else if ( Matches ( " CREATE|ALTER|DROP " , " USER " , " MAPPING " , " FOR " , MatchAny ) )
COMPLETE_WITH ( " SERVER " ) ;
else if ( Matches ( " CREATE|ALTER " , " USER " , " MAPPING " , " FOR " , MatchAny , " SERVER " , MatchAny ) )
COMPLETE_WITH ( " OPTIONS " ) ;
2008-12-19 17:25:19 +01:00
2005-05-18 06:47:40 +02:00
/*
Improve tab completion for ANALYZE, EXPLAIN, and VACUUM.
Previously, we made no attempt to provide tab completion in these
statements' optional parenthesized options lists. This patch teaches
psql to do so.
To prevent the option completions from being offered after we've already
seen a complete parenthesized option list, it's necessary to improve
word_matches() so that it allows a wildcard '*' in the middle of an
alternative, not only at the end as formerly. That requires only a
little more code than before, and it allows us to test for "incomplete
parenthesized options" with a test like
else if (HeadMatches2("EXPLAIN", "(*") &&
!HeadMatches2("EXPLAIN", "(*)"))
In addition, add some logic to offer column names in the context of
"ANALYZE tablename ( ...", and likewise for VACUUM. This isn't real
complete; it won't offer column names again after a comma. But it's
better than before, and it doesn't take much code.
Justin Pryzby, reviewed at various times by Álvaro Herrera, Arthur
Zakirov, and Edmund Horner; some additional fixups by me
Discussion: https://postgr.es/m/20180529000623.GA21896@telsasoft.com
2018-09-21 21:22:26 +02:00
* VACUUM [ ( option [ , . . . ] ) ] [ table_and_columns [ , . . . ] ]
* VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] [ ANALYZE ] [ table_and_columns [ , . . . ] ]
2005-05-18 06:47:40 +02:00
*/
2018-09-22 02:50:18 +02:00
else if ( Matches ( " VACUUM " ) )
2018-09-21 18:41:00 +02:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_vacuumables ,
2003-10-29 00:35:52 +01:00
" UNION SELECT 'FULL' "
2005-05-18 06:47:40 +02:00
" UNION SELECT 'FREEZE' "
2003-10-29 00:35:52 +01:00
" UNION SELECT 'ANALYZE' "
" UNION SELECT 'VERBOSE' " ) ;
2018-09-22 02:50:18 +02:00
else if ( Matches ( " VACUUM " , " FULL " ) )
2018-09-21 18:41:00 +02:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_vacuumables ,
Improve tab completion for ANALYZE, EXPLAIN, and VACUUM.
Previously, we made no attempt to provide tab completion in these
statements' optional parenthesized options lists. This patch teaches
psql to do so.
To prevent the option completions from being offered after we've already
seen a complete parenthesized option list, it's necessary to improve
word_matches() so that it allows a wildcard '*' in the middle of an
alternative, not only at the end as formerly. That requires only a
little more code than before, and it allows us to test for "incomplete
parenthesized options" with a test like
else if (HeadMatches2("EXPLAIN", "(*") &&
!HeadMatches2("EXPLAIN", "(*)"))
In addition, add some logic to offer column names in the context of
"ANALYZE tablename ( ...", and likewise for VACUUM. This isn't real
complete; it won't offer column names again after a comma. But it's
better than before, and it doesn't take much code.
Justin Pryzby, reviewed at various times by Álvaro Herrera, Arthur
Zakirov, and Edmund Horner; some additional fixups by me
Discussion: https://postgr.es/m/20180529000623.GA21896@telsasoft.com
2018-09-21 21:22:26 +02:00
" UNION SELECT 'FREEZE' "
2005-05-18 06:47:40 +02:00
" UNION SELECT 'ANALYZE' "
" UNION SELECT 'VERBOSE' " ) ;
2018-09-22 02:50:18 +02:00
else if ( Matches ( " VACUUM " , " FREEZE " ) | |
Matches ( " VACUUM " , " FULL " , " FREEZE " ) )
2018-09-21 18:41:00 +02:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_vacuumables ,
Improve tab completion for ANALYZE, EXPLAIN, and VACUUM.
Previously, we made no attempt to provide tab completion in these
statements' optional parenthesized options lists. This patch teaches
psql to do so.
To prevent the option completions from being offered after we've already
seen a complete parenthesized option list, it's necessary to improve
word_matches() so that it allows a wildcard '*' in the middle of an
alternative, not only at the end as formerly. That requires only a
little more code than before, and it allows us to test for "incomplete
parenthesized options" with a test like
else if (HeadMatches2("EXPLAIN", "(*") &&
!HeadMatches2("EXPLAIN", "(*)"))
In addition, add some logic to offer column names in the context of
"ANALYZE tablename ( ...", and likewise for VACUUM. This isn't real
complete; it won't offer column names again after a comma. But it's
better than before, and it doesn't take much code.
Justin Pryzby, reviewed at various times by Álvaro Herrera, Arthur
Zakirov, and Edmund Horner; some additional fixups by me
Discussion: https://postgr.es/m/20180529000623.GA21896@telsasoft.com
2018-09-21 21:22:26 +02:00
" UNION SELECT 'VERBOSE' "
2005-05-18 06:47:40 +02:00
" UNION SELECT 'ANALYZE' " ) ;
2018-09-22 02:50:18 +02:00
else if ( Matches ( " VACUUM " , " VERBOSE " ) | |
Matches ( " VACUUM " , " FULL|FREEZE " , " VERBOSE " ) | |
Matches ( " VACUUM " , " FULL " , " FREEZE " , " VERBOSE " ) )
2018-09-21 18:41:00 +02:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_vacuumables ,
2005-05-18 06:47:40 +02:00
" UNION SELECT 'ANALYZE' " ) ;
2018-09-22 02:50:18 +02:00
else if ( HeadMatches ( " VACUUM " , " (* " ) & &
! HeadMatches ( " VACUUM " , " (*) " ) )
Improve tab completion for ANALYZE, EXPLAIN, and VACUUM.
Previously, we made no attempt to provide tab completion in these
statements' optional parenthesized options lists. This patch teaches
psql to do so.
To prevent the option completions from being offered after we've already
seen a complete parenthesized option list, it's necessary to improve
word_matches() so that it allows a wildcard '*' in the middle of an
alternative, not only at the end as formerly. That requires only a
little more code than before, and it allows us to test for "incomplete
parenthesized options" with a test like
else if (HeadMatches2("EXPLAIN", "(*") &&
!HeadMatches2("EXPLAIN", "(*)"))
In addition, add some logic to offer column names in the context of
"ANALYZE tablename ( ...", and likewise for VACUUM. This isn't real
complete; it won't offer column names again after a comma. But it's
better than before, and it doesn't take much code.
Justin Pryzby, reviewed at various times by Álvaro Herrera, Arthur
Zakirov, and Edmund Horner; some additional fixups by me
Discussion: https://postgr.es/m/20180529000623.GA21896@telsasoft.com
2018-09-21 21:22:26 +02:00
{
/*
* This fires if we ' re in an unfinished parenthesized option list .
* get_previous_words treats a completed parenthesized option list as
* one word , so the above test is correct .
*/
if ( ends_with ( prev_wd , ' ( ' ) | | ends_with ( prev_wd , ' , ' ) )
2018-09-22 02:50:18 +02:00
COMPLETE_WITH ( " FULL " , " FREEZE " , " ANALYZE " , " VERBOSE " ,
Allow VACUUM to be run with index cleanup disabled.
This commit adds a new reloption, vacuum_index_cleanup, which
controls whether index cleanup is performed for a particular
relation by default. It also adds a new option to the VACUUM
command, INDEX_CLEANUP, which can be used to override the
reloption. If neither the reloption nor the VACUUM option is
used, the default is true, as before.
Masahiko Sawada, reviewed and tested by Nathan Bossart, Alvaro
Herrera, Kyotaro Horiguchi, Darafei Praliaskouski, and me.
The wording of the documentation is mostly due to me.
Discussion: http://postgr.es/m/CAD21AoAt5R3DNUZSjOoXDUY=naYPUOuffVsRzuTYMz29yLzQCA@mail.gmail.com
2019-04-04 20:58:53 +02:00
" DISABLE_PAGE_SKIPPING " , " SKIP_LOCKED " ,
2019-05-07 19:10:33 +02:00
" INDEX_CLEANUP " , " TRUNCATE " ) ;
else if ( TailMatches ( " FULL|FREEZE|ANALYZE|VERBOSE|DISABLE_PAGE_SKIPPING|SKIP_LOCKED|INDEX_CLEANUP|TRUNCATE " ) )
2019-03-29 13:22:49 +01:00
COMPLETE_WITH ( " ON " , " OFF " ) ;
Improve tab completion for ANALYZE, EXPLAIN, and VACUUM.
Previously, we made no attempt to provide tab completion in these
statements' optional parenthesized options lists. This patch teaches
psql to do so.
To prevent the option completions from being offered after we've already
seen a complete parenthesized option list, it's necessary to improve
word_matches() so that it allows a wildcard '*' in the middle of an
alternative, not only at the end as formerly. That requires only a
little more code than before, and it allows us to test for "incomplete
parenthesized options" with a test like
else if (HeadMatches2("EXPLAIN", "(*") &&
!HeadMatches2("EXPLAIN", "(*)"))
In addition, add some logic to offer column names in the context of
"ANALYZE tablename ( ...", and likewise for VACUUM. This isn't real
complete; it won't offer column names again after a comma. But it's
better than before, and it doesn't take much code.
Justin Pryzby, reviewed at various times by Álvaro Herrera, Arthur
Zakirov, and Edmund Horner; some additional fixups by me
Discussion: https://postgr.es/m/20180529000623.GA21896@telsasoft.com
2018-09-21 21:22:26 +02:00
}
2018-09-22 02:50:18 +02:00
else if ( HeadMatches ( " VACUUM " ) & & TailMatches ( " ( " ) )
Improve tab completion for ANALYZE, EXPLAIN, and VACUUM.
Previously, we made no attempt to provide tab completion in these
statements' optional parenthesized options lists. This patch teaches
psql to do so.
To prevent the option completions from being offered after we've already
seen a complete parenthesized option list, it's necessary to improve
word_matches() so that it allows a wildcard '*' in the middle of an
alternative, not only at the end as formerly. That requires only a
little more code than before, and it allows us to test for "incomplete
parenthesized options" with a test like
else if (HeadMatches2("EXPLAIN", "(*") &&
!HeadMatches2("EXPLAIN", "(*)"))
In addition, add some logic to offer column names in the context of
"ANALYZE tablename ( ...", and likewise for VACUUM. This isn't real
complete; it won't offer column names again after a comma. But it's
better than before, and it doesn't take much code.
Justin Pryzby, reviewed at various times by Álvaro Herrera, Arthur
Zakirov, and Edmund Horner; some additional fixups by me
Discussion: https://postgr.es/m/20180529000623.GA21896@telsasoft.com
2018-09-21 21:22:26 +02:00
/* "VACUUM (" should be caught above, so assume we want columns */
COMPLETE_WITH_ATTR ( prev2_wd , " " ) ;
2018-09-22 02:50:18 +02:00
else if ( HeadMatches ( " VACUUM " ) )
2018-09-21 18:41:00 +02:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_vacuumables , NULL ) ;
2005-05-18 06:47:40 +02:00
2008-10-04 23:56:55 +02:00
/* WITH [RECURSIVE] */
2012-06-10 21:20:04 +02:00
/*
* Only match when WITH is the first word , as WITH may appear in many
* other contexts .
*/
2018-09-22 02:50:18 +02:00
else if ( Matches ( " WITH " ) )
COMPLETE_WITH ( " RECURSIVE " ) ;
2008-10-04 23:56:55 +02:00
2002-07-30 18:35:05 +02:00
/* WHERE */
/* Simple case of the word before the where being the table name */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( MatchAny , " WHERE " ) )
2006-02-12 08:21:40 +01:00
COMPLETE_WITH_ATTR ( prev2_wd , " " ) ;
2002-07-30 18:35:05 +02:00
1999-12-10 04:59:30 +01:00
/* ... FROM ... */
2003-03-27 17:45:01 +01:00
/* TODO: also include SRF ? */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " FROM " ) & & ! Matches ( " COPY| \\ copy " , MatchAny , " FROM " ) )
2018-09-21 18:41:00 +02:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_selectables , NULL ) ;
1999-12-10 04:59:30 +01:00
2011-03-03 08:42:02 +01:00
/* ... JOIN ... */
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " JOIN " ) )
2018-09-21 18:41:00 +02:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_selectables , NULL ) ;
2011-03-03 08:42:02 +01:00
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
/* Backslash commands */
2003-03-27 17:45:01 +01:00
/* TODO: \dc \dd \dl */
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ ? " ) )
COMPLETE_WITH_CS ( " commands " , " options " , " variables " ) ;
else if ( TailMatchesCS ( " \\ connect| \\ c " ) )
psql: fix \connect with URIs and conninfo strings
This is the second try at this, after fcef1617295 failed miserably and
had to be reverted: as it turns out, libpq cannot depend on libpgcommon
after all. Instead of shuffling code in the master branch, make that one
just like 9.4 and accept the duplication. (This was all my own mistake,
not the patch submitter's).
psql was already accepting conninfo strings as the first parameter in
\connect, but the way it worked wasn't sane; some of the other
parameters would get the previous connection's values, causing it to
connect to a completely unexpected server or, more likely, not finding
any server at all because of completely wrong combinations of
parameters.
Fix by explicitely checking for a conninfo-looking parameter in the
dbname position; if one is found, use its complete specification rather
than mix with the other arguments. Also, change tab-completion to not
try to complete conninfo/URI-looking "dbnames" and document that
conninfos are accepted as first argument.
There was a weak consensus to backpatch this, because while the behavior
of using the dbname as a conninfo is nowhere documented for \connect, it
is reasonable to expect that it works because it does work in many other
contexts. Therefore this is backpatched all the way back to 9.0.
Author: David Fetter, Andrew Dunstan. Some editorialization by me
(probably earning a Gierth's "Sloppy" badge in the process.)
Reviewers: Andrew Gierth, Erik Rijkers, Pavel Stěhule, Stephen Frost,
Robert Haas, Andrew Dunstan.
2015-04-02 17:30:57 +02:00
{
if ( ! recognized_connection_string ( text ) )
COMPLETE_WITH_QUERY ( Query_for_list_of_databases ) ;
}
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ connect| \\ c " , MatchAny ) )
psql: fix \connect with URIs and conninfo strings
This is the second try at this, after fcef1617295 failed miserably and
had to be reverted: as it turns out, libpq cannot depend on libpgcommon
after all. Instead of shuffling code in the master branch, make that one
just like 9.4 and accept the duplication. (This was all my own mistake,
not the patch submitter's).
psql was already accepting conninfo strings as the first parameter in
\connect, but the way it worked wasn't sane; some of the other
parameters would get the previous connection's values, causing it to
connect to a completely unexpected server or, more likely, not finding
any server at all because of completely wrong combinations of
parameters.
Fix by explicitely checking for a conninfo-looking parameter in the
dbname position; if one is found, use its complete specification rather
than mix with the other arguments. Also, change tab-completion to not
try to complete conninfo/URI-looking "dbnames" and document that
conninfos are accepted as first argument.
There was a weak consensus to backpatch this, because while the behavior
of using the dbname as a conninfo is nowhere documented for \connect, it
is reasonable to expect that it works because it does work in many other
contexts. Therefore this is backpatched all the way back to 9.0.
Author: David Fetter, Andrew Dunstan. Some editorialization by me
(probably earning a Gierth's "Sloppy" badge in the process.)
Reviewers: Andrew Gierth, Erik Rijkers, Pavel Stěhule, Stephen Frost,
Robert Haas, Andrew Dunstan.
2015-04-02 17:30:57 +02:00
{
if ( ! recognized_connection_string ( prev_wd ) )
COMPLETE_WITH_QUERY ( Query_for_list_of_roles ) ;
}
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ da* " ) )
2018-03-05 21:37:23 +01:00
COMPLETE_WITH_VERSIONED_SCHEMA_QUERY ( Query_for_list_of_aggregates , NULL ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ dA* " ) )
2016-06-07 23:59:34 +02:00
COMPLETE_WITH_QUERY ( Query_for_list_of_access_methods ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ db* " ) )
Attached is the third version of my patch that adds/fixes several things
to/in the psql-tabcomplete code. This diff includes the still missing
tab-complete support for TABLESPACE I already sent earlier. New in this
version of the patch is a small adaption of the tab-complete code to
support the adjusted SAVEPOINT-Syntax commited by Tom, as well as
completion of the only half working (and I think only by accident)
tabcomplete-suppport for "BEGIN [ TRANSACTION | WORK ]".
below is a complete list of the things I have changed with this patch:
*) add tablespace support for CREATE/DROP/ALTER and \db
*) sync the list of possible commands following ALTER with the docs (by
adding
AGGREGATE,CONVERSATION,DOMAIN,FUNCTION,LANGUAGE,OPERATOR,SEQUENCE,TABLESPACE
and TYPE)
*) provide a list of valid users after "OWNER TO"
*) tab-complete support for ALTER (AGGREGATE|CONVERSION|FUNCTION)
*) basic tab-complete support for ALTER DOMAIN
*) provide a list of suitable indexes following ALTER TABLE <sth>
CLUSTER ON(?)
*) add "CLUSTER ON" and "SET" to the ALTER TABLE <sth> - tab-complete
list(fixes incorrect/wrong tab-complete with ALTER TABLE <sth> SET
+<TAB> too)
*) provide a list of possible indexes following ALTER TABLE <sth> CLUSTER ON
*) provide list of possible commands(WITHOUT CLUSTER,WITHOUT OIDS,
TABLESPACE) following ALTER TABLE <sth> SET
*) sync "COMMENT ON" with docs by adding "CAST","CONVERSION","FUNCTION"
*) add ABSOLUT to the list of possible commands after FETCH
*) "END" was missing from the sql-commands overview (though it had
completion support!) - i know it's depreciated but we have ABORT and
others still in ...
*) fixes small buglet with ALTER (TRIGGER|CLUSTER) ON autocomplete
(CLUSTER ON +<TAB> would produce CLUSTER ON ON - same for TRIGGER ON)
*) adapt to new SAVEPOINT syntax
*) fix incomplete Support for BEGIN [ TRANSACTION | WORK ]
Stefan Kaltenbrunn
2004-08-20 21:24:59 +02:00
COMPLETE_WITH_QUERY ( Query_for_list_of_tablespaces ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ dD* " ) )
2003-10-30 22:37:38 +01:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_domains , NULL ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ des* " ) )
2008-12-19 17:25:19 +01:00
COMPLETE_WITH_QUERY ( Query_for_list_of_servers ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ deu* " ) )
2008-12-19 17:25:19 +01:00
COMPLETE_WITH_QUERY ( Query_for_list_of_user_mappings ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ dew* " ) )
2008-12-19 17:25:19 +01:00
COMPLETE_WITH_QUERY ( Query_for_list_of_fdws ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ df* " ) )
2018-03-05 21:37:23 +01:00
COMPLETE_WITH_VERSIONED_SCHEMA_QUERY ( Query_for_list_of_functions , NULL ) ;
2016-01-05 18:00:13 +01:00
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ dFd* " ) )
2007-09-14 06:25:24 +02:00
COMPLETE_WITH_QUERY ( Query_for_list_of_ts_dictionaries ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ dFp* " ) )
2007-09-14 06:25:24 +02:00
COMPLETE_WITH_QUERY ( Query_for_list_of_ts_parsers ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ dFt* " ) )
2007-09-14 06:25:24 +02:00
COMPLETE_WITH_QUERY ( Query_for_list_of_ts_templates ) ;
2016-01-05 18:00:13 +01:00
/* must be at end of \dF alternatives: */
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ dF* " ) )
2009-04-06 17:50:59 +02:00
COMPLETE_WITH_QUERY ( Query_for_list_of_ts_configurations ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ di* " ) )
2003-10-30 22:37:38 +01:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_indexes , NULL ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ dL* " ) )
2011-01-20 06:00:30 +01:00
COMPLETE_WITH_QUERY ( Query_for_list_of_languages ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ dn* " ) )
2003-03-27 17:45:01 +01:00
COMPLETE_WITH_QUERY ( Query_for_list_of_schemas ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ dp " ) | | TailMatchesCS ( " \\ z " ) )
2018-09-21 18:41:00 +02:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_grantables , NULL ) ;
2019-04-07 13:59:12 +02:00
else if ( TailMatchesCS ( " \\ dPi* " ) )
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_partitioned_indexes , NULL ) ;
else if ( TailMatchesCS ( " \\ dPt* " ) )
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_partitioned_tables , NULL ) ;
else if ( TailMatchesCS ( " \\ dP* " ) )
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_partitioned_relations , NULL ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ ds* " ) )
2003-10-30 22:37:38 +01:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_sequences , NULL ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ dt* " ) )
2003-10-30 22:37:38 +01:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_tables , NULL ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ dT* " ) )
2003-10-30 22:37:38 +01:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_datatypes , NULL ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ du* " ) | | TailMatchesCS ( " \\ dg* " ) )
2005-08-14 20:49:30 +02:00
COMPLETE_WITH_QUERY ( Query_for_list_of_roles ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ dv* " ) )
2003-10-30 22:37:38 +01:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_views , NULL ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ dx* " ) )
2013-08-15 18:24:25 +02:00
COMPLETE_WITH_QUERY ( Query_for_list_of_extensions ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ dm* " ) )
2013-03-04 01:23:31 +01:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_matviews , NULL ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ dE* " ) )
2015-07-07 16:34:18 +02:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_foreign_tables , NULL ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ dy* " ) )
2015-07-07 16:34:18 +02:00
COMPLETE_WITH_QUERY ( Query_for_list_of_event_triggers ) ;
2009-04-06 17:50:59 +02:00
2016-01-05 18:00:13 +01:00
/* must be at end of \d alternatives: */
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ d* " ) )
2011-06-14 22:45:00 +02:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_relations , NULL ) ;
2009-04-06 17:50:59 +02:00
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ ef " ) )
2018-04-02 18:46:24 +02:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_routines , NULL ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ ev " ) )
2015-07-03 21:48:18 +02:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_views , NULL ) ;
2009-04-08 06:05:16 +02:00
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ encoding " ) )
2003-06-12 03:38:08 +02:00
COMPLETE_WITH_QUERY ( Query_for_list_of_encodings ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ h| \\ help " ) )
2000-04-12 19:17:23 +02:00
COMPLETE_WITH_LIST ( sql_commands ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ h| \\ help " , MatchAny ) )
2017-03-16 23:54:28 +01:00
{
2018-09-22 02:50:18 +02:00
if ( TailMatches ( " DROP " ) )
2017-03-16 23:54:28 +01:00
matches = completion_matches ( text , drop_command_generator ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatches ( " ALTER " ) )
2017-03-16 23:54:28 +01:00
matches = completion_matches ( text , alter_command_generator ) ;
2017-05-17 22:31:56 +02:00
/*
* CREATE is recognized by tail match elsewhere , so doesn ' t need to be
* repeated here
*/
2017-03-16 23:54:28 +01:00
}
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ h| \\ help " , MatchAny , MatchAny ) )
{
if ( TailMatches ( " CREATE|DROP " , " ACCESS " ) )
COMPLETE_WITH ( " METHOD " ) ;
else if ( TailMatches ( " ALTER " , " DEFAULT " ) )
COMPLETE_WITH ( " PRIVILEGES " ) ;
else if ( TailMatches ( " CREATE|ALTER|DROP " , " EVENT " ) )
COMPLETE_WITH ( " TRIGGER " ) ;
else if ( TailMatches ( " CREATE|ALTER|DROP " , " FOREIGN " ) )
COMPLETE_WITH ( " DATA WRAPPER " , " TABLE " ) ;
else if ( TailMatches ( " ALTER " , " LARGE " ) )
COMPLETE_WITH ( " OBJECT " ) ;
else if ( TailMatches ( " CREATE|ALTER|DROP " , " MATERIALIZED " ) )
COMPLETE_WITH ( " VIEW " ) ;
else if ( TailMatches ( " CREATE|ALTER|DROP " , " TEXT " ) )
COMPLETE_WITH ( " SEARCH " ) ;
else if ( TailMatches ( " CREATE|ALTER|DROP " , " USER " ) )
COMPLETE_WITH ( " MAPPING FOR " ) ;
2017-03-16 23:54:28 +01:00
}
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ h| \\ help " , MatchAny , MatchAny , MatchAny ) )
{
if ( TailMatches ( " CREATE|ALTER|DROP " , " FOREIGN " , " DATA " ) )
COMPLETE_WITH ( " WRAPPER " ) ;
else if ( TailMatches ( " CREATE|ALTER|DROP " , " TEXT " , " SEARCH " ) )
COMPLETE_WITH ( " CONFIGURATION " , " DICTIONARY " , " PARSER " , " TEMPLATE " ) ;
else if ( TailMatches ( " CREATE|ALTER|DROP " , " USER " , " MAPPING " ) )
COMPLETE_WITH ( " FOR " ) ;
2017-03-16 23:54:28 +01:00
}
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ l* " ) & & ! TailMatchesCS ( " \\ lo* " ) )
2016-08-18 17:29:16 +02:00
COMPLETE_WITH_QUERY ( Query_for_list_of_databases ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ password " ) )
2005-12-18 03:17:16 +01:00
COMPLETE_WITH_QUERY ( Query_for_list_of_roles ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ pset " ) )
2018-11-26 21:18:55 +01:00
COMPLETE_WITH_CS ( " border " , " columns " , " csv_fieldsep " , " expanded " ,
2018-09-22 02:50:18 +02:00
" fieldsep " , " fieldsep_zero " , " footer " , " format " ,
" linestyle " , " null " , " numericlocale " ,
" pager " , " pager_min_lines " ,
" recordsep " , " recordsep_zero " ,
" tableattr " , " title " , " tuples_only " ,
" unicode_border_linestyle " ,
" unicode_column_linestyle " ,
" unicode_header_linestyle " ) ;
else if ( TailMatchesCS ( " \\ pset " , MatchAny ) )
{
if ( TailMatchesCS ( " format " ) )
2018-11-26 21:18:55 +01:00
COMPLETE_WITH_CS ( " aligned " , " asciidoc " , " csv " , " html " , " latex " ,
2018-11-06 07:04:40 +01:00
" latex-longtable " , " troff-ms " , " unaligned " ,
" wrapped " ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " linestyle " ) )
COMPLETE_WITH_CS ( " ascii " , " old-ascii " , " unicode " ) ;
else if ( TailMatchesCS ( " pager " ) )
COMPLETE_WITH_CS ( " on " , " off " , " always " ) ;
else if ( TailMatchesCS ( " unicode_border_linestyle| "
" unicode_column_linestyle| "
" unicode_header_linestyle " ) )
COMPLETE_WITH_CS ( " single " , " double " ) ;
2011-03-16 22:46:15 +01:00
}
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ unset " ) )
2014-08-12 04:57:39 +02:00
matches = complete_from_variables ( text , " " , " " , true ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ set " ) )
2014-08-12 04:57:39 +02:00
matches = complete_from_variables ( text , " " , " " , false ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ set " , MatchAny ) )
{
if ( TailMatchesCS ( " AUTOCOMMIT|ON_ERROR_STOP|QUIET| "
" SINGLELINE|SINGLESTEP " ) )
COMPLETE_WITH_CS ( " on " , " off " ) ;
else if ( TailMatchesCS ( " COMP_KEYWORD_CASE " ) )
COMPLETE_WITH_CS ( " lower " , " upper " ,
" preserve-lower " , " preserve-upper " ) ;
else if ( TailMatchesCS ( " ECHO " ) )
COMPLETE_WITH_CS ( " errors " , " queries " , " all " , " none " ) ;
else if ( TailMatchesCS ( " ECHO_HIDDEN " ) )
COMPLETE_WITH_CS ( " noexec " , " off " , " on " ) ;
else if ( TailMatchesCS ( " HISTCONTROL " ) )
COMPLETE_WITH_CS ( " ignorespace " , " ignoredups " ,
" ignoreboth " , " none " ) ;
else if ( TailMatchesCS ( " ON_ERROR_ROLLBACK " ) )
COMPLETE_WITH_CS ( " on " , " off " , " interactive " ) ;
else if ( TailMatchesCS ( " SHOW_CONTEXT " ) )
COMPLETE_WITH_CS ( " never " , " errors " , " always " ) ;
else if ( TailMatchesCS ( " VERBOSITY " ) )
2019-04-04 23:22:02 +02:00
COMPLETE_WITH_CS ( " default " , " verbose " , " terse " , " sqlstate " ) ;
2010-10-11 00:42:35 +02:00
}
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ sf* " ) )
2018-04-02 18:46:24 +02:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_routines , NULL ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ sv* " ) )
2015-07-03 21:48:18 +02:00
COMPLETE_WITH_SCHEMA_QUERY ( Query_for_list_of_views , NULL ) ;
2018-09-22 02:50:18 +02:00
else if ( TailMatchesCS ( " \\ cd| \\ e| \\ edit| \\ g| \\ i| \\ include| "
" \\ ir| \\ include_relative| \\ o| \\ out| "
" \\ s| \\ w| \\ write| \\ lo_import " ) )
2012-02-28 05:06:29 +01:00
{
completion_charp = " \\ " ;
matches = completion_matches ( text , complete_from_files ) ;
}
2000-04-12 19:17:23 +02:00
2005-11-14 18:48:43 +01:00
/*
* Finally , we look through the list of " things " , such as TABLE , INDEX and
* check if that was the previous word . If so , execute the query to get a
* list of them .
*/
2000-04-12 19:17:23 +02:00
else
{
int i ;
for ( i = 0 ; words_after_create [ i ] . name ; i + + )
2003-10-30 22:37:38 +01:00
{
2004-05-07 02:24:59 +02:00
if ( pg_strcasecmp ( prev_wd , words_after_create [ i ] . name ) = = 0 )
2000-04-12 19:17:23 +02:00
{
2003-10-30 22:37:38 +01:00
if ( words_after_create [ i ] . query )
2003-03-27 17:45:01 +01:00
COMPLETE_WITH_QUERY ( words_after_create [ i ] . query ) ;
2018-03-05 21:37:23 +01:00
else if ( words_after_create [ i ] . vquery )
COMPLETE_WITH_VERSIONED_QUERY ( words_after_create [ i ] . vquery ) ;
2003-10-30 22:37:38 +01:00
else if ( words_after_create [ i ] . squery )
2018-03-05 21:37:23 +01:00
COMPLETE_WITH_VERSIONED_SCHEMA_QUERY ( words_after_create [ i ] . squery ,
NULL ) ;
2000-04-12 19:17:23 +02:00
break ;
}
2003-10-30 22:37:38 +01:00
}
2000-04-12 19:17:23 +02:00
}
2005-11-14 18:48:43 +01:00
/*
* If we still don ' t have anything to match we have to fabricate some sort
* of default list . If we were to just return NULL , readline automatically
* attempts filename completion , and that ' s usually no good .
*/
if ( matches = = NULL )
{
2018-09-22 02:50:18 +02:00
COMPLETE_WITH ( " " ) ;
2000-01-22 00:32:36 +01:00
# ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
2005-11-14 18:48:43 +01:00
rl_completion_append_character = ' \0 ' ;
2000-01-22 00:32:36 +01:00
# endif
2005-11-14 18:48:43 +01:00
}
/* free storage */
Teach psql's tab completion to consider the entire input string.
Up to now, the tab completion logic has only examined the last few words
of the current input line; "last few" being originally as few as four
words, but lately up to nine words. Furthermore, it only looked at what
libreadline considers the current line of input, which made it rather
myopic if you split your command across lines. This was tolerable,
sort of, so long as the match patterns were only designed to consider the
last few words of input; but with the recent addition of HeadMatches()
and Matches() matching rules, we really have to do better if we want
those to behave sanely.
Hence, change the code to break the entire line down into words, and to
include any previous lines in the command buffer along with the active
readline input buffer.
This will be a little bit slower than the previous coding, but some
measurements say that even a query of several thousand characters can be
parsed in a hundred or so microseconds on modern machines; so it's really
not going to be significant for interactive tab completion. To reduce
the cost some, I arranged to avoid the per-word malloc calls that used
to occur: all the words are now kept in one malloc'd buffer.
2015-12-20 19:28:11 +01:00
free ( previous_words ) ;
free ( words_buffer ) ;
2005-11-14 18:48:43 +01:00
/* Return our Grand List O' Matches */
return matches ;
}
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
2010-10-11 00:42:35 +02:00
/*
* GENERATOR FUNCTIONS
*
* These functions do all the actual work of completing the input . They get
* passed the text so far and the count how many times they have been called
* so far with the same text .
* If you read the above carefully , you ' ll see that these don ' t get called
* directly but through the readline interface .
* The return value is expected to be the full completion of the text , going
* through a list each time , or NULL if there are no more matches . The string
* will be free ( ) ' d by readline , so you must run it through strdup ( ) or
* something of that sort .
*/
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
2010-10-11 00:42:35 +02:00
/*
2011-02-24 02:13:27 +01:00
* Common routine for create_command_generator and drop_command_generator .
* Entries that have ' excluded ' flags are not returned .
2010-10-11 00:42:35 +02:00
*/
2005-11-14 18:48:43 +01:00
static char *
2011-02-24 02:13:27 +01:00
create_or_drop_command_generator ( const char * text , int state , bits32 excluded )
2005-11-14 18:48:43 +01:00
{
2007-11-15 22:14:46 +01:00
static int list_index ,
string_length ;
2005-11-14 18:48:43 +01:00
const char * name ;
/* If this is the first time for this completion, init some values */
if ( state = = 0 )
{
list_index = 0 ;
string_length = strlen ( text ) ;
}
/* find something that matches */
while ( ( name = words_after_create [ list_index + + ] . name ) )
2007-09-14 06:25:24 +02:00
{
2010-10-11 00:42:35 +02:00
if ( ( pg_strncasecmp ( name , text , string_length ) = = 0 ) & &
2011-02-24 02:13:27 +01:00
! ( words_after_create [ list_index - 1 ] . flags & excluded ) )
2012-05-08 20:03:45 +02:00
return pg_strdup_keyword_case ( name , text ) ;
2007-09-14 06:25:24 +02:00
}
2005-11-14 18:48:43 +01:00
/* if nothing matches, return NULL */
return NULL ;
}
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
2011-02-24 02:13:27 +01:00
/*
* This one gives you one from a list of things you can put after CREATE
* as defined above .
*/
static char *
create_command_generator ( const char * text , int state )
{
return create_or_drop_command_generator ( text , state , THING_NO_CREATE ) ;
}
2006-04-02 11:02:41 +02:00
/*
* This function gives you a list of things you can put after a DROP command .
*/
static char *
drop_command_generator ( const char * text , int state )
{
2011-02-24 02:13:27 +01:00
return create_or_drop_command_generator ( text , state , THING_NO_DROP ) ;
2006-04-02 11:02:41 +02:00
}
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
2017-03-16 23:54:28 +01:00
/*
* This function gives you a list of things you can put after an ALTER command .
*/
static char *
alter_command_generator ( const char * text , int state )
{
return create_or_drop_command_generator ( text , state , THING_NO_ALTER ) ;
}
2018-03-05 21:37:23 +01:00
/*
* These functions generate lists using server queries .
* They are all wrappers for _complete_from_query .
*/
2003-03-27 17:45:01 +01:00
2005-11-14 18:48:43 +01:00
static char *
complete_from_query ( const char * text , int state )
{
2018-03-05 21:37:23 +01:00
/* query is assumed to work for any server version */
return _complete_from_query ( completion_charp , NULL , text , state ) ;
}
static char *
complete_from_versioned_query ( const char * text , int state )
{
const VersionedQuery * vquery = completion_vquery ;
/* Find appropriate array element */
while ( pset . sversion < vquery - > min_server_version )
vquery + + ;
/* Fail completion if server is too old */
if ( vquery - > query = = NULL )
return NULL ;
return _complete_from_query ( vquery - > query , NULL , text , state ) ;
2005-11-14 18:48:43 +01:00
}
2003-03-27 17:45:01 +01:00
2005-11-14 18:48:43 +01:00
static char *
complete_from_schema_query ( const char * text , int state )
{
2018-03-05 21:37:23 +01:00
/* query is assumed to work for any server version */
return _complete_from_query ( completion_charp , completion_squery ,
text , state ) ;
}
static char *
complete_from_versioned_schema_query ( const char * text , int state )
{
const SchemaQuery * squery = completion_squery ;
const VersionedQuery * vquery = completion_vquery ;
/* Find appropriate array element */
while ( pset . sversion < squery - > min_server_version )
squery + + ;
/* Fail completion if server is too old */
if ( squery - > catname = = NULL )
return NULL ;
/* Likewise for the add-on text, if any */
if ( vquery )
{
while ( pset . sversion < vquery - > min_server_version )
vquery + + ;
if ( vquery - > query = = NULL )
return NULL ;
}
return _complete_from_query ( vquery ? vquery - > query : NULL ,
squery , text , state ) ;
2005-11-14 18:48:43 +01:00
}
2003-03-27 17:45:01 +01:00
2010-10-11 00:42:35 +02:00
/*
2018-03-05 21:37:23 +01:00
* This creates a list of matching things , according to a query described by
* the initial arguments . The caller has already done any work needed to
* select the appropriate query for the server ' s version .
*
2010-10-11 00:42:35 +02:00
* The query can be one of two kinds :
*
* 1. A simple query which must contain a % d and a % s , which will be replaced
* by the string length of the text and the text itself . The query may also
* have up to four more % s in it ; the first two such will be replaced by the
* value of completion_info_charp , the next two by the value of
* completion_info_charp2 .
*
* 2. A schema query used for completion of both schema and relation names .
* These are more complex and must contain in the following order :
* % d % s % d % s % d % s % s % d % s
* where % d is the string length of the text and % s the text itself .
*
2018-03-05 21:37:23 +01:00
* If both simple_query and schema_query are non - NULL , then we construct
* a schema query and append the ( uninterpreted ) string simple_query to it .
*
2010-10-11 00:42:35 +02:00
* It is assumed that strings should be escaped to become SQL literals
* ( that is , what is in the query is actually . . . ' % s ' . . . )
*
* See top of file for examples of both kinds of query .
2018-03-05 21:37:23 +01:00
*
* " text " and " state " are supplied by readline .
2010-10-11 00:42:35 +02:00
*/
2005-11-14 18:48:43 +01:00
static char *
2018-03-05 21:37:23 +01:00
_complete_from_query ( const char * simple_query ,
const SchemaQuery * schema_query ,
const char * text , int state )
2005-11-14 18:48:43 +01:00
{
static int list_index ,
2016-03-04 17:53:20 +01:00
byte_length ;
2005-11-14 18:48:43 +01:00
static PGresult * result = NULL ;
2016-06-10 00:02:36 +02:00
2005-11-14 18:48:43 +01:00
/*
* If this is the first time for this completion , we fetch a list of our
* " things " from the backend .
*/
if ( state = = 0 )
{
PQExpBufferData query_buffer ;
char * e_text ;
char * e_info_charp ;
2008-03-29 20:19:14 +01:00
char * e_info_charp2 ;
2016-03-04 17:53:20 +01:00
const char * pstr = text ;
int char_length = 0 ;
2005-11-14 18:48:43 +01:00
list_index = 0 ;
2016-03-04 17:53:20 +01:00
byte_length = strlen ( text ) ;
2016-06-10 00:02:36 +02:00
/*
* Count length as number of characters ( not bytes ) , for passing to
* substring
*/
2016-03-04 17:53:20 +01:00
while ( * pstr )
{
char_length + + ;
pstr + = PQmblen ( pstr , pset . encoding ) ;
}
2005-11-14 18:48:43 +01:00
/* Free any prior result */
PQclear ( result ) ;
result = NULL ;
/* Set up suitably-escaped copies of textual inputs */
2015-09-08 20:57:35 +02:00
e_text = escape_string ( text ) ;
2005-11-14 18:48:43 +01:00
if ( completion_info_charp )
2015-09-08 20:57:35 +02:00
e_info_charp = escape_string ( completion_info_charp ) ;
2005-11-14 18:48:43 +01:00
else
e_info_charp = NULL ;
2008-03-29 20:19:14 +01:00
if ( completion_info_charp2 )
2015-09-08 20:57:35 +02:00
e_info_charp2 = escape_string ( completion_info_charp2 ) ;
2008-03-29 20:19:14 +01:00
else
e_info_charp2 = NULL ;
2005-11-14 18:48:43 +01:00
initPQExpBuffer ( & query_buffer ) ;
2018-03-05 21:37:23 +01:00
if ( schema_query )
2005-11-14 18:48:43 +01:00
{
2018-03-05 21:37:23 +01:00
/* schema_query gives us the pieces to assemble */
const char * qualresult = schema_query - > qualresult ;
2005-11-14 18:48:43 +01:00
if ( qualresult = = NULL )
2018-03-05 21:37:23 +01:00
qualresult = schema_query - > result ;
2005-11-14 18:48:43 +01:00
/* Get unqualified names matching the input-so-far */
appendPQExpBuffer ( & query_buffer , " SELECT %s FROM %s WHERE " ,
2018-03-05 21:37:23 +01:00
schema_query - > result ,
schema_query - > catname ) ;
if ( schema_query - > selcondition )
2005-11-14 18:48:43 +01:00
appendPQExpBuffer ( & query_buffer , " %s AND " ,
2018-03-05 21:37:23 +01:00
schema_query - > selcondition ) ;
2005-11-14 18:48:43 +01:00
appendPQExpBuffer ( & query_buffer , " substring(%s,1,%d)='%s' " ,
2018-03-05 21:37:23 +01:00
schema_query - > result ,
2016-03-04 17:53:20 +01:00
char_length , e_text ) ;
2005-11-14 18:48:43 +01:00
appendPQExpBuffer ( & query_buffer , " AND %s " ,
2018-03-05 21:37:23 +01:00
schema_query - > viscondition ) ;
2005-11-14 18:48:43 +01:00
/*
* When fetching relation names , suppress system catalogs unless
2014-05-06 18:12:18 +02:00
* the input - so - far begins with " pg_ " . This is a compromise
2005-11-14 18:48:43 +01:00
* between not offering system catalogs for completion at all , and
* having them swamp the result when the input is just " p " .
*/
2018-03-05 21:37:23 +01:00
if ( strcmp ( schema_query - > catname ,
2005-11-14 18:48:43 +01:00
" pg_catalog.pg_class c " ) = = 0 & &
strncmp ( text , " pg_ " , 3 ) ! = 0 )
{
2013-11-18 17:29:01 +01:00
appendPQExpBufferStr ( & query_buffer ,
" AND c.relnamespace <> (SELECT oid FROM "
Phase 3 of pgindent updates.
Don't move parenthesized lines to the left, even if that means they
flow past the right margin.
By default, BSD indent lines up statement continuation lines that are
within parentheses so that they start just to the right of the preceding
left parenthesis. However, traditionally, if that resulted in the
continuation line extending to the right of the desired right margin,
then indent would push it left just far enough to not overrun the margin,
if it could do so without making the continuation line start to the left of
the current statement indent. That makes for a weird mix of indentations
unless one has been completely rigid about never violating the 80-column
limit.
This behavior has been pretty universally panned by Postgres developers.
Hence, disable it with indent's new -lpl switch, so that parenthesized
lines are always lined up with the preceding left paren.
This patch is much less interesting than the first round of indent
changes, but also bulkier, so I thought it best to separate the effects.
Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org
Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us
2017-06-21 21:35:54 +02:00
" pg_catalog.pg_namespace WHERE nspname = 'pg_catalog') " ) ;
2005-11-14 18:48:43 +01:00
}
/*
* Add in matching schema names , but only if there is more than
* one potential match among schema names .
*/
appendPQExpBuffer ( & query_buffer , " \n UNION \n "
Phase 3 of pgindent updates.
Don't move parenthesized lines to the left, even if that means they
flow past the right margin.
By default, BSD indent lines up statement continuation lines that are
within parentheses so that they start just to the right of the preceding
left parenthesis. However, traditionally, if that resulted in the
continuation line extending to the right of the desired right margin,
then indent would push it left just far enough to not overrun the margin,
if it could do so without making the continuation line start to the left of
the current statement indent. That makes for a weird mix of indentations
unless one has been completely rigid about never violating the 80-column
limit.
This behavior has been pretty universally panned by Postgres developers.
Hence, disable it with indent's new -lpl switch, so that parenthesized
lines are always lined up with the preceding left paren.
This patch is much less interesting than the first round of indent
changes, but also bulkier, so I thought it best to separate the effects.
Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org
Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us
2017-06-21 21:35:54 +02:00
" SELECT pg_catalog.quote_ident(n.nspname) || '.' "
2005-11-14 18:48:43 +01:00
" FROM pg_catalog.pg_namespace n "
" WHERE substring(pg_catalog.quote_ident(n.nspname) || '.',1,%d)='%s' " ,
2016-03-04 17:53:20 +01:00
char_length , e_text ) ;
2005-11-14 18:48:43 +01:00
appendPQExpBuffer ( & query_buffer ,
" AND (SELECT pg_catalog.count(*) "
" FROM pg_catalog.pg_namespace "
Phase 3 of pgindent updates.
Don't move parenthesized lines to the left, even if that means they
flow past the right margin.
By default, BSD indent lines up statement continuation lines that are
within parentheses so that they start just to the right of the preceding
left parenthesis. However, traditionally, if that resulted in the
continuation line extending to the right of the desired right margin,
then indent would push it left just far enough to not overrun the margin,
if it could do so without making the continuation line start to the left of
the current statement indent. That makes for a weird mix of indentations
unless one has been completely rigid about never violating the 80-column
limit.
This behavior has been pretty universally panned by Postgres developers.
Hence, disable it with indent's new -lpl switch, so that parenthesized
lines are always lined up with the preceding left paren.
This patch is much less interesting than the first round of indent
changes, but also bulkier, so I thought it best to separate the effects.
Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org
Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us
2017-06-21 21:35:54 +02:00
" WHERE substring(pg_catalog.quote_ident(nspname) || '.',1,%d) = "
2005-11-14 18:48:43 +01:00
" substring('%s',1,pg_catalog.length(pg_catalog.quote_ident(nspname))+1)) > 1 " ,
2016-03-04 17:53:20 +01:00
char_length , e_text ) ;
2005-11-14 18:48:43 +01:00
/*
* Add in matching qualified names , but only if there is exactly
* one schema matching the input - so - far .
*/
appendPQExpBuffer ( & query_buffer , " \n UNION \n "
Phase 3 of pgindent updates.
Don't move parenthesized lines to the left, even if that means they
flow past the right margin.
By default, BSD indent lines up statement continuation lines that are
within parentheses so that they start just to the right of the preceding
left parenthesis. However, traditionally, if that resulted in the
continuation line extending to the right of the desired right margin,
then indent would push it left just far enough to not overrun the margin,
if it could do so without making the continuation line start to the left of
the current statement indent. That makes for a weird mix of indentations
unless one has been completely rigid about never violating the 80-column
limit.
This behavior has been pretty universally panned by Postgres developers.
Hence, disable it with indent's new -lpl switch, so that parenthesized
lines are always lined up with the preceding left paren.
This patch is much less interesting than the first round of indent
changes, but also bulkier, so I thought it best to separate the effects.
Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org
Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us
2017-06-21 21:35:54 +02:00
" SELECT pg_catalog.quote_ident(n.nspname) || '.' || %s "
2005-11-14 18:48:43 +01:00
" FROM %s, pg_catalog.pg_namespace n "
" WHERE %s = n.oid AND " ,
qualresult ,
2018-03-05 21:37:23 +01:00
schema_query - > catname ,
schema_query - > namespace ) ;
if ( schema_query - > selcondition )
2005-11-14 18:48:43 +01:00
appendPQExpBuffer ( & query_buffer , " %s AND " ,
2018-03-05 21:37:23 +01:00
schema_query - > selcondition ) ;
2005-11-14 18:48:43 +01:00
appendPQExpBuffer ( & query_buffer , " substring(pg_catalog.quote_ident(n.nspname) || '.' || %s,1,%d)='%s' " ,
qualresult ,
2016-03-04 17:53:20 +01:00
char_length , e_text ) ;
2005-11-14 18:48:43 +01:00
/*
* This condition exploits the single - matching - schema rule to
* speed up the query
*/
appendPQExpBuffer ( & query_buffer ,
Phase 3 of pgindent updates.
Don't move parenthesized lines to the left, even if that means they
flow past the right margin.
By default, BSD indent lines up statement continuation lines that are
within parentheses so that they start just to the right of the preceding
left parenthesis. However, traditionally, if that resulted in the
continuation line extending to the right of the desired right margin,
then indent would push it left just far enough to not overrun the margin,
if it could do so without making the continuation line start to the left of
the current statement indent. That makes for a weird mix of indentations
unless one has been completely rigid about never violating the 80-column
limit.
This behavior has been pretty universally panned by Postgres developers.
Hence, disable it with indent's new -lpl switch, so that parenthesized
lines are always lined up with the preceding left paren.
This patch is much less interesting than the first round of indent
changes, but also bulkier, so I thought it best to separate the effects.
Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org
Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us
2017-06-21 21:35:54 +02:00
" AND substring(pg_catalog.quote_ident(n.nspname) || '.',1,%d) = "
2005-11-14 18:48:43 +01:00
" substring('%s',1,pg_catalog.length(pg_catalog.quote_ident(n.nspname))+1) " ,
2016-03-04 17:53:20 +01:00
char_length , e_text ) ;
2005-11-14 18:48:43 +01:00
appendPQExpBuffer ( & query_buffer ,
" AND (SELECT pg_catalog.count(*) "
" FROM pg_catalog.pg_namespace "
Phase 3 of pgindent updates.
Don't move parenthesized lines to the left, even if that means they
flow past the right margin.
By default, BSD indent lines up statement continuation lines that are
within parentheses so that they start just to the right of the preceding
left parenthesis. However, traditionally, if that resulted in the
continuation line extending to the right of the desired right margin,
then indent would push it left just far enough to not overrun the margin,
if it could do so without making the continuation line start to the left of
the current statement indent. That makes for a weird mix of indentations
unless one has been completely rigid about never violating the 80-column
limit.
This behavior has been pretty universally panned by Postgres developers.
Hence, disable it with indent's new -lpl switch, so that parenthesized
lines are always lined up with the preceding left paren.
This patch is much less interesting than the first round of indent
changes, but also bulkier, so I thought it best to separate the effects.
Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org
Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us
2017-06-21 21:35:54 +02:00
" WHERE substring(pg_catalog.quote_ident(nspname) || '.',1,%d) = "
2005-11-14 18:48:43 +01:00
" substring('%s',1,pg_catalog.length(pg_catalog.quote_ident(nspname))+1)) = 1 " ,
2016-03-04 17:53:20 +01:00
char_length , e_text ) ;
2005-11-14 18:48:43 +01:00
/* If an addon query was provided, use it */
2018-03-05 21:37:23 +01:00
if ( simple_query )
appendPQExpBuffer ( & query_buffer , " \n %s " , simple_query ) ;
2005-11-14 18:48:43 +01:00
}
else
{
2018-03-05 21:37:23 +01:00
Assert ( simple_query ) ;
/* simple_query is an sprintf-style format string */
appendPQExpBuffer ( & query_buffer , simple_query ,
2016-03-04 17:53:20 +01:00
char_length , e_text ,
2008-03-29 20:19:14 +01:00
e_info_charp , e_info_charp ,
e_info_charp2 , e_info_charp2 ) ;
2005-11-14 18:48:43 +01:00
}
/* Limit the number of records in the result */
appendPQExpBuffer ( & query_buffer , " \n LIMIT %d " ,
completion_max_records ) ;
result = exec_query ( query_buffer . data ) ;
termPQExpBuffer ( & query_buffer ) ;
free ( e_text ) ;
if ( e_info_charp )
free ( e_info_charp ) ;
2008-03-29 20:19:14 +01:00
if ( e_info_charp2 )
free ( e_info_charp2 ) ;
2005-11-14 18:48:43 +01:00
}
/* Find something that matches */
if ( result & & PQresultStatus ( result ) = = PGRES_TUPLES_OK )
{
const char * item ;
while ( list_index < PQntuples ( result ) & &
( item = PQgetvalue ( result , list_index + + , 0 ) ) )
2016-03-04 17:53:20 +01:00
if ( pg_strncasecmp ( text , item , byte_length ) = = 0 )
2005-11-14 18:48:43 +01:00
return pg_strdup ( item ) ;
}
/* If nothing matches, free the db structure and return null */
PQclear ( result ) ;
result = NULL ;
return NULL ;
}
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
2010-10-11 00:42:35 +02:00
/*
* This function returns in order one of a fixed , NULL pointer terminated list
* of strings ( if matching ) . This can be used if there are only a fixed number
* SQL words that can appear at certain spot .
*/
2005-11-14 18:48:43 +01:00
static char *
complete_from_list ( const char * text , int state )
{
static int string_length ,
list_index ,
matches ;
static bool casesensitive ;
const char * item ;
/* need to have a list */
2012-12-15 00:03:07 +01:00
Assert ( completion_charpp ! = NULL ) ;
2005-11-14 18:48:43 +01:00
/* Initialization */
if ( state = = 0 )
{
list_index = 0 ;
string_length = strlen ( text ) ;
2012-02-01 19:16:40 +01:00
casesensitive = completion_case_sensitive ;
2005-11-14 18:48:43 +01:00
matches = 0 ;
}
while ( ( item = completion_charpp [ list_index + + ] ) )
{
/* First pass is case sensitive */
if ( casesensitive & & strncmp ( text , item , string_length ) = = 0 )
{
matches + + ;
return pg_strdup ( item ) ;
}
/* Second pass is case insensitive, don't bother counting matches */
if ( ! casesensitive & & pg_strncasecmp ( text , item , string_length ) = = 0 )
2012-02-01 19:16:40 +01:00
{
if ( completion_case_sensitive )
return pg_strdup ( item ) ;
else
2012-06-10 21:20:04 +02:00
/*
* If case insensitive matching was requested initially ,
* adjust the case according to setting .
*/
2012-05-08 20:03:45 +02:00
return pg_strdup_keyword_case ( item , text ) ;
2012-02-01 19:16:40 +01:00
}
2005-11-14 18:48:43 +01:00
}
/*
* No matches found . If we ' re not case insensitive already , lets switch to
* being case insensitive and try again
*/
if ( casesensitive & & matches = = 0 )
{
casesensitive = false ;
list_index = 0 ;
state + + ;
2006-01-11 09:43:13 +01:00
return complete_from_list ( text , state ) ;
2005-11-14 18:48:43 +01:00
}
/* If no more matches, return null. */
return NULL ;
}
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
2010-10-11 00:42:35 +02:00
/*
* This function returns one fixed string the first time even if it doesn ' t
* match what ' s there , and nothing the second time . This should be used if
* there is only one possibility that can appear at a certain spot , so
* misspellings will be overwritten . The string to be passed must be in
* completion_charp .
*/
2005-11-14 18:48:43 +01:00
static char *
complete_from_const ( const char * text , int state )
{
2012-12-15 00:03:07 +01:00
Assert ( completion_charp ! = NULL ) ;
2005-11-14 18:48:43 +01:00
if ( state = = 0 )
2012-02-01 19:16:40 +01:00
{
if ( completion_case_sensitive )
return pg_strdup ( completion_charp ) ;
else
2012-06-10 21:20:04 +02:00
/*
* If case insensitive matching was requested initially , adjust
* the case according to setting .
*/
2012-05-08 20:03:45 +02:00
return pg_strdup_keyword_case ( completion_charp , text ) ;
2012-02-01 19:16:40 +01:00
}
2005-11-14 18:48:43 +01:00
else
return NULL ;
}
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
2014-08-12 04:57:39 +02:00
/*
* This function appends the variable name with prefix and suffix to
* the variable names array .
*/
static void
append_variable_names ( char * * * varnames , int * nvars ,
int * maxvars , const char * varname ,
const char * prefix , const char * suffix )
{
if ( * nvars > = * maxvars )
{
* maxvars * = 2 ;
2014-11-18 19:28:06 +01:00
* varnames = ( char * * ) pg_realloc ( * varnames ,
( ( * maxvars ) + 1 ) * sizeof ( char * ) ) ;
2014-08-12 04:57:39 +02:00
}
( * varnames ) [ ( * nvars ) + + ] = psprintf ( " %s%s%s " , prefix , varname , suffix ) ;
}
2010-10-11 00:42:35 +02:00
/*
* This function supports completion with the name of a psql variable .
* The variable names can be prefixed and suffixed with additional text
Clean up psql's behavior for a few more control variables.
Modify FETCH_COUNT to always have a defined value, like other control
variables, mainly so it will always appear in "\set" output.
Add hooks to force HISTSIZE to be defined and require it to have an
integer value. (I don't see any point in allowing it to be set to
non-integral values.)
Add hooks to force IGNOREEOF to be defined and require it to have an
integer value. Unlike the other cases, here we're trying to be
bug-compatible with a rather bogus externally-defined behavior, so I think
we need to continue to allow "\set IGNOREEOF whatever". Fix it so that
the substitution hook silently replace non-numeric values with "10",
so that the stored value always reflects what we're really doing.
Add a dummy assign hook for HISTFILE, just so it's always in
variables.c's list. We can't require it to be defined always, because
that would break the interaction with the PSQL_HISTORY environment
variable, so there isn't any change in visible behavior here.
Remove tab-complete.c's private list of known variable names, since that's
really a maintenance nuisance. Given the preceding changes, there are no
control variables it won't show anyway. This does mean that if for some
reason you've unset one of the status variables (DBNAME, HOST, etc), that
variable would not appear in tab completion for \set. But I think that's
fine, for at least two reasons: we shouldn't be encouraging people to use
those variables as regular variables, and if someone does do so anyway,
why shouldn't it act just like a regular variable?
Remove ugly and no-longer-used-anywhere GetVariableNum(). In general,
future additions of integer-valued control variables should follow the
paradigm of adding an assign hook using ParseVariableNum(), so there's
no reason to expect we'd need this again later.
Discussion: https://postgr.es/m/17516.1485973973@sss.pgh.pa.us
2017-02-03 02:16:17 +01:00
* to support quoting usages . If need_value is true , only variables
* that are currently set are included ; otherwise , special variables
* ( those that have hooks ) are included even if currently unset .
2010-10-11 00:42:35 +02:00
*/
static char * *
2014-08-12 04:57:39 +02:00
complete_from_variables ( const char * text , const char * prefix , const char * suffix ,
bool need_value )
2010-10-11 00:42:35 +02:00
{
char * * matches ;
2012-01-31 20:23:17 +01:00
char * * varnames ;
2010-10-11 00:42:35 +02:00
int nvars = 0 ;
int maxvars = 100 ;
int i ;
struct _variable * ptr ;
2012-01-31 20:23:17 +01:00
varnames = ( char * * ) pg_malloc ( ( maxvars + 1 ) * sizeof ( char * ) ) ;
2010-10-11 00:42:35 +02:00
for ( ptr = pset . vars - > next ; ptr ; ptr = ptr - > next )
{
2014-08-12 04:57:39 +02:00
if ( need_value & & ! ( ptr - > value ) )
continue ;
append_variable_names ( & varnames , & nvars , & maxvars , ptr - > name ,
prefix , suffix ) ;
2010-10-11 00:42:35 +02:00
}
varnames [ nvars ] = NULL ;
2012-06-10 21:20:04 +02:00
COMPLETE_WITH_LIST_CS ( ( const char * const * ) varnames ) ;
2010-10-11 00:42:35 +02:00
for ( i = 0 ; i < nvars ; i + + )
2012-01-31 20:23:17 +01:00
free ( varnames [ i ] ) ;
2010-10-11 00:42:35 +02:00
free ( varnames ) ;
return matches ;
}
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
2012-02-28 05:06:29 +01:00
/*
* This function wraps rl_filename_completion_function ( ) to strip quotes from
* the input before searching for matches and to quote any matches for which
* the consuming command will require it .
*/
static char *
complete_from_files ( const char * text , int state )
{
static const char * unquoted_text ;
char * unquoted_match ;
char * ret = NULL ;
if ( state = = 0 )
{
/* Initialization: stash the unquoted input. */
unquoted_text = strtokx ( text , " " , NULL , " ' " , * completion_charp ,
false , true , pset . encoding ) ;
/* expect a NULL return for the empty string only */
if ( ! unquoted_text )
{
2012-12-15 00:03:07 +01:00
Assert ( * text = = ' \0 ' ) ;
2012-02-28 05:06:29 +01:00
unquoted_text = text ;
}
}
unquoted_match = filename_completion_function ( unquoted_text , state ) ;
if ( unquoted_match )
{
/*
* Caller sets completion_charp to a zero - or one - character string
* containing the escape character . This is necessary since \ copy has
* no escape character , but every other backslash command recognizes
* " \" as an escape character. Since we have only two callers, don't
* bother providing a macro to simplify this .
*/
ret = quote_if_needed ( unquoted_match , " \t \r \n \" ` " ,
' \' ' , * completion_charp , pset . encoding ) ;
if ( ret )
free ( unquoted_match ) ;
else
ret = unquoted_match ;
}
return ret ;
}
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
/* HELPER FUNCTIONS */
2012-02-01 19:16:40 +01:00
/*
2012-05-08 20:03:45 +02:00
* Make a pg_strdup copy of s and convert the case according to
Improve consistency of parsing of psql's magic variables.
For simple boolean variables such as ON_ERROR_STOP, psql has for a long
time recognized variant spellings of "on" and "off" (such as "1"/"0"),
and it also made a point of warning you if you'd misspelled the setting.
But these conveniences did not exist for other keyword-valued variables.
In particular, though ECHO_HIDDEN and ON_ERROR_ROLLBACK include "on" and
"off" as possible values, none of the alternative spellings for those were
recognized; and to make matters worse the code would just silently assume
"on" was meant for any unrecognized spelling. Several people have reported
getting bitten by this, so let's fix it. In detail, this patch:
* Allows all spellings recognized by ParseVariableBool() for ECHO_HIDDEN
and ON_ERROR_ROLLBACK.
* Reports a warning for unrecognized values for COMP_KEYWORD_CASE, ECHO,
ECHO_HIDDEN, HISTCONTROL, ON_ERROR_ROLLBACK, and VERBOSITY.
* Recognizes all values for all these variables case-insensitively;
previously there was a mishmash of case-sensitive and case-insensitive
behaviors.
Back-patch to all supported branches. There is a small risk of breaking
existing scripts that were accidentally failing to malfunction; but the
consensus is that the chance of detecting real problems and preventing
future mistakes outweighs this.
2014-12-31 18:16:53 +01:00
* COMP_KEYWORD_CASE setting , using ref as the text that was already entered .
2012-02-01 19:16:40 +01:00
*/
static char *
2012-05-08 20:03:45 +02:00
pg_strdup_keyword_case ( const char * s , const char * ref )
2012-02-01 19:16:40 +01:00
{
2012-06-10 21:20:04 +02:00
char * ret ,
* p ;
2012-02-01 19:16:40 +01:00
unsigned char first = ref [ 0 ] ;
2012-05-08 20:03:45 +02:00
ret = pg_strdup ( s ) ;
Improve consistency of parsing of psql's magic variables.
For simple boolean variables such as ON_ERROR_STOP, psql has for a long
time recognized variant spellings of "on" and "off" (such as "1"/"0"),
and it also made a point of warning you if you'd misspelled the setting.
But these conveniences did not exist for other keyword-valued variables.
In particular, though ECHO_HIDDEN and ON_ERROR_ROLLBACK include "on" and
"off" as possible values, none of the alternative spellings for those were
recognized; and to make matters worse the code would just silently assume
"on" was meant for any unrecognized spelling. Several people have reported
getting bitten by this, so let's fix it. In detail, this patch:
* Allows all spellings recognized by ParseVariableBool() for ECHO_HIDDEN
and ON_ERROR_ROLLBACK.
* Reports a warning for unrecognized values for COMP_KEYWORD_CASE, ECHO,
ECHO_HIDDEN, HISTCONTROL, ON_ERROR_ROLLBACK, and VERBOSITY.
* Recognizes all values for all these variables case-insensitively;
previously there was a mishmash of case-sensitive and case-insensitive
behaviors.
Back-patch to all supported branches. There is a small risk of breaking
existing scripts that were accidentally failing to malfunction; but the
consensus is that the chance of detecting real problems and preventing
future mistakes outweighs this.
2014-12-31 18:16:53 +01:00
if ( pset . comp_case = = PSQL_COMP_CASE_LOWER | |
( ( pset . comp_case = = PSQL_COMP_CASE_PRESERVE_LOWER | |
Phase 3 of pgindent updates.
Don't move parenthesized lines to the left, even if that means they
flow past the right margin.
By default, BSD indent lines up statement continuation lines that are
within parentheses so that they start just to the right of the preceding
left parenthesis. However, traditionally, if that resulted in the
continuation line extending to the right of the desired right margin,
then indent would push it left just far enough to not overrun the margin,
if it could do so without making the continuation line start to the left of
the current statement indent. That makes for a weird mix of indentations
unless one has been completely rigid about never violating the 80-column
limit.
This behavior has been pretty universally panned by Postgres developers.
Hence, disable it with indent's new -lpl switch, so that parenthesized
lines are always lined up with the preceding left paren.
This patch is much less interesting than the first round of indent
changes, but also bulkier, so I thought it best to separate the effects.
Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org
Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us
2017-06-21 21:35:54 +02:00
pset . comp_case = = PSQL_COMP_CASE_PRESERVE_UPPER ) & & islower ( first ) ) | |
Improve consistency of parsing of psql's magic variables.
For simple boolean variables such as ON_ERROR_STOP, psql has for a long
time recognized variant spellings of "on" and "off" (such as "1"/"0"),
and it also made a point of warning you if you'd misspelled the setting.
But these conveniences did not exist for other keyword-valued variables.
In particular, though ECHO_HIDDEN and ON_ERROR_ROLLBACK include "on" and
"off" as possible values, none of the alternative spellings for those were
recognized; and to make matters worse the code would just silently assume
"on" was meant for any unrecognized spelling. Several people have reported
getting bitten by this, so let's fix it. In detail, this patch:
* Allows all spellings recognized by ParseVariableBool() for ECHO_HIDDEN
and ON_ERROR_ROLLBACK.
* Reports a warning for unrecognized values for COMP_KEYWORD_CASE, ECHO,
ECHO_HIDDEN, HISTCONTROL, ON_ERROR_ROLLBACK, and VERBOSITY.
* Recognizes all values for all these variables case-insensitively;
previously there was a mishmash of case-sensitive and case-insensitive
behaviors.
Back-patch to all supported branches. There is a small risk of breaking
existing scripts that were accidentally failing to malfunction; but the
consensus is that the chance of detecting real problems and preventing
future mistakes outweighs this.
2014-12-31 18:16:53 +01:00
( pset . comp_case = = PSQL_COMP_CASE_PRESERVE_LOWER & & ! isalpha ( first ) ) )
{
2012-05-08 20:03:45 +02:00
for ( p = ret ; * p ; p + + )
* p = pg_tolower ( ( unsigned char ) * p ) ;
Improve consistency of parsing of psql's magic variables.
For simple boolean variables such as ON_ERROR_STOP, psql has for a long
time recognized variant spellings of "on" and "off" (such as "1"/"0"),
and it also made a point of warning you if you'd misspelled the setting.
But these conveniences did not exist for other keyword-valued variables.
In particular, though ECHO_HIDDEN and ON_ERROR_ROLLBACK include "on" and
"off" as possible values, none of the alternative spellings for those were
recognized; and to make matters worse the code would just silently assume
"on" was meant for any unrecognized spelling. Several people have reported
getting bitten by this, so let's fix it. In detail, this patch:
* Allows all spellings recognized by ParseVariableBool() for ECHO_HIDDEN
and ON_ERROR_ROLLBACK.
* Reports a warning for unrecognized values for COMP_KEYWORD_CASE, ECHO,
ECHO_HIDDEN, HISTCONTROL, ON_ERROR_ROLLBACK, and VERBOSITY.
* Recognizes all values for all these variables case-insensitively;
previously there was a mishmash of case-sensitive and case-insensitive
behaviors.
Back-patch to all supported branches. There is a small risk of breaking
existing scripts that were accidentally failing to malfunction; but the
consensus is that the chance of detecting real problems and preventing
future mistakes outweighs this.
2014-12-31 18:16:53 +01:00
}
2012-02-01 19:16:40 +01:00
else
Improve consistency of parsing of psql's magic variables.
For simple boolean variables such as ON_ERROR_STOP, psql has for a long
time recognized variant spellings of "on" and "off" (such as "1"/"0"),
and it also made a point of warning you if you'd misspelled the setting.
But these conveniences did not exist for other keyword-valued variables.
In particular, though ECHO_HIDDEN and ON_ERROR_ROLLBACK include "on" and
"off" as possible values, none of the alternative spellings for those were
recognized; and to make matters worse the code would just silently assume
"on" was meant for any unrecognized spelling. Several people have reported
getting bitten by this, so let's fix it. In detail, this patch:
* Allows all spellings recognized by ParseVariableBool() for ECHO_HIDDEN
and ON_ERROR_ROLLBACK.
* Reports a warning for unrecognized values for COMP_KEYWORD_CASE, ECHO,
ECHO_HIDDEN, HISTCONTROL, ON_ERROR_ROLLBACK, and VERBOSITY.
* Recognizes all values for all these variables case-insensitively;
previously there was a mishmash of case-sensitive and case-insensitive
behaviors.
Back-patch to all supported branches. There is a small risk of breaking
existing scripts that were accidentally failing to malfunction; but the
consensus is that the chance of detecting real problems and preventing
future mistakes outweighs this.
2014-12-31 18:16:53 +01:00
{
2012-05-08 20:03:45 +02:00
for ( p = ret ; * p ; p + + )
* p = pg_toupper ( ( unsigned char ) * p ) ;
Improve consistency of parsing of psql's magic variables.
For simple boolean variables such as ON_ERROR_STOP, psql has for a long
time recognized variant spellings of "on" and "off" (such as "1"/"0"),
and it also made a point of warning you if you'd misspelled the setting.
But these conveniences did not exist for other keyword-valued variables.
In particular, though ECHO_HIDDEN and ON_ERROR_ROLLBACK include "on" and
"off" as possible values, none of the alternative spellings for those were
recognized; and to make matters worse the code would just silently assume
"on" was meant for any unrecognized spelling. Several people have reported
getting bitten by this, so let's fix it. In detail, this patch:
* Allows all spellings recognized by ParseVariableBool() for ECHO_HIDDEN
and ON_ERROR_ROLLBACK.
* Reports a warning for unrecognized values for COMP_KEYWORD_CASE, ECHO,
ECHO_HIDDEN, HISTCONTROL, ON_ERROR_ROLLBACK, and VERBOSITY.
* Recognizes all values for all these variables case-insensitively;
previously there was a mishmash of case-sensitive and case-insensitive
behaviors.
Back-patch to all supported branches. There is a small risk of breaking
existing scripts that were accidentally failing to malfunction; but the
consensus is that the chance of detecting real problems and preventing
future mistakes outweighs this.
2014-12-31 18:16:53 +01:00
}
2012-05-08 20:03:45 +02:00
return ret ;
2012-02-01 19:16:40 +01:00
}
2015-09-08 20:57:35 +02:00
/*
* escape_string - Escape argument for use as string literal .
*
* The returned value has to be freed .
*/
static char *
escape_string ( const char * text )
{
size_t text_length ;
char * result ;
text_length = strlen ( text ) ;
result = pg_malloc ( text_length * 2 + 1 ) ;
PQescapeStringConn ( pset . db , result , text , text_length , NULL ) ;
return result ;
}
2003-10-30 22:37:38 +01:00
/*
* Execute a query and report any errors . This should be the preferred way of
* talking to the database in this file .
*/
2005-11-14 18:48:43 +01:00
static PGresult *
exec_query ( const char * query )
{
PGresult * result ;
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
2005-11-14 18:48:43 +01:00
if ( query = = NULL | | ! pset . db | | PQstatus ( pset . db ) ! = CONNECTION_OK )
return NULL ;
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
2005-11-14 18:48:43 +01:00
result = PQexec ( pset . db , query ) ;
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
2008-08-16 03:36:35 +02:00
if ( PQresultStatus ( result ) ! = PGRES_TUPLES_OK )
2005-11-14 18:48:43 +01:00
{
2010-10-11 00:42:35 +02:00
# ifdef NOT_USED
Unified logging system for command-line programs
This unifies the various ad hoc logging (message printing, error
printing) systems used throughout the command-line programs.
Features:
- Program name is automatically prefixed.
- Message string does not end with newline. This removes a common
source of inconsistencies and omissions.
- Additionally, a final newline is automatically stripped, simplifying
use of PQerrorMessage() etc., another common source of mistakes.
- I converted error message strings to use %m where possible.
- As a result of the above several points, more translatable message
strings can be shared between different components and between
frontends and backend, without gratuitous punctuation or whitespace
differences.
- There is support for setting a "log level". This is not meant to be
user-facing, but can be used internally to implement debug or
verbose modes.
- Lazy argument evaluation, so no significant overhead if logging at
some level is disabled.
- Some color in the messages, similar to gcc and clang. Set
PG_COLOR=auto to try it out. Some colors are predefined, but can be
customized by setting PG_COLORS.
- Common files (common/, fe_utils/, etc.) can handle logging much more
simply by just using one API without worrying too much about the
context of the calling program, requiring callbacks, or having to
pass "progname" around everywhere.
- Some programs called setvbuf() to make sure that stderr is
unbuffered, even on Windows. But not all programs did that. This
is now done centrally.
Soft goals:
- Reduces vertical space use and visual complexity of error reporting
in the source code.
- Encourages more deliberate classification of messages. For example,
in some cases it wasn't clear without analyzing the surrounding code
whether a message was meant as an error or just an info.
- Concepts and terms are vaguely aligned with popular logging
frameworks such as log4j and Python logging.
This is all just about printing stuff out. Nothing affects program
flow (e.g., fatal exits). The uses are just too varied to do that.
Some existing code had wrappers that do some kind of print-and-exit,
and I adapted those.
I tried to keep the output mostly the same, but there is a lot of
historical baggage to unwind and special cases to consider, and I
might not always have succeeded. One significant change is that
pg_rewind used to write all error messages to stdout. That is now
changed to stderr.
Reviewed-by: Donald Dong <xdong@csumb.edu>
Reviewed-by: Arthur Zakirov <a.zakirov@postgrespro.ru>
Discussion: https://www.postgresql.org/message-id/flat/6a609b43-4f57-7348-6480-bd022f924310@2ndquadrant.com
2019-04-01 14:24:37 +02:00
pg_log_error ( " tab completion query failed: %s \n Query was: \n %s " ,
2008-08-16 03:36:35 +02:00
PQerrorMessage ( pset . db ) , query ) ;
2000-01-12 20:36:36 +01:00
# endif
2005-11-14 18:48:43 +01:00
PQclear ( result ) ;
result = NULL ;
}
2000-04-12 19:17:23 +02:00
2005-11-14 18:48:43 +01:00
return result ;
}
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
2005-05-18 07:01:10 +02:00
/*
Teach psql's tab completion to consider the entire input string.
Up to now, the tab completion logic has only examined the last few words
of the current input line; "last few" being originally as few as four
words, but lately up to nine words. Furthermore, it only looked at what
libreadline considers the current line of input, which made it rather
myopic if you split your command across lines. This was tolerable,
sort of, so long as the match patterns were only designed to consider the
last few words of input; but with the recent addition of HeadMatches()
and Matches() matching rules, we really have to do better if we want
those to behave sanely.
Hence, change the code to break the entire line down into words, and to
include any previous lines in the command buffer along with the active
readline input buffer.
This will be a little bit slower than the previous coding, but some
measurements say that even a query of several thousand characters can be
parsed in a hundred or so microseconds on modern machines; so it's really
not going to be significant for interactive tab completion. To reduce
the cost some, I arranged to avoid the per-word malloc calls that used
to occur: all the words are now kept in one malloc'd buffer.
2015-12-20 19:28:11 +01:00
* Parse all the word ( s ) before point .
*
* Returns a malloc ' d array of character pointers that point into the malloc ' d
* data array returned to * buffer ; caller must free ( ) both of these when done .
* * nwords receives the number of words found , ie , the valid length of the
* return array .
*
* Words are returned right to left , that is , previous_words [ 0 ] gets the last
* word before point , previous_words [ 1 ] the next - to - last , etc .
2005-05-18 07:01:10 +02:00
*/
Teach psql's tab completion to consider the entire input string.
Up to now, the tab completion logic has only examined the last few words
of the current input line; "last few" being originally as few as four
words, but lately up to nine words. Furthermore, it only looked at what
libreadline considers the current line of input, which made it rather
myopic if you split your command across lines. This was tolerable,
sort of, so long as the match patterns were only designed to consider the
last few words of input; but with the recent addition of HeadMatches()
and Matches() matching rules, we really have to do better if we want
those to behave sanely.
Hence, change the code to break the entire line down into words, and to
include any previous lines in the command buffer along with the active
readline input buffer.
This will be a little bit slower than the previous coding, but some
measurements say that even a query of several thousand characters can be
parsed in a hundred or so microseconds on modern machines; so it's really
not going to be significant for interactive tab completion. To reduce
the cost some, I arranged to avoid the per-word malloc calls that used
to occur: all the words are now kept in one malloc'd buffer.
2015-12-20 19:28:11 +01:00
static char * *
get_previous_words ( int point , char * * buffer , int * nwords )
2005-11-14 18:48:43 +01:00
{
Teach psql's tab completion to consider the entire input string.
Up to now, the tab completion logic has only examined the last few words
of the current input line; "last few" being originally as few as four
words, but lately up to nine words. Furthermore, it only looked at what
libreadline considers the current line of input, which made it rather
myopic if you split your command across lines. This was tolerable,
sort of, so long as the match patterns were only designed to consider the
last few words of input; but with the recent addition of HeadMatches()
and Matches() matching rules, we really have to do better if we want
those to behave sanely.
Hence, change the code to break the entire line down into words, and to
include any previous lines in the command buffer along with the active
readline input buffer.
This will be a little bit slower than the previous coding, but some
measurements say that even a query of several thousand characters can be
parsed in a hundred or so microseconds on modern machines; so it's really
not going to be significant for interactive tab completion. To reduce
the cost some, I arranged to avoid the per-word malloc calls that used
to occur: all the words are now kept in one malloc'd buffer.
2015-12-20 19:28:11 +01:00
char * * previous_words ;
char * buf ;
2015-12-21 21:08:56 +01:00
char * outptr ;
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
int words_found = 0 ;
2011-10-20 21:38:57 +02:00
int i ;
2010-02-17 05:09:40 +01:00
Teach psql's tab completion to consider the entire input string.
Up to now, the tab completion logic has only examined the last few words
of the current input line; "last few" being originally as few as four
words, but lately up to nine words. Furthermore, it only looked at what
libreadline considers the current line of input, which made it rather
myopic if you split your command across lines. This was tolerable,
sort of, so long as the match patterns were only designed to consider the
last few words of input; but with the recent addition of HeadMatches()
and Matches() matching rules, we really have to do better if we want
those to behave sanely.
Hence, change the code to break the entire line down into words, and to
include any previous lines in the command buffer along with the active
readline input buffer.
This will be a little bit slower than the previous coding, but some
measurements say that even a query of several thousand characters can be
parsed in a hundred or so microseconds on modern machines; so it's really
not going to be significant for interactive tab completion. To reduce
the cost some, I arranged to avoid the per-word malloc calls that used
to occur: all the words are now kept in one malloc'd buffer.
2015-12-20 19:28:11 +01:00
/*
2015-12-21 21:08:56 +01:00
* If we have anything in tab_completion_query_buf , paste it together with
* rl_line_buffer to construct the full query . Otherwise we can just use
* rl_line_buffer as the input string .
Teach psql's tab completion to consider the entire input string.
Up to now, the tab completion logic has only examined the last few words
of the current input line; "last few" being originally as few as four
words, but lately up to nine words. Furthermore, it only looked at what
libreadline considers the current line of input, which made it rather
myopic if you split your command across lines. This was tolerable,
sort of, so long as the match patterns were only designed to consider the
last few words of input; but with the recent addition of HeadMatches()
and Matches() matching rules, we really have to do better if we want
those to behave sanely.
Hence, change the code to break the entire line down into words, and to
include any previous lines in the command buffer along with the active
readline input buffer.
This will be a little bit slower than the previous coding, but some
measurements say that even a query of several thousand characters can be
parsed in a hundred or so microseconds on modern machines; so it's really
not going to be significant for interactive tab completion. To reduce
the cost some, I arranged to avoid the per-word malloc calls that used
to occur: all the words are now kept in one malloc'd buffer.
2015-12-20 19:28:11 +01:00
*/
2015-12-21 21:08:56 +01:00
if ( tab_completion_query_buf & & tab_completion_query_buf - > len > 0 )
{
i = tab_completion_query_buf - > len ;
buf = pg_malloc ( point + i + 2 ) ;
memcpy ( buf , tab_completion_query_buf - > data , i ) ;
Teach psql's tab completion to consider the entire input string.
Up to now, the tab completion logic has only examined the last few words
of the current input line; "last few" being originally as few as four
words, but lately up to nine words. Furthermore, it only looked at what
libreadline considers the current line of input, which made it rather
myopic if you split your command across lines. This was tolerable,
sort of, so long as the match patterns were only designed to consider the
last few words of input; but with the recent addition of HeadMatches()
and Matches() matching rules, we really have to do better if we want
those to behave sanely.
Hence, change the code to break the entire line down into words, and to
include any previous lines in the command buffer along with the active
readline input buffer.
This will be a little bit slower than the previous coding, but some
measurements say that even a query of several thousand characters can be
parsed in a hundred or so microseconds on modern machines; so it's really
not going to be significant for interactive tab completion. To reduce
the cost some, I arranged to avoid the per-word malloc calls that used
to occur: all the words are now kept in one malloc'd buffer.
2015-12-20 19:28:11 +01:00
buf [ i + + ] = ' \n ' ;
2015-12-21 21:08:56 +01:00
memcpy ( buf + i , rl_line_buffer , point ) ;
i + = point ;
buf [ i ] = ' \0 ' ;
/* Readjust point to reference appropriate offset in buf */
point = i ;
Teach psql's tab completion to consider the entire input string.
Up to now, the tab completion logic has only examined the last few words
of the current input line; "last few" being originally as few as four
words, but lately up to nine words. Furthermore, it only looked at what
libreadline considers the current line of input, which made it rather
myopic if you split your command across lines. This was tolerable,
sort of, so long as the match patterns were only designed to consider the
last few words of input; but with the recent addition of HeadMatches()
and Matches() matching rules, we really have to do better if we want
those to behave sanely.
Hence, change the code to break the entire line down into words, and to
include any previous lines in the command buffer along with the active
readline input buffer.
This will be a little bit slower than the previous coding, but some
measurements say that even a query of several thousand characters can be
parsed in a hundred or so microseconds on modern machines; so it's really
not going to be significant for interactive tab completion. To reduce
the cost some, I arranged to avoid the per-word malloc calls that used
to occur: all the words are now kept in one malloc'd buffer.
2015-12-20 19:28:11 +01:00
}
2015-12-21 21:08:56 +01:00
else
buf = rl_line_buffer ;
Teach psql's tab completion to consider the entire input string.
Up to now, the tab completion logic has only examined the last few words
of the current input line; "last few" being originally as few as four
words, but lately up to nine words. Furthermore, it only looked at what
libreadline considers the current line of input, which made it rather
myopic if you split your command across lines. This was tolerable,
sort of, so long as the match patterns were only designed to consider the
last few words of input; but with the recent addition of HeadMatches()
and Matches() matching rules, we really have to do better if we want
those to behave sanely.
Hence, change the code to break the entire line down into words, and to
include any previous lines in the command buffer along with the active
readline input buffer.
This will be a little bit slower than the previous coding, but some
measurements say that even a query of several thousand characters can be
parsed in a hundred or so microseconds on modern machines; so it's really
not going to be significant for interactive tab completion. To reduce
the cost some, I arranged to avoid the per-word malloc calls that used
to occur: all the words are now kept in one malloc'd buffer.
2015-12-20 19:28:11 +01:00
/*
2015-12-21 21:08:56 +01:00
* Allocate an array of string pointers and a buffer to hold the strings
* themselves . The worst case is that the line contains only
* non - whitespace WORD_BREAKS characters , making each one a separate word .
* This is usually much more space than we need , but it ' s cheaper than
* doing a separate malloc ( ) for each word .
Teach psql's tab completion to consider the entire input string.
Up to now, the tab completion logic has only examined the last few words
of the current input line; "last few" being originally as few as four
words, but lately up to nine words. Furthermore, it only looked at what
libreadline considers the current line of input, which made it rather
myopic if you split your command across lines. This was tolerable,
sort of, so long as the match patterns were only designed to consider the
last few words of input; but with the recent addition of HeadMatches()
and Matches() matching rules, we really have to do better if we want
those to behave sanely.
Hence, change the code to break the entire line down into words, and to
include any previous lines in the command buffer along with the active
readline input buffer.
This will be a little bit slower than the previous coding, but some
measurements say that even a query of several thousand characters can be
parsed in a hundred or so microseconds on modern machines; so it's really
not going to be significant for interactive tab completion. To reduce
the cost some, I arranged to avoid the per-word malloc calls that used
to occur: all the words are now kept in one malloc'd buffer.
2015-12-20 19:28:11 +01:00
*/
2015-12-21 21:08:56 +01:00
previous_words = ( char * * ) pg_malloc ( point * sizeof ( char * ) ) ;
* buffer = outptr = ( char * ) pg_malloc ( point * 2 ) ;
Teach psql's tab completion to consider the entire input string.
Up to now, the tab completion logic has only examined the last few words
of the current input line; "last few" being originally as few as four
words, but lately up to nine words. Furthermore, it only looked at what
libreadline considers the current line of input, which made it rather
myopic if you split your command across lines. This was tolerable,
sort of, so long as the match patterns were only designed to consider the
last few words of input; but with the recent addition of HeadMatches()
and Matches() matching rules, we really have to do better if we want
those to behave sanely.
Hence, change the code to break the entire line down into words, and to
include any previous lines in the command buffer along with the active
readline input buffer.
This will be a little bit slower than the previous coding, but some
measurements say that even a query of several thousand characters can be
parsed in a hundred or so microseconds on modern machines; so it's really
not going to be significant for interactive tab completion. To reduce
the cost some, I arranged to avoid the per-word malloc calls that used
to occur: all the words are now kept in one malloc'd buffer.
2015-12-20 19:28:11 +01:00
/*
* First we look for a non - word char before the current point . ( This is
* probably useless , if readline is on the same page as we are about what
* is a word , but if so it ' s cheap . )
*/
2010-02-17 05:09:40 +01:00
for ( i = point - 1 ; i > = 0 ; i - - )
Teach psql's tab completion to consider the entire input string.
Up to now, the tab completion logic has only examined the last few words
of the current input line; "last few" being originally as few as four
words, but lately up to nine words. Furthermore, it only looked at what
libreadline considers the current line of input, which made it rather
myopic if you split your command across lines. This was tolerable,
sort of, so long as the match patterns were only designed to consider the
last few words of input; but with the recent addition of HeadMatches()
and Matches() matching rules, we really have to do better if we want
those to behave sanely.
Hence, change the code to break the entire line down into words, and to
include any previous lines in the command buffer along with the active
readline input buffer.
This will be a little bit slower than the previous coding, but some
measurements say that even a query of several thousand characters can be
parsed in a hundred or so microseconds on modern machines; so it's really
not going to be significant for interactive tab completion. To reduce
the cost some, I arranged to avoid the per-word malloc calls that used
to occur: all the words are now kept in one malloc'd buffer.
2015-12-20 19:28:11 +01:00
{
2010-02-17 05:09:40 +01:00
if ( strchr ( WORD_BREAKS , buf [ i ] ) )
break ;
Teach psql's tab completion to consider the entire input string.
Up to now, the tab completion logic has only examined the last few words
of the current input line; "last few" being originally as few as four
words, but lately up to nine words. Furthermore, it only looked at what
libreadline considers the current line of input, which made it rather
myopic if you split your command across lines. This was tolerable,
sort of, so long as the match patterns were only designed to consider the
last few words of input; but with the recent addition of HeadMatches()
and Matches() matching rules, we really have to do better if we want
those to behave sanely.
Hence, change the code to break the entire line down into words, and to
include any previous lines in the command buffer along with the active
readline input buffer.
This will be a little bit slower than the previous coding, but some
measurements say that even a query of several thousand characters can be
parsed in a hundred or so microseconds on modern machines; so it's really
not going to be significant for interactive tab completion. To reduce
the cost some, I arranged to avoid the per-word malloc calls that used
to occur: all the words are now kept in one malloc'd buffer.
2015-12-20 19:28:11 +01:00
}
2010-02-17 05:09:40 +01:00
point = i ;
2005-11-14 18:48:43 +01:00
Teach psql's tab completion to consider the entire input string.
Up to now, the tab completion logic has only examined the last few words
of the current input line; "last few" being originally as few as four
words, but lately up to nine words. Furthermore, it only looked at what
libreadline considers the current line of input, which made it rather
myopic if you split your command across lines. This was tolerable,
sort of, so long as the match patterns were only designed to consider the
last few words of input; but with the recent addition of HeadMatches()
and Matches() matching rules, we really have to do better if we want
those to behave sanely.
Hence, change the code to break the entire line down into words, and to
include any previous lines in the command buffer along with the active
readline input buffer.
This will be a little bit slower than the previous coding, but some
measurements say that even a query of several thousand characters can be
parsed in a hundred or so microseconds on modern machines; so it's really
not going to be significant for interactive tab completion. To reduce
the cost some, I arranged to avoid the per-word malloc calls that used
to occur: all the words are now kept in one malloc'd buffer.
2015-12-20 19:28:11 +01:00
/*
* Now parse words , working backwards , until we hit start of line . The
* backwards scan has some interesting but intentional properties
* concerning parenthesis handling .
*/
while ( point > = 0 )
2005-11-14 18:48:43 +01:00
{
2011-10-20 21:38:57 +02:00
int start ,
end ;
Teach psql's tab completion to consider the entire input string.
Up to now, the tab completion logic has only examined the last few words
of the current input line; "last few" being originally as few as four
words, but lately up to nine words. Furthermore, it only looked at what
libreadline considers the current line of input, which made it rather
myopic if you split your command across lines. This was tolerable,
sort of, so long as the match patterns were only designed to consider the
last few words of input; but with the recent addition of HeadMatches()
and Matches() matching rules, we really have to do better if we want
those to behave sanely.
Hence, change the code to break the entire line down into words, and to
include any previous lines in the command buffer along with the active
readline input buffer.
This will be a little bit slower than the previous coding, but some
measurements say that even a query of several thousand characters can be
parsed in a hundred or so microseconds on modern machines; so it's really
not going to be significant for interactive tab completion. To reduce
the cost some, I arranged to avoid the per-word malloc calls that used
to occur: all the words are now kept in one malloc'd buffer.
2015-12-20 19:28:11 +01:00
bool inquotes = false ;
int parentheses = 0 ;
2005-11-14 18:48:43 +01:00
/* now find the first non-space which then constitutes the end */
2011-10-20 21:38:57 +02:00
end = - 1 ;
2010-02-17 05:09:40 +01:00
for ( i = point ; i > = 0 ; i - - )
2011-10-20 21:38:57 +02:00
{
if ( ! isspace ( ( unsigned char ) buf [ i ] ) )
2005-11-14 18:48:43 +01:00
{
end = i ;
break ;
}
2011-10-20 21:38:57 +02:00
}
Teach psql's tab completion to consider the entire input string.
Up to now, the tab completion logic has only examined the last few words
of the current input line; "last few" being originally as few as four
words, but lately up to nine words. Furthermore, it only looked at what
libreadline considers the current line of input, which made it rather
myopic if you split your command across lines. This was tolerable,
sort of, so long as the match patterns were only designed to consider the
last few words of input; but with the recent addition of HeadMatches()
and Matches() matching rules, we really have to do better if we want
those to behave sanely.
Hence, change the code to break the entire line down into words, and to
include any previous lines in the command buffer along with the active
readline input buffer.
This will be a little bit slower than the previous coding, but some
measurements say that even a query of several thousand characters can be
parsed in a hundred or so microseconds on modern machines; so it's really
not going to be significant for interactive tab completion. To reduce
the cost some, I arranged to avoid the per-word malloc calls that used
to occur: all the words are now kept in one malloc'd buffer.
2015-12-20 19:28:11 +01:00
/* if no end found, we're done */
if ( end < 0 )
break ;
2005-11-14 18:48:43 +01:00
/*
Teach psql's tab completion to consider the entire input string.
Up to now, the tab completion logic has only examined the last few words
of the current input line; "last few" being originally as few as four
words, but lately up to nine words. Furthermore, it only looked at what
libreadline considers the current line of input, which made it rather
myopic if you split your command across lines. This was tolerable,
sort of, so long as the match patterns were only designed to consider the
last few words of input; but with the recent addition of HeadMatches()
and Matches() matching rules, we really have to do better if we want
those to behave sanely.
Hence, change the code to break the entire line down into words, and to
include any previous lines in the command buffer along with the active
readline input buffer.
This will be a little bit slower than the previous coding, but some
measurements say that even a query of several thousand characters can be
parsed in a hundred or so microseconds on modern machines; so it's really
not going to be significant for interactive tab completion. To reduce
the cost some, I arranged to avoid the per-word malloc calls that used
to occur: all the words are now kept in one malloc'd buffer.
2015-12-20 19:28:11 +01:00
* Otherwise we now look for the start . The start is either the last
* character before any word - break character going backwards from the
* end , or it ' s simply character 0. We also handle open quotes and
* parentheses .
2005-11-14 18:48:43 +01:00
*/
Teach psql's tab completion to consider the entire input string.
Up to now, the tab completion logic has only examined the last few words
of the current input line; "last few" being originally as few as four
words, but lately up to nine words. Furthermore, it only looked at what
libreadline considers the current line of input, which made it rather
myopic if you split your command across lines. This was tolerable,
sort of, so long as the match patterns were only designed to consider the
last few words of input; but with the recent addition of HeadMatches()
and Matches() matching rules, we really have to do better if we want
those to behave sanely.
Hence, change the code to break the entire line down into words, and to
include any previous lines in the command buffer along with the active
readline input buffer.
This will be a little bit slower than the previous coding, but some
measurements say that even a query of several thousand characters can be
parsed in a hundred or so microseconds on modern machines; so it's really
not going to be significant for interactive tab completion. To reduce
the cost some, I arranged to avoid the per-word malloc calls that used
to occur: all the words are now kept in one malloc'd buffer.
2015-12-20 19:28:11 +01:00
for ( start = end ; start > 0 ; start - - )
2011-10-20 21:38:57 +02:00
{
Teach psql's tab completion to consider the entire input string.
Up to now, the tab completion logic has only examined the last few words
of the current input line; "last few" being originally as few as four
words, but lately up to nine words. Furthermore, it only looked at what
libreadline considers the current line of input, which made it rather
myopic if you split your command across lines. This was tolerable,
sort of, so long as the match patterns were only designed to consider the
last few words of input; but with the recent addition of HeadMatches()
and Matches() matching rules, we really have to do better if we want
those to behave sanely.
Hence, change the code to break the entire line down into words, and to
include any previous lines in the command buffer along with the active
readline input buffer.
This will be a little bit slower than the previous coding, but some
measurements say that even a query of several thousand characters can be
parsed in a hundred or so microseconds on modern machines; so it's really
not going to be significant for interactive tab completion. To reduce
the cost some, I arranged to avoid the per-word malloc calls that used
to occur: all the words are now kept in one malloc'd buffer.
2015-12-20 19:28:11 +01:00
if ( buf [ start ] = = ' " ' )
inquotes = ! inquotes ;
if ( ! inquotes )
2010-02-17 05:09:40 +01:00
{
Teach psql's tab completion to consider the entire input string.
Up to now, the tab completion logic has only examined the last few words
of the current input line; "last few" being originally as few as four
words, but lately up to nine words. Furthermore, it only looked at what
libreadline considers the current line of input, which made it rather
myopic if you split your command across lines. This was tolerable,
sort of, so long as the match patterns were only designed to consider the
last few words of input; but with the recent addition of HeadMatches()
and Matches() matching rules, we really have to do better if we want
those to behave sanely.
Hence, change the code to break the entire line down into words, and to
include any previous lines in the command buffer along with the active
readline input buffer.
This will be a little bit slower than the previous coding, but some
measurements say that even a query of several thousand characters can be
parsed in a hundred or so microseconds on modern machines; so it's really
not going to be significant for interactive tab completion. To reduce
the cost some, I arranged to avoid the per-word malloc calls that used
to occur: all the words are now kept in one malloc'd buffer.
2015-12-20 19:28:11 +01:00
if ( buf [ start ] = = ' ) ' )
parentheses + + ;
else if ( buf [ start ] = = ' ( ' )
2010-02-17 05:09:40 +01:00
{
Teach psql's tab completion to consider the entire input string.
Up to now, the tab completion logic has only examined the last few words
of the current input line; "last few" being originally as few as four
words, but lately up to nine words. Furthermore, it only looked at what
libreadline considers the current line of input, which made it rather
myopic if you split your command across lines. This was tolerable,
sort of, so long as the match patterns were only designed to consider the
last few words of input; but with the recent addition of HeadMatches()
and Matches() matching rules, we really have to do better if we want
those to behave sanely.
Hence, change the code to break the entire line down into words, and to
include any previous lines in the command buffer along with the active
readline input buffer.
This will be a little bit slower than the previous coding, but some
measurements say that even a query of several thousand characters can be
parsed in a hundred or so microseconds on modern machines; so it's really
not going to be significant for interactive tab completion. To reduce
the cost some, I arranged to avoid the per-word malloc calls that used
to occur: all the words are now kept in one malloc'd buffer.
2015-12-20 19:28:11 +01:00
if ( - - parentheses < = 0 )
2010-02-17 05:09:40 +01:00
break ;
}
Teach psql's tab completion to consider the entire input string.
Up to now, the tab completion logic has only examined the last few words
of the current input line; "last few" being originally as few as four
words, but lately up to nine words. Furthermore, it only looked at what
libreadline considers the current line of input, which made it rather
myopic if you split your command across lines. This was tolerable,
sort of, so long as the match patterns were only designed to consider the
last few words of input; but with the recent addition of HeadMatches()
and Matches() matching rules, we really have to do better if we want
those to behave sanely.
Hence, change the code to break the entire line down into words, and to
include any previous lines in the command buffer along with the active
readline input buffer.
This will be a little bit slower than the previous coding, but some
measurements say that even a query of several thousand characters can be
parsed in a hundred or so microseconds on modern machines; so it's really
not going to be significant for interactive tab completion. To reduce
the cost some, I arranged to avoid the per-word malloc calls that used
to occur: all the words are now kept in one malloc'd buffer.
2015-12-20 19:28:11 +01:00
else if ( parentheses = = 0 & &
strchr ( WORD_BREAKS , buf [ start - 1 ] ) )
break ;
2010-02-17 05:09:40 +01:00
}
2011-10-20 21:38:57 +02:00
}
2005-11-14 18:48:43 +01:00
Teach psql's tab completion to consider the entire input string.
Up to now, the tab completion logic has only examined the last few words
of the current input line; "last few" being originally as few as four
words, but lately up to nine words. Furthermore, it only looked at what
libreadline considers the current line of input, which made it rather
myopic if you split your command across lines. This was tolerable,
sort of, so long as the match patterns were only designed to consider the
last few words of input; but with the recent addition of HeadMatches()
and Matches() matching rules, we really have to do better if we want
those to behave sanely.
Hence, change the code to break the entire line down into words, and to
include any previous lines in the command buffer along with the active
readline input buffer.
This will be a little bit slower than the previous coding, but some
measurements say that even a query of several thousand characters can be
parsed in a hundred or so microseconds on modern machines; so it's really
not going to be significant for interactive tab completion. To reduce
the cost some, I arranged to avoid the per-word malloc calls that used
to occur: all the words are now kept in one malloc'd buffer.
2015-12-20 19:28:11 +01:00
/* Return the word located at start to end inclusive */
2015-12-21 21:08:56 +01:00
previous_words [ words_found + + ] = outptr ;
i = end - start + 1 ;
memcpy ( outptr , & buf [ start ] , i ) ;
outptr + = i ;
* outptr + + = ' \0 ' ;
Teach psql's tab completion to consider the entire input string.
Up to now, the tab completion logic has only examined the last few words
of the current input line; "last few" being originally as few as four
words, but lately up to nine words. Furthermore, it only looked at what
libreadline considers the current line of input, which made it rather
myopic if you split your command across lines. This was tolerable,
sort of, so long as the match patterns were only designed to consider the
last few words of input; but with the recent addition of HeadMatches()
and Matches() matching rules, we really have to do better if we want
those to behave sanely.
Hence, change the code to break the entire line down into words, and to
include any previous lines in the command buffer along with the active
readline input buffer.
This will be a little bit slower than the previous coding, but some
measurements say that even a query of several thousand characters can be
parsed in a hundred or so microseconds on modern machines; so it's really
not going to be significant for interactive tab completion. To reduce
the cost some, I arranged to avoid the per-word malloc calls that used
to occur: all the words are now kept in one malloc'd buffer.
2015-12-20 19:28:11 +01:00
/* Continue searching */
point = start - 1 ;
2011-10-20 21:38:57 +02:00
}
Adopt a more compact, less error-prone notation for tab completion code.
Replace tests like
else if (pg_strcasecmp(prev4_wd, "CREATE") == 0 &&
pg_strcasecmp(prev3_wd, "TRIGGER") == 0 &&
(pg_strcasecmp(prev_wd, "BEFORE") == 0 ||
pg_strcasecmp(prev_wd, "AFTER") == 0))
with new notation like this:
else if (TailMatches4("CREATE", "TRIGGER", MatchAny, "BEFORE|AFTER"))
In addition, provide some macros COMPLETE_WITH_LISTn() to reduce the amount
of clutter needed to specify a small number of predetermined completion
alternatives.
This makes the code substantially more compact: tab-complete.c gets over a
thousand lines shorter in this patch, despite the addition of a couple of
hundred lines of infrastructure for the new notations. The new way of
specifying match rules seems a whole lot more readable and less
error-prone, too.
There's a lot more that could be done now to make matching faster and more
reliable; for example I suspect that most of the TailMatches() rules should
now be Matches() rules. That would allow them to be skipped after a single
integer comparison if there aren't the right number of words on the line,
and it would reduce the risk of unintended matches. But for now, (mostly)
refrain from reworking any match rules in favor of just converting what
we've got into the new notation.
Thomas Munro, reviewed by Michael Paquier, some adjustments by me
2015-12-19 22:03:14 +01:00
2015-12-21 21:08:56 +01:00
/* Release parsing input workspace, if we made one above */
if ( buf ! = rl_line_buffer )
free ( buf ) ;
Teach psql's tab completion to consider the entire input string.
Up to now, the tab completion logic has only examined the last few words
of the current input line; "last few" being originally as few as four
words, but lately up to nine words. Furthermore, it only looked at what
libreadline considers the current line of input, which made it rather
myopic if you split your command across lines. This was tolerable,
sort of, so long as the match patterns were only designed to consider the
last few words of input; but with the recent addition of HeadMatches()
and Matches() matching rules, we really have to do better if we want
those to behave sanely.
Hence, change the code to break the entire line down into words, and to
include any previous lines in the command buffer along with the active
readline input buffer.
This will be a little bit slower than the previous coding, but some
measurements say that even a query of several thousand characters can be
parsed in a hundred or so microseconds on modern machines; so it's really
not going to be significant for interactive tab completion. To reduce
the cost some, I arranged to avoid the per-word malloc calls that used
to occur: all the words are now kept in one malloc'd buffer.
2015-12-20 19:28:11 +01:00
* nwords = words_found ;
return previous_words ;
2005-11-14 18:48:43 +01:00
}
* Includes tab completion. It's not magic, but it's very cool. At any
rate
it's better than what used to be there.
* Does proper SQL "host variable" substitution as pointed out by Andreas
Zeugwetter (thanks): select * from :foo; Also some changes in how ':'
and ';' are treated (escape with \ to send to backend). This does
_not_
affect the '::' cast operator, but perhaps others that contain : or ;
(but there are none right now).
* To show description with a <something> listing, append '?' to command
name, e.g., \df?. This seemed to be the convenient and logical
solution.
Or append a '+' to see more useless information, e.g., \df+.
* Fixed fflush()'ing bug pointed out by Jan during the regression test
discussion.
* Added LastOid variable. This ought to take care of TODO item "Add a
function to return the last inserted oid, for use in psql scripts"
(under CLIENTS)
E.g.,
insert into foo values(...);
insert into bar values(..., :LastOid);
\echo $LastOid
* \d command shows constraints, rules, and triggers defined on the table
(in addition to indices)
* Various fixes, optimizations, corrections
* Documentation update as well
Note: This now requires snprintf(), which, if necessary, is taken from
src/backend/port. This is certainly a little weird, but it should
suffice
until a source tree cleanup is done.
Enjoy.
--
Peter Eisentraut Sernanders väg 10:115
1999-11-26 05:24:17 +01:00
2015-09-08 20:57:35 +02:00
/*
* Look up the type for the GUC variable with the passed name .
*
* Returns NULL if the variable is unknown . Otherwise the returned string ,
* containing the type , has to be freed .
*/
static char *
get_guctype ( const char * varname )
{
PQExpBufferData query_buffer ;
char * e_varname ;
PGresult * result ;
char * guctype = NULL ;
e_varname = escape_string ( varname ) ;
initPQExpBuffer ( & query_buffer ) ;
appendPQExpBuffer ( & query_buffer ,
" SELECT vartype FROM pg_catalog.pg_settings "
" WHERE pg_catalog.lower(name) = pg_catalog.lower('%s') " ,
e_varname ) ;
result = exec_query ( query_buffer . data ) ;
termPQExpBuffer ( & query_buffer ) ;
free ( e_varname ) ;
if ( PQresultStatus ( result ) = = PGRES_TUPLES_OK & & PQntuples ( result ) > 0 )
guctype = pg_strdup ( PQgetvalue ( result , 0 , 0 ) ) ;
PQclear ( result ) ;
return guctype ;
}
2010-10-11 00:42:35 +02:00
# ifdef NOT_USED
2000-01-12 20:36:36 +01:00
2000-01-19 00:30:24 +01:00
/*
* Surround a string with single quotes . This works for both SQL and
2003-12-01 23:14:40 +01:00
* psql internal . Currently disabled because it is reported not to
2000-01-19 00:30:24 +01:00
* cooperate with certain versions of readline .
*/
2005-11-14 18:48:43 +01:00
static char *
quote_file_name ( char * text , int match_type , char * quote_pointer )
{
char * s ;
size_t length ;
( void ) quote_pointer ; /* not used */
length = strlen ( text ) + ( match_type = = SINGLE_MATCH ? 3 : 2 ) ;
s = pg_malloc ( length ) ;
s [ 0 ] = ' \' ' ;
strcpy ( s + 1 , text ) ;
if ( match_type = = SINGLE_MATCH )
s [ length - 2 ] = ' \' ' ;
s [ length - 1 ] = ' \0 ' ;
return s ;
}
static char *
dequote_file_name ( char * text , char quote_char )
{
char * s ;
size_t length ;
if ( ! quote_char )
return pg_strdup ( text ) ;
length = strlen ( text ) ;
s = pg_malloc ( length - 2 + 1 ) ;
2007-02-07 01:52:35 +01:00
strlcpy ( s , text + 1 , length - 2 + 1 ) ;
2005-11-14 18:48:43 +01:00
return s ;
}
Phase 2 of pgindent updates.
Change pg_bsd_indent to follow upstream rules for placement of comments
to the right of code, and remove pgindent hack that caused comments
following #endif to not obey the general rule.
Commit e3860ffa4dd0dad0dd9eea4be9cc1412373a8c89 wasn't actually using
the published version of pg_bsd_indent, but a hacked-up version that
tried to minimize the amount of movement of comments to the right of
code. The situation of interest is where such a comment has to be
moved to the right of its default placement at column 33 because there's
code there. BSD indent has always moved right in units of tab stops
in such cases --- but in the previous incarnation, indent was working
in 8-space tab stops, while now it knows we use 4-space tabs. So the
net result is that in about half the cases, such comments are placed
one tab stop left of before. This is better all around: it leaves
more room on the line for comment text, and it means that in such
cases the comment uniformly starts at the next 4-space tab stop after
the code, rather than sometimes one and sometimes two tabs after.
Also, ensure that comments following #endif are indented the same
as comments following other preprocessor commands such as #else.
That inconsistency turns out to have been self-inflicted damage
from a poorly-thought-through post-indent "fixup" in pgindent.
This patch is much less interesting than the first round of indent
changes, but also bulkier, so I thought it best to separate the effects.
Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org
Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us
2017-06-21 21:18:54 +02:00
# endif /* NOT_USED */
2001-10-28 07:26:15 +01:00
Phase 2 of pgindent updates.
Change pg_bsd_indent to follow upstream rules for placement of comments
to the right of code, and remove pgindent hack that caused comments
following #endif to not obey the general rule.
Commit e3860ffa4dd0dad0dd9eea4be9cc1412373a8c89 wasn't actually using
the published version of pg_bsd_indent, but a hacked-up version that
tried to minimize the amount of movement of comments to the right of
code. The situation of interest is where such a comment has to be
moved to the right of its default placement at column 33 because there's
code there. BSD indent has always moved right in units of tab stops
in such cases --- but in the previous incarnation, indent was working
in 8-space tab stops, while now it knows we use 4-space tabs. So the
net result is that in about half the cases, such comments are placed
one tab stop left of before. This is better all around: it leaves
more room on the line for comment text, and it means that in such
cases the comment uniformly starts at the next 4-space tab stop after
the code, rather than sometimes one and sometimes two tabs after.
Also, ensure that comments following #endif are indented the same
as comments following other preprocessor commands such as #else.
That inconsistency turns out to have been self-inflicted damage
from a poorly-thought-through post-indent "fixup" in pgindent.
This patch is much less interesting than the first round of indent
changes, but also bulkier, so I thought it best to separate the effects.
Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org
Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us
2017-06-21 21:18:54 +02:00
# endif /* USE_READLINE */
