NotificationsYou must be signed in to change notification settings
Fork28
Star153

Commit8fc4197

committed

Fix omission of DiscardStmt in GetCommandLogLevel, per report from Hubert

Depesz Lubaczewski. In HEAD, also move a couple of other cases to make thecode ordering match up with ProcessUtility.

1 parent9d3275e commit8fc4197Copy full SHA for 8fc4197

File tree

1 file changed

+42

-37

lines changed

src/backend/tcop
- utility.c

1 file changed

+42

-37

lines changed

`‎src/backend/tcop/utility.c‎`

Lines changed: 42 additions & 37 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $PostgreSQL: pgsql/src/backend/tcop/utility.c,v 1.298 2008/09/01 20:42:45 tgl Exp $`
	`13`	`+ * $PostgreSQL: pgsql/src/backend/tcop/utility.c,v 1.299 2008/10/10 13:48:05 tgl Exp $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -147,7 +147,8 @@ check_xact_readonly(Node *parsetree)`
`147`	`147`
`148`	`148`	`/*`
`149`	`149`	`* Note: Commands that need to do more complicated checking are handled`
`150`		`- * elsewhere.`
	`150`	`+ * elsewhere, in particular COPY and plannable statements do their`
	`151`	`+ * own checking.`
`151`	`152`	`*/`
`152`	`153`
`153`	`154`	`switch (nodeTag(parsetree))`
`@@ -2015,10 +2016,6 @@ GetCommandLogLevel(Node *parsetree)`
`2015`	`2016`	`lev=LOGSTMT_ALL;`
`2016`	`2017`	`break;`
`2017`	`2018`
`2018`		`-caseT_CreateDomainStmt:`
`2019`		`-lev=LOGSTMT_DDL;`
`2020`		`-break;`
`2021`		`-`
`2022`	`2019`	`caseT_CreateSchemaStmt:`
`2023`	`2020`	`lev=LOGSTMT_DDL;`
`2024`	`2021`	`break;`
`@@ -2054,6 +2051,33 @@ GetCommandLogLevel(Node *parsetree)`
`2054`	`2051`	`lev=LOGSTMT_ALL;`
`2055`	`2052`	`break;`
`2056`	`2053`
	`2054`	`+caseT_PrepareStmt:`
	`2055`	`+{`
	`2056`	`+PrepareStmtstmt= (PrepareStmt)parsetree;`
	`2057`	`+`
	`2058`	`+/* Look through a PREPARE to the contained stmt */`
	`2059`	`+lev=GetCommandLogLevel(stmt->query);`
	`2060`	`+}`
	`2061`	`+break;`
	`2062`	`+`
	`2063`	`+caseT_ExecuteStmt:`
	`2064`	`+{`
	`2065`	`+ExecuteStmtstmt= (ExecuteStmt)parsetree;`
	`2066`	`+PreparedStatement*ps;`
	`2067`	`+`
	`2068`	`+/* Look through an EXECUTE to the referenced stmt */`
	`2069`	`+ps=FetchPreparedStatement(stmt->name, false);`
	`2070`	`+if (ps)`
	`2071`	`+lev=GetCommandLogLevel(ps->plansource->raw_parse_tree);`
	`2072`	`+else`
	`2073`	`+lev=LOGSTMT_ALL;`
	`2074`	`+}`
	`2075`	`+break;`
	`2076`	`+`
	`2077`	`+caseT_DeallocateStmt:`
	`2078`	`+lev=LOGSTMT_ALL;`
	`2079`	`+break;`
	`2080`	`+`
`2057`	`2081`	`caseT_RenameStmt:`
`2058`	`2082`	`lev=LOGSTMT_DDL;`
`2059`	`2083`	`break;`
`@@ -2074,10 +2098,6 @@ GetCommandLogLevel(Node *parsetree)`
`2074`	`2098`	`lev=LOGSTMT_DDL;`
`2075`	`2099`	`break;`
`2076`	`2100`
`2077`		`-caseT_AlterFunctionStmt:`
`2078`		`-lev=LOGSTMT_DDL;`
`2079`		`-break;`
`2080`		`-`
`2081`	`2101`	`caseT_GrantStmt:`
`2082`	`2102`	`lev=LOGSTMT_DDL;`
`2083`	`2103`	`break;`
`@@ -2106,6 +2126,10 @@ GetCommandLogLevel(Node *parsetree)`
`2106`	`2126`	`lev=LOGSTMT_DDL;`
`2107`	`2127`	`break;`
`2108`	`2128`
	`2129`	`+caseT_AlterFunctionStmt:`
	`2130`	`+lev=LOGSTMT_DDL;`
	`2131`	`+break;`
	`2132`	`+`
`2109`	`2133`	`caseT_IndexStmt:`
`2110`	`2134`	`lev=LOGSTMT_DDL;`
`2111`	`2135`	`break;`
`@@ -2186,6 +2210,10 @@ GetCommandLogLevel(Node *parsetree)`
`2186`	`2210`	`lev=LOGSTMT_ALL;`
`2187`	`2211`	`break;`
`2188`	`2212`
	`2213`	`+caseT_DiscardStmt:`
	`2214`	`+lev=LOGSTMT_ALL;`
	`2215`	`+break;`
	`2216`	`+`
`2189`	`2217`	`caseT_CreateTrigStmt:`
`2190`	`2218`	`lev=LOGSTMT_DDL;`
`2191`	`2219`	`break;`
`@@ -2202,6 +2230,10 @@ GetCommandLogLevel(Node *parsetree)`
`2202`	`2230`	`lev=LOGSTMT_DDL;`
`2203`	`2231`	`break;`
`2204`	`2232`
	`2233`	`+caseT_CreateDomainStmt:`
	`2234`	`+lev=LOGSTMT_DDL;`
	`2235`	`+break;`
	`2236`	`+`
`2205`	`2237`	`caseT_CreateRoleStmt:`
`2206`	`2238`	`lev=LOGSTMT_DDL;`
`2207`	`2239`	`break;`
`@@ -2282,33 +2314,6 @@ GetCommandLogLevel(Node *parsetree)`
`2282`	`2314`	`lev=LOGSTMT_DDL;`
`2283`	`2315`	`break;`
`2284`	`2316`
`2285`		`-caseT_PrepareStmt:`
`2286`		`-{`
`2287`		`-PrepareStmtstmt= (PrepareStmt)parsetree;`
`2288`		`-`
`2289`		`-/* Look through a PREPARE to the contained stmt */`
`2290`		`-lev=GetCommandLogLevel(stmt->query);`
`2291`		`-}`
`2292`		`-break;`
`2293`		`-`
`2294`		`-caseT_ExecuteStmt:`
`2295`		`-{`
`2296`		`-ExecuteStmtstmt= (ExecuteStmt)parsetree;`
`2297`		`-PreparedStatement*ps;`
`2298`		`-`
`2299`		`-/* Look through an EXECUTE to the referenced stmt */`
`2300`		`-ps=FetchPreparedStatement(stmt->name, false);`
`2301`		`-if (ps)`
`2302`		`-lev=GetCommandLogLevel(ps->plansource->raw_parse_tree);`
`2303`		`-else`
`2304`		`-lev=LOGSTMT_ALL;`
`2305`		`-}`
`2306`		`-break;`
`2307`		`-`
`2308`		`-caseT_DeallocateStmt:`
`2309`		`-lev=LOGSTMT_ALL;`
`2310`		`-break;`
`2311`		`-`
`2312`	`2317`	`/* already-planned queries */`
`2313`	`2318`	`caseT_PlannedStmt:`
`2314`	`2319`	`{`

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!

Commit8fc4197

File tree

1 file changed

1 file changed

`‎src/backend/tcop/utility.c‎`

0 commit comments