database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-08-30 06:01:21 +03:00
Code Activity

Revert "psql: fix \connect with URIs and conninfo strings"

Browse Source 
This reverts commit fcef161729, about
which both the buildfarm and my local machine are very unhappy.
This commit is contained in:
Robert Haas
2015-04-02 10:10:22 -04:00
parent 7dae3cf68c
commit 4cd639baf4
8 changed files with 79 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/Makefile
View File

@@ -26,7 +26,7 @@ LIBS += $(PTHREAD_LIBS)
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)

53
src/common/connstrings.c
View File

@@ -1,53 +0,0 @@
/*
* connstrings.c
* connecting string processing functions
*
* Copyright (c) 2012-2015, PostgreSQL Global Development Group
*
* src/include/common/connstrings.c
*/
#include "postgres_fe.h"
#include <string.h>
#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;
}