+ class="parameter">host or
+ class="parameter">port are omitted or specified
+ as -, the value of that parameter from the
+ previous connection is used. If there is no previous
+ connection, the
libpq default for
+ the parameter's value is used.
- When using positional parameters, if any of
- dbname,
- username,
- host or
- port are omitted or
- specified as -, the value of that parameter from
- the previous connection is used; if there is no previous connection,
- the
libpq default for the parameter's value
- is used. When using conninfo strings, no values from the
- previous connection are used for the new connection.
-
-
- If the new connection is successfully made, the previous
- connection is closed.
If the connection attempt failed (wrong user name, access
denied, etc.), the previous connection will only be kept if
psql is in interactive mode. When
mechanism that scripts are not accidentally acting on the
wrong database on the other hand.
-
- Examples:
-
-=> \c mydb myuser host.dom 6432
-=> \c service=foo
-=> \c "host=localhost port=5432 dbname=mydb connect_timeout=10 sslmode=disable"
-=> \c postgresql://tom@localhost/mydb?application_name=myapp
-
#include /* for stat() */
#endif
-#include "common/connstrings.h"
#include "portability/instr_time.h"
#include "libpq-fe.h"
PGconn *o_conn = pset.db,
*n_conn;
char *password = NULL;
- bool keep_password;
- bool has_connection_string;
if (!o_conn && (!dbname || !user || !host || !port))
{
return false;
}
- /* grab values from the old connection, unless supplied by caller */
+ if (!dbname)
+ dbname = PQdb(o_conn);
if (!user)
user = PQuser(o_conn);
if (!host)
if (!port)
port = PQport(o_conn);
- has_connection_string =
- dbname ? libpq_connstring_is_recognized(dbname) : false;
-
- /*
- * Any change in the parameters read above makes us discard the password.
- * We also discard it if we're to use a conninfo rather than the positional
- * syntax.
- */
- keep_password =
- ((strcmp(user, PQuser(o_conn)) == 0) &&
- (!host || strcmp(host, PQhost(o_conn)) == 0) &&
- (strcmp(port, PQport(o_conn)) == 0) &&
- !has_connection_string);
-
- /*
- * Grab dbname from old connection unless supplied by caller. No password
- * discard if this changes: passwords aren't (usually) database-specific.
- */
- if (!dbname)
- dbname = PQdb(o_conn);
-
/*
* If the user asked to be prompted for a password, ask for one now. If
* not, use the password from the old connection, provided the username
{
password = prompt_for_password(user);
}
- else if (o_conn && keep_password)
+ else if (o_conn && user && strcmp(PQuser(o_conn), user) == 0)
{
- password = PQpass(o_conn);
- if (password && *password)
- password = pg_strdup(password);
- else
- password = NULL;
+ password = pg_strdup(PQpass(o_conn));
}
while (true)
#define PARAMS_ARRAY_SIZE 8
const char **keywords = pg_malloc(PARAMS_ARRAY_SIZE * sizeof(*keywords));
const char **values = pg_malloc(PARAMS_ARRAY_SIZE * sizeof(*values));
- int paramnum = 0;
-
- keywords[0] = "dbname";
- values[0] = dbname;
-
- if (!has_connection_string)
- {
- keywords[++paramnum] = "host";
- values[paramnum] = host;
- keywords[++paramnum] = "port";
- values[paramnum] = port;
- keywords[++paramnum] = "user";
- values[paramnum] = user;
- }
- keywords[++paramnum] = "password";
- values[paramnum] = password;
- keywords[++paramnum] = "fallback_application_name";
- values[paramnum] = pset.progname;
- keywords[++paramnum] = "client_encoding";
- values[paramnum] = (pset.notty || getenv("PGCLIENTENCODING")) ? NULL : "auto";
- /* add array terminator */
- keywords[++paramnum] = NULL;
- values[paramnum] = NULL;
+ keywords[0] = "host";
+ values[0] = host;
+ keywords[1] = "port";
+ values[1] = port;
+ keywords[2] = "user";
+ values[2] = user;
+ keywords[3] = "password";
+ values[3] = password;
+ keywords[4] = "dbname";
+ values[4] = dbname;
+ keywords[5] = "fallback_application_name";
+ values[5] = pset.progname;
+ keywords[6] = "client_encoding";
+ values[6] = (pset.notty || getenv("PGCLIENTENCODING")) ? NULL : "auto";
+ keywords[7] = NULL;
+ values[7] = NULL;
n_conn = PQconnectdbParams(keywords, values, true);
- pg_free(keywords);
- pg_free(values);
+ free(keywords);
+ free(values);
/* We can immediately discard the password -- no longer needed */
if (password)
- pg_free(password);
+ free(password);
if (PQstatus(n_conn) == CONNECTION_OK)
break;
fprintf(output, _("Connection\n"));
if (currdb)
- fprintf(output, _(" \\c[onnect] {[DBNAME|- USER|- HOST|- PORT|-] | conninfo}\n"
+ fprintf(output, _(" \\c[onnect] [DBNAME|- USER|- HOST|- PORT|-]\n"
" connect to new database (currently \"%s\")\n"),
currdb);
else
- fprintf(output, _(" \\c[onnect] {[DBNAME|- USER|- HOST|- PORT|-] | conninfo}\n"
+ fprintf(output, _(" \\c[onnect] [DBNAME|- USER|- HOST|- PORT|-]\n"
" connect to new database (currently no connection)\n"));
fprintf(output, _(" \\encoding [ENCODING] show or set client encoding\n"));
fprintf(output, _(" \\password [USERNAME] securely change the password for a user\n"));
#include "libpq-fe.h"
#include "pqexpbuffer.h"
#include "common.h"
-#include "common/connstrings.h"
#include "settings.h"
#include "stringutils.h"
COMPLETE_WITH_LIST_CS(my_list);
}
-
else if (strcmp(prev_wd, "\\connect") == 0 || strcmp(prev_wd, "\\c") == 0)
- {
- if (!libpq_connstring_is_recognized(text))
- COMPLETE_WITH_QUERY(Query_for_list_of_databases);
- /* TODO: URI/service completion. Nothing for now */
- }
+ COMPLETE_WITH_QUERY(Query_for_list_of_databases);
else if (strcmp(prev2_wd, "\\connect") == 0 || strcmp(prev2_wd, "\\c") == 0)
- {
- if (!libpq_connstring_is_recognized(prev_wd))
- COMPLETE_WITH_QUERY(Query_for_list_of_roles);
- }
+ COMPLETE_WITH_QUERY(Query_for_list_of_roles);
else if (strncmp(prev_wd, "\\da", strlen("\\da")) == 0)
COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_aggregates, NULL);
OBJS_COMMON = exec.o pg_crc.o pg_lzcompress.o pgfnames.o psprintf.o relpath.o \
rmtree.o string.o username.o wait_error.o
-OBJS_FRONTEND = $(OBJS_COMMON) fe_memutils.o restricted_token.o connstrings.o
+OBJS_FRONTEND = $(OBJS_COMMON) fe_memutils.o restricted_token.o
OBJS_SRV = $(OBJS_COMMON:%.o=%_srv.o)
+++ /dev/null
-/*
- * connstrings.c
- * connecting string processing functions
- *
- * Copyright (c) 2012-2015, PostgreSQL Global Development Group
- *
- * src/include/common/connstrings.c
- */
-#include "postgres_fe.h"
-
-#include
-
-#include "common/connstrings.h"
-
-
-/* The connection URI must start with either of the following designators: */
-static const char uri_designator[] = "postgresql://";
-static const char short_uri_designator[] = "postgres://";
-
-
-/*
- * Checks if connection string starts with either of the valid URI prefix
- * designators.
- *
- * Returns the URI prefix length, 0 if the string doesn't contain a URI prefix.
- */
-int
-libpq_connstring_uri_prefix_length(const char *connstr)
-{
- if (strncmp(connstr, uri_designator,
- sizeof(uri_designator) - 1) == 0)
- return sizeof(uri_designator) - 1;
-
- if (strncmp(connstr, short_uri_designator,
- sizeof(short_uri_designator) - 1) == 0)
- return sizeof(short_uri_designator) - 1;
-
- return 0;
-}
-
-/*
- * Recognized connection string either starts with a valid URI prefix or
- * contains a "=" in it.
- *
- * Must be consistent with parse_connection_string: anything for which this
- * returns true should at least look like it's parseable by that routine.
- */
-bool
-libpq_connstring_is_recognized(const char *connstr)
-{
- return libpq_connstring_uri_prefix_length(connstr) != 0 ||
- strchr(connstr, '=') != NULL;
-}
+++ /dev/null
-/*
- * connstrings.h
- * connecting string processing prototypes
- *
- * Copyright (c) 2012-2015, PostgreSQL Global Development Group
- *
- * src/include/common/connstrings.h
- */
-#ifndef CONNSTRINGS_H
-#define CONNSTRINGS_H
-
-
-extern int libpq_connstring_uri_prefix_length(const char *connstr);
-extern bool libpq_connstring_is_recognized(const char *connstr);
-
-#endif /* CONNSTRINGS_H */
#include
#include
-#include "common/connstrings.h"
#include "libpq-fe.h"
#include "libpq-int.h"
#include "fe-auth.h"
static PQconninfoOption *conninfo_init(PQExpBuffer errorMessage);
static PQconninfoOption *parse_connection_string(const char *conninfo,
PQExpBuffer errorMessage, bool use_defaults);
+static int uri_prefix_length(const char *connstr);
+static bool recognized_connection_string(const char *connstr);
static PQconninfoOption *conninfo_parse(const char *conninfo,
PQExpBuffer errorMessage, bool use_defaults);
static PQconninfoOption *conninfo_array_parse(const char *const * keywords,
* If the dbName parameter contains what looks like a connection string,
* parse it into conn struct using connectOptions1.
*/
- if (dbName && libpq_connstring_is_recognized(dbName))
+ if (dbName && recognized_connection_string(dbName))
{
if (!connectOptions1(conn, dbName))
return conn;
bool use_defaults)
{
/* Parse as URI if connection string matches URI prefix */
- if (libpq_connstring_uri_prefix_length(connstr) != 0)
+ if (uri_prefix_length(connstr) != 0)
return conninfo_uri_parse(connstr, errorMessage, use_defaults);
/* Parse as default otherwise */
return conninfo_parse(connstr, errorMessage, use_defaults);
}
+/*
+ * Checks if connection string starts with either of the valid URI prefix
+ * designators.
+ *
+ * Returns the URI prefix length, 0 if the string doesn't contain a URI prefix.
+ */
+static int
+uri_prefix_length(const char *connstr)
+{
+ if (strncmp(connstr, uri_designator,
+ sizeof(uri_designator) - 1) == 0)
+ return sizeof(uri_designator) - 1;
+
+ if (strncmp(connstr, short_uri_designator,
+ sizeof(short_uri_designator) - 1) == 0)
+ return sizeof(short_uri_designator) - 1;
+
+ return 0;
+}
+
+/*
+ * Recognized connection string either starts with a valid URI prefix or
+ * contains a "=" in it.
+ *
+ * Must be consistent with parse_connection_string: anything for which this
+ * returns true should at least look like it's parseable by that routine.
+ */
+static bool
+recognized_connection_string(const char *connstr)
+{
+ return uri_prefix_length(connstr) != 0 || strchr(connstr, '=') != NULL;
+}
+
/*
* Subroutine for parse_connection_string
*
*
* If expand_dbname is non-zero, and the value passed for the first occurrence
* of "dbname" keyword is a connection string (as indicated by
- * libpq_connstring_is_recognized) then parse and process it, overriding any
+ * recognized_connection_string) then parse and process it, overriding any
* previously processed conflicting keywords. Subsequent keywords will take
* precedence, however.
*/
* defaults here -- those get picked up later. We only want to
* override for those parameters actually passed.
*/
- if (libpq_connstring_is_recognized(pvalue))
+ if (recognized_connection_string(pvalue))
{
dbname_options = parse_connection_string(pvalue, errorMessage, false);
if (dbname_options == NULL)
start = buf;
/* Skip the URI prefix */
- prefix_len = libpq_connstring_uri_prefix_length(uri);
+ prefix_len = uri_prefix_length(uri);
if (prefix_len == 0)
{
/* Should never happen */
projects / postgresql.git / commitdiff