NotificationsYou must be signed in to change notification settings
Fork5
Star27

Commit1bbbcb0

committed

Make new complaint about unsafe Unicode literals include an error location.

Every other ereport in scan.l has one, this should too.

1 parent249a899 commit1bbbcb0Copy full SHA for 1bbbcb0

File tree

2 files changed

+16

-3

lines changed

src
- backend/parser
  - scan.l
- test/regress/expected
  - strings.out

2 files changed

+16

-3

lines changed

`‎src/backend/parser/scan.l‎`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`* Portions Copyright (c) 1994, Regents of the University of California`
`25`	`25`	`*`
`26`	`26`	`* IDENTIFICATION`
`27`		`- * $PostgreSQL: pgsql/src/backend/parser/scan.l,v 1.152 2009/05/0518:32:17 petere Exp $`
	`27`	`+ * $PostgreSQL: pgsql/src/backend/parser/scan.l,v 1.153 2009/05/0521:09:23 tgl Exp $`
`28`	`28`	`*`
`29`	`29`	`*-------------------------------------------------------------------------`
`30`	`30`	`*/`
`@@ -469,12 +469,13 @@ other.`
`469`	`469`	`startlit();`
`470`	`470`	`}`
`471`	`471`	`{xusstart}{`
	`472`	`+SET_YYLLOC();`
`472`	`473`	`if (!standard_conforming_strings)`
`473`	`474`	`ereport(ERROR,`
`474`	`475`	`(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
`475`	`476`	`errmsg("unsafe use of string constant with Unicode escapes"),`
`476`		`-errdetail("String constants with Unicode escapes cannot be used when standard_conforming_strings is off.")));`
`477`		`-SET_YYLLOC();`
	`477`	`+errdetail("String constants with Unicode escapes cannot be used when standard_conforming_strings is off."),`
	`478`	`+lexer_errposition()));`
`478`	`479`	`BEGIN(xus);`
`479`	`480`	`startlit();`
`480`	`481`	`}`

`‎src/test/regress/expected/strings.out‎`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -62,12 +62,18 @@ LINE 1: SELECT U&'wrong: +0061' UESCAPE '+';`
`62`	`62`	`SET standard_conforming_strings TO off;`
`63`	`63`	`SELECT U&'d\0061t\+000061' AS U&"d\0061t\+000061";`
`64`	`64`	`ERROR: unsafe use of string constant with Unicode escapes`
	`65`	`+LINE 1: SELECT U&'d\0061t\+000061' AS U&"d\0061t\+000061";`
	`66`	`+ ^`
`65`	`67`	`DETAIL: String constants with Unicode escapes cannot be used when standard_conforming_strings is off.`
`66`	`68`	`SELECT U&'d!0061t\+000061' UESCAPE '!' AS U&"d0061t\+000061" UESCAPE '';`
`67`	`69`	`ERROR: unsafe use of string constant with Unicode escapes`
	`70`	`+LINE 1: SELECT U&'d!0061t\+000061' UESCAPE '!' AS U&"d*0061t\+000061...`
	`71`	`+ ^`
`68`	`72`	`DETAIL: String constants with Unicode escapes cannot be used when standard_conforming_strings is off.`
`69`	`73`	`SELECT U&' \' UESCAPE '!' AS "tricky";`
`70`	`74`	`ERROR: unsafe use of string constant with Unicode escapes`
	`75`	`+LINE 1: SELECT U&' \' UESCAPE '!' AS "tricky";`
	`76`	`+ ^`
`71`	`77`	`DETAIL: String constants with Unicode escapes cannot be used when standard_conforming_strings is off.`
`72`	`78`	`SELECT 'tricky' AS U&"\" UESCAPE '!';`
`73`	`79`	`\`
`@@ -77,12 +83,18 @@ SELECT 'tricky' AS U&"\" UESCAPE '!';`
`77`	`83`
`78`	`84`	`SELECT U&'wrong: \061';`
`79`	`85`	`ERROR: unsafe use of string constant with Unicode escapes`
	`86`	`+LINE 1: SELECT U&'wrong: \061';`
	`87`	`+ ^`
`80`	`88`	`DETAIL: String constants with Unicode escapes cannot be used when standard_conforming_strings is off.`
`81`	`89`	`SELECT U&'wrong: \+0061';`
`82`	`90`	`ERROR: unsafe use of string constant with Unicode escapes`
	`91`	`+LINE 1: SELECT U&'wrong: \+0061';`
	`92`	`+ ^`
`83`	`93`	`DETAIL: String constants with Unicode escapes cannot be used when standard_conforming_strings is off.`
`84`	`94`	`SELECT U&'wrong: +0061' UESCAPE '+';`
`85`	`95`	`ERROR: unsafe use of string constant with Unicode escapes`
	`96`	`+LINE 1: SELECT U&'wrong: +0061' UESCAPE '+';`
	`97`	`+ ^`
`86`	`98`	`DETAIL: String constants with Unicode escapes cannot be used when standard_conforming_strings is off.`
`87`	`99`	`RESET standard_conforming_strings;`
`88`	`100`	`--`

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!

Commit1bbbcb0

File tree

2 files changed

2 files changed

`‎src/backend/parser/scan.l‎`

`‎src/test/regress/expected/strings.out‎`

0 commit comments