NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commitf13c132

committed

Have psql escape bytes in strings for variables follow the backend

conventions of only allowing octal, like \045. Remove support for\decimal, \0octal, and \0xhex which matches the strtol() function butdidn't make sense with backslashes.These now return the same character:test=> \set x '\54'test=> \echo :x,test=> \set x '\054'test=> \echo :x,THIS IS A BACKWARD COMPATIBILITY CHANGE.

1 parent6616e23 commitf13c132Copy full SHA for f13c132

File tree

1 file changed

-22

lines changed

src/bin/psql
- psqlscan.l

1 file changed

-22

lines changed

`‎src/bin/psql/psqlscan.l`

Lines changed: 3 additions & 22 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`* Portions Copyright (c) 1994, Regents of the University of California`
`34`	`34`	`*`
`35`	`35`	`* IDENTIFICATION`
`36`		`- * $PostgreSQL: pgsql/src/bin/psql/psqlscan.l,v 1.10 2005/05/26 01:24:29 tgl Exp $`
	`36`	`+ * $PostgreSQL: pgsql/src/bin/psql/psqlscan.l,v 1.11 2005/05/30 14:50:35 momjian Exp $`
`37`	`37`	`*`
`38`	`38`	`*-------------------------------------------------------------------------`
`39`	`39`	`*/`
`@@ -849,29 +849,10 @@ other.`
`849`	`849`	`"\\r"{appendPQExpBufferChar(output_buf,'\r'); }`
`850`	`850`	`"\\f"{appendPQExpBufferChar(output_buf,'\f'); }`
`851`	`851`
`852`		`-"\\"[1-9][0-9]*{`
`853`		`-/* decimal case */`
`854`		`-appendPQExpBufferChar(output_buf,`
`855`		`- (char)strtol(yytext +1,NULL,0));`
`856`		`-}`
`857`		`-`
`858`		`-"\\"0[0-7]*{`
	`852`	`+"\\"[0-7]{1,3}{`
`859`	`853`	`/* octal case */`
`860`	`854`	`appendPQExpBufferChar(output_buf,`
`861`		`- (char)strtol(yytext +1,NULL,0));`
`862`		`-}`
`863`		`-`
`864`		`-"\\"0[xX][0-9A-Fa-f]+{`
`865`		`-/* hex case */`
`866`		`-appendPQExpBufferChar(output_buf,`
`867`		`- (char)strtol(yytext +1,NULL,0));`
`868`		`-}`
`869`		`-`
`870`		`-"\\"0[xX]{`
`871`		`-/* failed hex case */`
`872`		`-yyless(2);`
`873`		`-appendPQExpBufferChar(output_buf,`
`874`		`- (char)strtol(yytext +1,NULL,0));`
	`855`	`+ (char)strtol(yytext +1,NULL,8));`
`875`	`856`	`}`
`876`	`857`
`877`	`858`	`"\\".{emit(yytext +1,1); }`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitf13c132

File tree

1 file changed

1 file changed

`‎src/bin/psql/psqlscan.l`

0 commit comments