diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2013-04-28 00:18:45 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2013-04-28 00:18:45 -0400 |
| commit | f8db76e875099e5e49f5cd729a673e84c0b0471b (patch) | |
| tree | 162e43ab4a10fbeef78201e9adc87c433fe9d197 /src/backend/commands | |
| parent | 5525e6c40bbda351a19b48317eba0f79aa32e447 (diff) | |
| download | postgresql-f8db76e875099e5e49f5cd729a673e84c0b0471b.tar.gz postgresql-f8db76e875099e5e49f5cd729a673e84c0b0471b.zip | |
Editorialize a bit on new ProcessUtility() API.
Choose a saner ordering of parameters (adding a new input param after
the output params seemed a bit random), update the function's header
comment to match reality (cmon folks, is this really that hard?),
get rid of useless and sloppily-defined distinction between
PROCESS_UTILITY_SUBCOMMAND and PROCESS_UTILITY_GENERATED.
Diffstat (limited to 'src/backend/commands')
| -rw-r--r-- | src/backend/commands/extension.c | 4 | ||||
| -rw-r--r-- | src/backend/commands/schemacmds.c | 4 | ||||
| -rw-r--r-- | src/backend/commands/trigger.c | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/backend/commands/extension.c b/src/backend/commands/extension.c index 36df8bddcad..2d84ac8620d 100644 --- a/src/backend/commands/extension.c +++ b/src/backend/commands/extension.c @@ -750,10 +750,10 @@ execute_sql_string(const char *sql, const char *filename) { ProcessUtility(stmt, sql, + PROCESS_UTILITY_QUERY, NULL, dest, - NULL, - PROCESS_UTILITY_QUERY); + NULL); } PopActiveSnapshot(); diff --git a/src/backend/commands/schemacmds.c b/src/backend/commands/schemacmds.c index 21d7e608df4..1d13ba0d304 100644 --- a/src/backend/commands/schemacmds.c +++ b/src/backend/commands/schemacmds.c @@ -151,10 +151,10 @@ CreateSchemaCommand(CreateSchemaStmt *stmt, const char *queryString) /* do this step */ ProcessUtility(stmt, queryString, + PROCESS_UTILITY_SUBCOMMAND, NULL, None_Receiver, - NULL, - PROCESS_UTILITY_SUBCOMMAND); + NULL); /* make sure later steps can see the object created here */ CommandCounterIncrement(); } diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c index bebb551f7fa..a0473498bd2 100644 --- a/src/backend/commands/trigger.c +++ b/src/backend/commands/trigger.c @@ -1014,7 +1014,8 @@ ConvertTriggerToFK(CreateTrigStmt *stmt, Oid funcoid) /* ... and execute it */ ProcessUtility((Node *) atstmt, "(generated ALTER TABLE ADD FOREIGN KEY command)", - NULL, None_Receiver, NULL, PROCESS_UTILITY_GENERATED); + PROCESS_UTILITY_SUBCOMMAND, NULL, + None_Receiver, NULL); /* Remove the matched item from the list */ info_list = list_delete_ptr(info_list, info); |