hcq/openGauss-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!2019 pg_regress支持通过dbcmpt选项来控制默认创建的数据库兼容模式

Browse Source 
Merge pull request !2019 from pengjiong/array
This commit is contained in:
opengauss-bot
2022-08-09 08:19:36 +00:00
committed by Gitee
parent 4cc4f74a8a 190eb0cc98
commit c6ad885fa9
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/makefiles/pgxs.mk
View File

@ -280,9 +280,9 @@ ifdef REGRESS
# Select database to use for running the tests # Select database to use for running the tests
ifneq ($(USE_MODULE_DB),) ifneq ($(USE_MODULE_DB),)
REGRESS_OPTS += --dbname=$(CONTRIB_TESTDB_MODULE) REGRESS_OPTS := --dbname=$(CONTRIB_TESTDB_MODULE) $(REGRESS_OPTS)
else else
REGRESS_OPTS += --dbname=$(CONTRIB_TESTDB) REGRESS_OPTS := --dbname=$(CONTRIB_TESTDB) $(REGRESS_OPTS)
endif endif
# where to find psql for running the tests # where to find psql for running the tests

19
src/test/regress/pg_regress.cpp
View File

@ -464,6 +464,7 @@ static bool to_create_jdbc_user = false;
static bool is_skip_environment_cleanup = false; static bool is_skip_environment_cleanup = false;
static char* client_logic_hook = "encryption"; static char* client_logic_hook = "encryption";
static _stringlist* destination_files = NULL; static _stringlist* destination_files = NULL;
static char *g_db_compatibility = "A";
static bool directory_exists(const char* dir); static bool directory_exists(const char* dir);
static void make_directory(const char* dir); static void make_directory(const char* dir);
@ -5354,14 +5355,16 @@ static void create_database(const char* dbname)
header(_("creating database \"%s\""), dbname); header(_("creating database \"%s\""), dbname);
if (encoding) if (encoding)
psql_command("postgres", psql_command("postgres",
"CREATE DATABASE \"%s\" DBCOMPATIBILITY='A' TEMPLATE=TEMPLATE0 ENCODING='%s'%s", "CREATE DATABASE \"%s\" DBCOMPATIBILITY='%s' TEMPLATE=TEMPLATE0 ENCODING='%s'%s",
dbname, dbname,
g_db_compatibility,
encoding, encoding,
(nolocale) ? " LC_COLLATE='C' LC_CTYPE='C'" : ""); (nolocale) ? " LC_COLLATE='C' LC_CTYPE='C'" : "");
else else
psql_command("postgres", psql_command("postgres",
"CREATE DATABASE \"%s\" DBCOMPATIBILITY='A' TEMPLATE=TEMPLATE0%s", "CREATE DATABASE \"%s\" DBCOMPATIBILITY='%s' TEMPLATE=TEMPLATE0%s",
dbname, dbname,
g_db_compatibility,
(nolocale) ? " LC_COLLATE='C' LC_CTYPE='C'" : ""); (nolocale) ? " LC_COLLATE='C' LC_CTYPE='C'" : "");
/* /*
@ -5474,10 +5477,10 @@ static void help(void)
printf(_(" --port=PORT use postmaster running at PORT\n")); printf(_(" --port=PORT use postmaster running at PORT\n"));
printf(_(" --user=USER connect as USER\n")); printf(_(" --user=USER connect as USER\n"));
printf(_(" --psqldir=DIR use gsql in DIR (default: find in PATH)\n")); printf(_(" --psqldir=DIR use gsql in DIR (default: find in PATH)\n"));
printf(_(" --enable-segment create table default with segment=on")); printf(_(" --enable-segment create table default with segment=on\n"));
printf(_(" --jdbc enable jdbc regression test")); printf(_(" --jdbc enable jdbc regression test\n"));
printf(_(" --ecpg enable ecpg regression test")); printf(_(" --ecpg enable ecpg regression test\n"));
printf(_("\n")); printf(_(" --dbcmpt=DBCMPT create regression database with DBCMPT(default \"A\")\n"));
printf(_("The exit status is 0 if all tests passed, 1 if some tests failed, and 2\n")); printf(_("The exit status is 0 if all tests passed, 1 if some tests failed, and 2\n"));
printf(_("if the tests could not be run for some reason.\n")); printf(_("if the tests could not be run for some reason.\n"));
} }
@ -6373,6 +6376,7 @@ int regression_main(int argc, char* argv[], init_function ifunc, test_function t
{"jdbc", no_argument, NULL, 60}, {"jdbc", no_argument, NULL, 60},
{"skip_environment_cleanup", no_argument, NULL, 61}, {"skip_environment_cleanup", no_argument, NULL, 61},
{"ecpg", no_argument, NULL, 62}, {"ecpg", no_argument, NULL, 62},
{"dbcmpt", required_argument, NULL, 63},
{NULL, 0, NULL, 0} {NULL, 0, NULL, 0}
}; };
@ -6658,6 +6662,9 @@ int regression_main(int argc, char* argv[], init_function ifunc, test_function t
printf("\n starting with ecpg\n"); printf("\n starting with ecpg\n");
use_ecpg = true; use_ecpg = true;
break; break;
case 63:
g_db_compatibility = strdup(optarg);
break;
default: default:
/* getopt_long already emitted a complaint */ /* getopt_long already emitted a complaint */
fprintf(stderr, _("\nTry \"%s -h\" for more information.\n"), progname); fprintf(stderr, _("\nTry \"%s -h\" for more information.\n"), progname);