NotificationsYou must be signed in to change notification settings
Fork28
Star153

Commit96656f7

committed

Try to make 'cross-database references are not implemented' errors a

bit more helpful by identifying the specific qualified name beingcomplained of.

1 parent6994641 commit96656f7Copy full SHA for 96656f7

File tree

3 files changed

+15

-8

lines changed

src/backend
- catalog
  - namespace.c
- parser
  - parse_expr.c
  - parse_target.c

3 files changed

+15

-8

lines changed

`‎src/backend/catalog/namespace.c‎`

Lines changed: 9 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`* Portions Copyright (c) 1994, Regents of the University of California`
`14`	`14`	`*`
`15`	`15`	`* IDENTIFICATION`
`16`		`- * $PostgreSQL: pgsql/src/backend/catalog/namespace.c,v 1.62 2004/01/19 19:04:40 tgl Exp $`
	`16`	`+ * $PostgreSQL: pgsql/src/backend/catalog/namespace.c,v 1.63 2004/02/13 01:08:20 tgl Exp $`
`17`	`17`	`*`
`18`	`18`	`*-------------------------------------------------------------------------`
`19`	`19`	`*/`
`@@ -165,7 +165,9 @@ RangeVarGetRelid(const RangeVar *relation, bool failOK)`
`165`	`165`	`if (strcmp(relation->catalogname,get_database_name(MyDatabaseId))!=0)`
`166`	`166`	`ereport(ERROR,`
`167`	`167`	`(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
`168`		`-errmsg("cross-database references are not implemented")));`
	`168`	`+errmsg("cross-database references are not implemented: \"%s.%s.%s\"",`
	`169`	`+relation->catalogname,relation->schemaname,`
	`170`	`+relation->relname)));`
`169`	`171`	`}`
`170`	`172`
`171`	`173`	`if (relation->schemaname)`
`@@ -218,7 +220,9 @@ RangeVarGetCreationNamespace(const RangeVar *newRelation)`
`218`	`220`	`if (strcmp(newRelation->catalogname,get_database_name(MyDatabaseId))!=0)`
`219`	`221`	`ereport(ERROR,`
`220`	`222`	`(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
`221`		`-errmsg("cross-database references are not implemented")));`
	`223`	`+errmsg("cross-database references are not implemented: \"%s.%s.%s\"",`
	`224`	`+newRelation->catalogname,newRelation->schemaname,`
	`225`	`+newRelation->relname)));`
`222`	`226`	`}`
`223`	`227`
`224`	`228`	`if (newRelation->istemp)`
`@@ -1182,7 +1186,8 @@ DeconstructQualifiedName(List *names,`
`1182`	`1186`	`if (strcmp(catalogname,get_database_name(MyDatabaseId))!=0)`
`1183`	`1187`	`ereport(ERROR,`
`1184`	`1188`	`(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
`1185`		`-errmsg("cross-database references are not implemented")));`
	`1189`	`+errmsg("cross-database references are not implemented: %s",`
	`1190`	`+NameListToString(names))));`
`1186`	`1191`	`break;`
`1187`	`1192`	`default:`
`1188`	`1193`	`ereport(ERROR,`

`‎src/backend/parser/parse_expr.c‎`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/parser/parse_expr.c,v 1.164 2003/11/29 19:51:52 pgsql Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/parser/parse_expr.c,v 1.165 2004/02/13 01:08:20 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -1115,7 +1115,8 @@ transformColumnRef(ParseState pstate, ColumnRef cref)`
`1115`	`1115`	`if (strcmp(name1,get_database_name(MyDatabaseId))!=0)`
`1116`	`1116`	`ereport(ERROR,`
`1117`	`1117`	`(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
`1118`		`-errmsg("cross-database references are not implemented")));`
	`1118`	`+errmsg("cross-database references are not implemented: %s",`
	`1119`	`+NameListToString(cref->fields))));`
`1119`	`1120`
`1120`	`1121`	`/* Whole-row reference? */`
`1121`	`1122`	`if (strcmp(name4,"*")==0)`

`‎src/backend/parser/parse_target.c‎`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/parser/parse_target.c,v 1.114 2003/11/29 19:51:52 pgsql Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/parser/parse_target.c,v 1.115 2004/02/13 01:08:20 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -159,7 +159,8 @@ transformTargetList(ParseState pstate, List targetlist)`
`159`	`159`	`if (strcmp(name1,get_database_name(MyDatabaseId))!=0)`
`160`	`160`	`ereport(ERROR,`
`161`	`161`	`(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
`162`		`-errmsg("cross-database references are not implemented")));`
	`162`	`+errmsg("cross-database references are not implemented: %s",`
	`163`	`+NameListToString(fields))));`
`163`	`164`	`schemaname=strVal(lsecond(fields));`
`164`	`165`	`relname=strVal(lthird(fields));`
`165`	`166`	`break;`

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!

Commit96656f7

File tree

3 files changed

3 files changed

`‎src/backend/catalog/namespace.c‎`

`‎src/backend/parser/parse_expr.c‎`

`‎src/backend/parser/parse_target.c‎`

0 commit comments