|
8 | 8 | * |
9 | 9 | * |
10 | 10 | * IDENTIFICATION |
11 | | - * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.318 2003/03/20 07:02:10 momjian Exp $ |
| 11 | + * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.319 2003/03/22 04:23:34 momjian Exp $ |
12 | 12 | * |
13 | 13 | * NOTES |
14 | 14 | * this is the "main" module of the postgres backend and |
@@ -927,6 +927,10 @@ pg_exec_query_string(StringInfo query_string,/* string to execute */ |
927 | 927 | EndCommand(commandTag,dest); |
928 | 928 | }/* end loop over parsetrees */ |
929 | 929 |
|
| 930 | +/* No parsetree - return empty result */ |
| 931 | +if (!parsetree_list) |
| 932 | +NullCommand(dest); |
| 933 | + |
930 | 934 | /* |
931 | 935 | * Close down transaction statement, if one is open. (Note that this |
932 | 936 | * will only happen if the querystring was empty.) |
@@ -1789,7 +1793,7 @@ PostgresMain(int argc, char *argv[], const char *username) |
1789 | 1793 | if (!IsUnderPostmaster) |
1790 | 1794 | { |
1791 | 1795 | puts("\nPOSTGRES backend interactive interface "); |
1792 | | -puts("$Revision: 1.318 $ $Date: 2003/03/20 07:02:10 $\n"); |
| 1796 | +puts("$Revision: 1.319 $ $Date: 2003/03/22 04:23:34 $\n"); |
1793 | 1797 | } |
1794 | 1798 |
|
1795 | 1799 | /* |
@@ -1995,36 +1999,23 @@ PostgresMain(int argc, char *argv[], const char *username) |
1995 | 1999 | * 'Q' indicates a user query |
1996 | 2000 | */ |
1997 | 2001 | case'Q': |
1998 | | -if (strspn(parser_input->data," \t\r\n")==parser_input->len) |
1999 | | -{ |
2000 | | -/* |
2001 | | - * if there is nothing in the input buffer, don't |
2002 | | - * bother trying to parse and execute anything; just |
2003 | | - * send back a quick NullCommand response. |
2004 | | - */ |
2005 | | -if (IsUnderPostmaster) |
2006 | | -NullCommand(Remote); |
2007 | | -} |
2008 | | -else |
2009 | | -{ |
2010 | | -/* |
2011 | | - * otherwise, process the input string. |
2012 | | - * |
2013 | | - * Note: transaction command start/end is now done within |
2014 | | - * pg_exec_query_string(), not here. |
2015 | | - */ |
2016 | | -if (log_statement_stats) |
2017 | | -ResetUsage(); |
| 2002 | +/* |
| 2003 | + * otherwise, process the input string. |
| 2004 | + * |
| 2005 | + * Note: transaction command start/end is now done within |
| 2006 | + * pg_exec_query_string(), not here. |
| 2007 | + */ |
| 2008 | +if (log_statement_stats) |
| 2009 | +ResetUsage(); |
2018 | 2010 |
|
2019 | | -pgstat_report_activity(parser_input->data); |
| 2011 | +pgstat_report_activity(parser_input->data); |
2020 | 2012 |
|
2021 | | -pg_exec_query_string(parser_input, |
2022 | | -whereToSendOutput, |
2023 | | -QueryContext); |
| 2013 | +pg_exec_query_string(parser_input, |
| 2014 | +whereToSendOutput, |
| 2015 | +QueryContext); |
2024 | 2016 |
|
2025 | | -if (log_statement_stats) |
2026 | | -ShowUsage("QUERY STATISTICS"); |
2027 | | -} |
| 2017 | +if (log_statement_stats) |
| 2018 | +ShowUsage("QUERY STATISTICS"); |
2028 | 2019 | break; |
2029 | 2020 |
|
2030 | 2021 | /* |
|