|
3 | 3 | * |
4 | 4 | * Copyright (c) 2000-2005, PostgreSQL Global Development Group |
5 | 5 | * |
6 | | - * $PostgreSQL: pgsql/src/bin/psql/tab-complete.c,v 1.147 2006/02/1207:21:40 momjian Exp $ |
| 6 | + * $PostgreSQL: pgsql/src/bin/psql/tab-complete.c,v 1.148 2006/02/1215:25:04 momjian Exp $ |
7 | 7 | */ |
8 | 8 |
|
9 | 9 | /*---------------------------------------------------------------------- |
@@ -140,8 +140,6 @@ static const SchemaQuery *completion_squery;/* to pass a SchemaQuery */ |
140 | 140 | */ |
141 | 141 | #defineCOMPLETE_WITH_QUERY(query) \ |
142 | 142 | do { completion_charp = query; matches = completion_matches(text, complete_from_query); } while(0) |
143 | | -#defineCOMPLETE_WITH_QUERY_ADDON(query,addon) \ |
144 | | -do { completion_charp = query addon; matches = completion_matches(text, complete_from_query); } while(0) |
145 | 143 | #defineCOMPLETE_WITH_SCHEMA_QUERY(query,addon) \ |
146 | 144 | do { completion_squery = &(query); completion_charp = addon; matches = completion_matches(text, complete_from_schema_query); } while(0) |
147 | 145 | #defineCOMPLETE_WITH_LIST(list) \ |
@@ -1657,7 +1655,7 @@ psql_completion(char *text, int start, int end) |
1657 | 1655 | elseif (pg_strcasecmp(prev3_wd,"SET")==0 |
1658 | 1656 | &&pg_strcasecmp(prev2_wd,"SESSION")==0 |
1659 | 1657 | &&pg_strcasecmp(prev_wd,"AUTHORIZATION")==0) |
1660 | | -COMPLETE_WITH_QUERY_ADDON(Query_for_list_of_roles," UNION SELECT 'DEFAULT'"); |
| 1658 | +COMPLETE_WITH_QUERY(Query_for_list_of_roles" UNION SELECT 'DEFAULT'"); |
1661 | 1659 | /* Complete RESET SESSION with AUTHORIZATION */ |
1662 | 1660 | elseif (pg_strcasecmp(prev2_wd,"RESET")==0&& |
1663 | 1661 | pg_strcasecmp(prev_wd,"SESSION")==0) |
|