Skip to content

Commit 751c63c

Browse files
committed
Remove pg_regress' --load-language option.
We haven't used this option since inventing extensions. As of commit 50fc694 it's actually formally equivalent to --load-extension, so let's just drop it. Discussion: https://postgr.es/m/6853.1581627393@sss.pgh.pa.us
1 parent 11f063b commit 751c63c

File tree

1 file changed

+0
-17
lines changed

1 file changed

+0
-17
lines changed

src/test/regress/pg_regress.c

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ char *inputdir = ".";
7676
char *outputdir = ".";
7777
char *bindir = PGBINDIR;
7878
char *launcher = NULL;
79-
static _stringlist *loadlanguage = NULL;
8079
static _stringlist *loadextension = NULL;
8180
static int max_connections = 0;
8281
static int max_concurrent_tests = 0;
@@ -1997,16 +1996,6 @@ create_database(const char *dbname)
19971996
"ALTER DATABASE \"%s\" SET timezone_abbreviations TO 'Default';",
19981997
dbname, dbname, dbname, dbname, dbname, dbname);
19991998

2000-
/*
2001-
* Install any requested procedural languages. We use CREATE OR REPLACE
2002-
* so that this will work whether or not the language is preinstalled.
2003-
*/
2004-
for (sl = loadlanguage; sl != NULL; sl = sl->next)
2005-
{
2006-
header(_("installing %s"), sl->str);
2007-
psql_command(dbname, "CREATE OR REPLACE LANGUAGE \"%s\"", sl->str);
2008-
}
2009-
20101999
/*
20112000
* Install any requested extensions. We use CREATE IF NOT EXISTS so that
20122001
* this will work whether or not the extension is preinstalled.
@@ -2058,8 +2047,6 @@ help(void)
20582047
printf(_(" --launcher=CMD use CMD as launcher of psql\n"));
20592048
printf(_(" --load-extension=EXT load the named extension before running the\n"));
20602049
printf(_(" tests; can appear multiple times\n"));
2061-
printf(_(" --load-language=LANG load the named language before running the\n"));
2062-
printf(_(" tests; can appear multiple times\n"));
20632050
printf(_(" --max-connections=N maximum number of concurrent connections\n"));
20642051
printf(_(" (default is 0, meaning unlimited)\n"));
20652052
printf(_(" --max-concurrent-tests=N maximum number of concurrent tests in schedule\n"));
@@ -2096,7 +2083,6 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc
20962083
{"dbname", required_argument, NULL, 1},
20972084
{"debug", no_argument, NULL, 2},
20982085
{"inputdir", required_argument, NULL, 3},
2099-
{"load-language", required_argument, NULL, 4},
21002086
{"max-connections", required_argument, NULL, 5},
21012087
{"encoding", required_argument, NULL, 6},
21022088
{"outputdir", required_argument, NULL, 7},
@@ -2172,9 +2158,6 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc
21722158
case 3:
21732159
inputdir = pg_strdup(optarg);
21742160
break;
2175-
case 4:
2176-
add_stringlist_item(&loadlanguage, optarg);
2177-
break;
21782161
case 5:
21792162
max_connections = atoi(optarg);
21802163
break;

0 commit comments

Comments
 (0)