mirror of
https://github.com/postgres/postgres.git
synced 2025-04-22 23:02:54 +03:00
Remove quote removal. Moved to parser.
This commit is contained in:
parent
36aaf2505d
commit
7085aba53c
@ -8,7 +8,7 @@
|
|||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $Header: /cvsroot/pgsql/src/backend/parser/scansup.c,v 1.4 1996/11/04 04:04:58 momjian Exp $
|
* $Header: /cvsroot/pgsql/src/backend/parser/scansup.c,v 1.5 1996/11/15 18:38:55 momjian Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
@ -23,15 +23,6 @@
|
|||||||
#include "utils/elog.h"
|
#include "utils/elog.h"
|
||||||
#include "parser/scansup.h"
|
#include "parser/scansup.h"
|
||||||
|
|
||||||
/*
|
|
||||||
* Scanner error handler.
|
|
||||||
*/
|
|
||||||
static void
|
|
||||||
serror(char *str)
|
|
||||||
{
|
|
||||||
elog(WARN, "*** scanner error: %s\n", str);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ----------------
|
/* ----------------
|
||||||
* scanstr
|
* scanstr
|
||||||
*
|
*
|
||||||
@ -51,31 +42,14 @@ char*
|
|||||||
scanstr(char *s)
|
scanstr(char *s)
|
||||||
{
|
{
|
||||||
static char newStr[MAX_PARSE_BUFFER];
|
static char newStr[MAX_PARSE_BUFFER];
|
||||||
int len, i, start, j;
|
int len, i, j;
|
||||||
char delimiter;
|
|
||||||
|
|
||||||
if (s == NULL || s[0] == '\0')
|
if (s == NULL || s[0] == '\0')
|
||||||
return s;
|
return s;
|
||||||
|
|
||||||
len = strlen(s);
|
len = strlen(s);
|
||||||
start = 0;
|
|
||||||
|
|
||||||
/* remove leading and trailing quotes, if any */
|
for (i = 0, j = 0; i < len ; i++) {
|
||||||
/* the normal backend lexer only accepts single quotes, but the
|
|
||||||
bootstrap lexer accepts double quotes */
|
|
||||||
delimiter = 0;
|
|
||||||
if (s[0] == '"' || s[0] == '\''){
|
|
||||||
delimiter = s[0];
|
|
||||||
start = 1;
|
|
||||||
}
|
|
||||||
if (delimiter != 0) {
|
|
||||||
if (s[len-1] == delimiter)
|
|
||||||
len = len - 1;
|
|
||||||
else
|
|
||||||
serror("mismatched quote delimiters");
|
|
||||||
}
|
|
||||||
|
|
||||||
for (i = start, j = 0; i < len ; i++) {
|
|
||||||
if (s[i] == '\'') {
|
if (s[i] == '\'') {
|
||||||
i = i + 1;
|
i = i + 1;
|
||||||
if (s[i] == '\'')
|
if (s[i] == '\'')
|
||||||
|
Loading…
x
Reference in New Issue
Block a user