mirror of
https://github.com/postgres/postgres.git
synced 2025-07-02 09:02:37 +03:00
Final removal of -q options, which haven't done anything since 8.3 and
were marked for removal in 8.4.
This commit is contained in:
@ -5,7 +5,7 @@
|
|||||||
* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
|
* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
|
||||||
* Portions Copyright (c) 1994, Regents of the University of California
|
* Portions Copyright (c) 1994, Regents of the University of California
|
||||||
*
|
*
|
||||||
* $PostgreSQL: pgsql/src/bin/scripts/createdb.c,v 1.32 2009/02/26 16:02:39 petere Exp $
|
* $PostgreSQL: pgsql/src/bin/scripts/createdb.c,v 1.33 2009/02/26 16:20:55 petere Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
@ -28,7 +28,6 @@ main(int argc, char *argv[])
|
|||||||
{"no-password", no_argument, NULL, 'w'},
|
{"no-password", no_argument, NULL, 'w'},
|
||||||
{"password", no_argument, NULL, 'W'},
|
{"password", no_argument, NULL, 'W'},
|
||||||
{"echo", no_argument, NULL, 'e'},
|
{"echo", no_argument, NULL, 'e'},
|
||||||
{"quiet", no_argument, NULL, 'q'},
|
|
||||||
{"owner", required_argument, NULL, 'O'},
|
{"owner", required_argument, NULL, 'O'},
|
||||||
{"tablespace", required_argument, NULL, 'D'},
|
{"tablespace", required_argument, NULL, 'D'},
|
||||||
{"template", required_argument, NULL, 'T'},
|
{"template", required_argument, NULL, 'T'},
|
||||||
@ -68,7 +67,7 @@ main(int argc, char *argv[])
|
|||||||
|
|
||||||
handle_help_version_opts(argc, argv, "createdb", help);
|
handle_help_version_opts(argc, argv, "createdb", help);
|
||||||
|
|
||||||
while ((c = getopt_long(argc, argv, "h:p:U:wWeqO:D:T:E:l:", long_options, &optindex)) != -1)
|
while ((c = getopt_long(argc, argv, "h:p:U:wWeO:D:T:E:l:", long_options, &optindex)) != -1)
|
||||||
{
|
{
|
||||||
switch (c)
|
switch (c)
|
||||||
{
|
{
|
||||||
@ -90,9 +89,6 @@ main(int argc, char *argv[])
|
|||||||
case 'e':
|
case 'e':
|
||||||
echo = true;
|
echo = true;
|
||||||
break;
|
break;
|
||||||
case 'q':
|
|
||||||
/* obsolete; remove in 8.4 */
|
|
||||||
break;
|
|
||||||
case 'O':
|
case 'O':
|
||||||
owner = optarg;
|
owner = optarg;
|
||||||
break;
|
break;
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
|
* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
|
||||||
* Portions Copyright (c) 1994, Regents of the University of California
|
* Portions Copyright (c) 1994, Regents of the University of California
|
||||||
*
|
*
|
||||||
* $PostgreSQL: pgsql/src/bin/scripts/createuser.c,v 1.42 2009/02/26 16:02:39 petere Exp $
|
* $PostgreSQL: pgsql/src/bin/scripts/createuser.c,v 1.43 2009/02/26 16:20:55 petere Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
@ -27,7 +27,6 @@ main(int argc, char *argv[])
|
|||||||
{"no-password", no_argument, NULL, 'w'},
|
{"no-password", no_argument, NULL, 'w'},
|
||||||
{"password", no_argument, NULL, 'W'},
|
{"password", no_argument, NULL, 'W'},
|
||||||
{"echo", no_argument, NULL, 'e'},
|
{"echo", no_argument, NULL, 'e'},
|
||||||
{"quiet", no_argument, NULL, 'q'},
|
|
||||||
{"createdb", no_argument, NULL, 'd'},
|
{"createdb", no_argument, NULL, 'd'},
|
||||||
{"no-createdb", no_argument, NULL, 'D'},
|
{"no-createdb", no_argument, NULL, 'D'},
|
||||||
{"superuser", no_argument, NULL, 's'},
|
{"superuser", no_argument, NULL, 's'},
|
||||||
@ -79,7 +78,7 @@ main(int argc, char *argv[])
|
|||||||
|
|
||||||
handle_help_version_opts(argc, argv, "createuser", help);
|
handle_help_version_opts(argc, argv, "createuser", help);
|
||||||
|
|
||||||
while ((c = getopt_long(argc, argv, "h:p:U:wWeqdDsSaArRiIlLc:PEN",
|
while ((c = getopt_long(argc, argv, "h:p:U:wWedDsSaArRiIlLc:PEN",
|
||||||
long_options, &optindex)) != -1)
|
long_options, &optindex)) != -1)
|
||||||
{
|
{
|
||||||
switch (c)
|
switch (c)
|
||||||
@ -102,9 +101,6 @@ main(int argc, char *argv[])
|
|||||||
case 'e':
|
case 'e':
|
||||||
echo = true;
|
echo = true;
|
||||||
break;
|
break;
|
||||||
case 'q':
|
|
||||||
/* obsolete; remove in 8.4 */
|
|
||||||
break;
|
|
||||||
case 'd':
|
case 'd':
|
||||||
createdb = TRI_YES;
|
createdb = TRI_YES;
|
||||||
break;
|
break;
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
|
* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
|
||||||
* Portions Copyright (c) 1994, Regents of the University of California
|
* Portions Copyright (c) 1994, Regents of the University of California
|
||||||
*
|
*
|
||||||
* $PostgreSQL: pgsql/src/bin/scripts/dropdb.c,v 1.26 2009/02/26 16:02:39 petere Exp $
|
* $PostgreSQL: pgsql/src/bin/scripts/dropdb.c,v 1.27 2009/02/26 16:20:55 petere Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
@ -28,7 +28,6 @@ main(int argc, char *argv[])
|
|||||||
{"no-password", no_argument, NULL, 'w'},
|
{"no-password", no_argument, NULL, 'w'},
|
||||||
{"password", no_argument, NULL, 'W'},
|
{"password", no_argument, NULL, 'W'},
|
||||||
{"echo", no_argument, NULL, 'e'},
|
{"echo", no_argument, NULL, 'e'},
|
||||||
{"quiet", no_argument, NULL, 'q'},
|
|
||||||
{"interactive", no_argument, NULL, 'i'},
|
{"interactive", no_argument, NULL, 'i'},
|
||||||
{NULL, 0, NULL, 0}
|
{NULL, 0, NULL, 0}
|
||||||
};
|
};
|
||||||
@ -55,7 +54,7 @@ main(int argc, char *argv[])
|
|||||||
|
|
||||||
handle_help_version_opts(argc, argv, "dropdb", help);
|
handle_help_version_opts(argc, argv, "dropdb", help);
|
||||||
|
|
||||||
while ((c = getopt_long(argc, argv, "h:p:U:wWeqi", long_options, &optindex)) != -1)
|
while ((c = getopt_long(argc, argv, "h:p:U:wWei", long_options, &optindex)) != -1)
|
||||||
{
|
{
|
||||||
switch (c)
|
switch (c)
|
||||||
{
|
{
|
||||||
@ -77,9 +76,6 @@ main(int argc, char *argv[])
|
|||||||
case 'e':
|
case 'e':
|
||||||
echo = true;
|
echo = true;
|
||||||
break;
|
break;
|
||||||
case 'q':
|
|
||||||
/* obsolete; remove in 8.4 */
|
|
||||||
break;
|
|
||||||
case 'i':
|
case 'i':
|
||||||
interactive = true;
|
interactive = true;
|
||||||
break;
|
break;
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
|
* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
|
||||||
* Portions Copyright (c) 1994, Regents of the University of California
|
* Portions Copyright (c) 1994, Regents of the University of California
|
||||||
*
|
*
|
||||||
* $PostgreSQL: pgsql/src/bin/scripts/dropuser.c,v 1.27 2009/02/26 16:02:39 petere Exp $
|
* $PostgreSQL: pgsql/src/bin/scripts/dropuser.c,v 1.28 2009/02/26 16:20:55 petere Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
@ -28,7 +28,6 @@ main(int argc, char *argv[])
|
|||||||
{"no-password", no_argument, NULL, 'w'},
|
{"no-password", no_argument, NULL, 'w'},
|
||||||
{"password", no_argument, NULL, 'W'},
|
{"password", no_argument, NULL, 'W'},
|
||||||
{"echo", no_argument, NULL, 'e'},
|
{"echo", no_argument, NULL, 'e'},
|
||||||
{"quiet", no_argument, NULL, 'q'},
|
|
||||||
{"interactive", no_argument, NULL, 'i'},
|
{"interactive", no_argument, NULL, 'i'},
|
||||||
{NULL, 0, NULL, 0}
|
{NULL, 0, NULL, 0}
|
||||||
};
|
};
|
||||||
@ -55,7 +54,7 @@ main(int argc, char *argv[])
|
|||||||
|
|
||||||
handle_help_version_opts(argc, argv, "dropuser", help);
|
handle_help_version_opts(argc, argv, "dropuser", help);
|
||||||
|
|
||||||
while ((c = getopt_long(argc, argv, "h:p:U:wWeqi", long_options, &optindex)) != -1)
|
while ((c = getopt_long(argc, argv, "h:p:U:wWei", long_options, &optindex)) != -1)
|
||||||
{
|
{
|
||||||
switch (c)
|
switch (c)
|
||||||
{
|
{
|
||||||
@ -77,9 +76,6 @@ main(int argc, char *argv[])
|
|||||||
case 'e':
|
case 'e':
|
||||||
echo = true;
|
echo = true;
|
||||||
break;
|
break;
|
||||||
case 'q':
|
|
||||||
/* obsolete; remove in 8.4 */
|
|
||||||
break;
|
|
||||||
case 'i':
|
case 'i':
|
||||||
interactive = true;
|
interactive = true;
|
||||||
break;
|
break;
|
||||||
|
Reference in New Issue
Block a user