From e6c067025cfe6ecff786efe3b671c8c7dd840c17 Mon Sep 17 00:00:00 2001 From: Nagesh Dhope Date: Thu, 11 Jul 2019 13:16:00 +0530 Subject: [PATCH] Fixed resql test cases for Extensions specific to database servers. --- .../tests/9.4_plus/alter_extension_schema.sql | 7 +++ .../9.4_plus/alter_extension_version.sql | 7 +++ .../create_extension_with_all_options.sql | 7 +++ .../create_extension_with_default_schema.sql | 7 +++ .../extensions/tests/9.4_plus/tests.json | 59 +++++++++++++++++++ .../tests/9.5_plus/alter_extension_schema.sql | 7 +++ .../create_extension_with_all_options.sql | 7 +++ .../extensions/tests/9.5_plus/tests.json | 32 ++++++++++ .../alter_extension_schema.sql | 0 .../alter_extension_version.sql | 0 .../create_extension_with_all_options.sql | 0 .../create_extension_with_default_schema.sql | 0 .../tests/{default => 9.6_plus}/tests.json | 4 +- 13 files changed, 135 insertions(+), 2 deletions(-) create mode 100644 web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.4_plus/alter_extension_schema.sql create mode 100644 web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.4_plus/alter_extension_version.sql create mode 100644 web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.4_plus/create_extension_with_all_options.sql create mode 100644 web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.4_plus/create_extension_with_default_schema.sql create mode 100644 web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.4_plus/tests.json create mode 100644 web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.5_plus/alter_extension_schema.sql create mode 100644 web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.5_plus/create_extension_with_all_options.sql create mode 100644 web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.5_plus/tests.json rename web/pgadmin/browser/server_groups/servers/databases/extensions/tests/{default => 9.6_plus}/alter_extension_schema.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/extensions/tests/{default => 9.6_plus}/alter_extension_version.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/extensions/tests/{default => 9.6_plus}/create_extension_with_all_options.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/extensions/tests/{default => 9.6_plus}/create_extension_with_default_schema.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/extensions/tests/{default => 9.6_plus}/tests.json (92%) diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.4_plus/alter_extension_schema.sql b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.4_plus/alter_extension_schema.sql new file mode 100644 index 000000000..151ead412 --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.4_plus/alter_extension_schema.sql @@ -0,0 +1,7 @@ +-- Extension: sslinfo + +-- DROP EXTENSION sslinfo; + +CREATE EXTENSION sslinfo + SCHEMA public + VERSION "1.0"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.4_plus/alter_extension_version.sql b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.4_plus/alter_extension_version.sql new file mode 100644 index 000000000..96c5bf40c --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.4_plus/alter_extension_version.sql @@ -0,0 +1,7 @@ +-- Extension: citext + +-- DROP EXTENSION citext; + +CREATE EXTENSION citext + SCHEMA public + VERSION "1.1"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.4_plus/create_extension_with_all_options.sql b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.4_plus/create_extension_with_all_options.sql new file mode 100644 index 000000000..b74929443 --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.4_plus/create_extension_with_all_options.sql @@ -0,0 +1,7 @@ +-- Extension: sslinfo + +-- DROP EXTENSION sslinfo; + +CREATE EXTENSION sslinfo + SCHEMA test_extension_schema + VERSION "1.0"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.4_plus/create_extension_with_default_schema.sql b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.4_plus/create_extension_with_default_schema.sql new file mode 100644 index 000000000..aab2fa801 --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.4_plus/create_extension_with_default_schema.sql @@ -0,0 +1,7 @@ +-- Extension: citext + +-- DROP EXTENSION citext; + +CREATE EXTENSION citext + SCHEMA public + VERSION "1.0"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.4_plus/tests.json b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.4_plus/tests.json new file mode 100644 index 000000000..4f6fcfbda --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.4_plus/tests.json @@ -0,0 +1,59 @@ +{ + "scenarios": [ + { + "type": "create", + "name": "Create Extension with all options", + "endpoint": "NODE-extension.obj", + "sql_endpoint": "NODE-extension.sql_id", + "data": { + "name": "sslinfo", + "schema": "test_extension_schema", + "version": "1.0" + }, + "expected_sql_file": "create_extension_with_all_options.sql" + }, + { + "type": "alter", + "name": "Alter Extension version", + "endpoint": "NODE-extension.obj_id", + "sql_endpoint": "NODE-extension.sql_id", + "data": { + "schema": "public" + }, + "expected_sql_file": "alter_extension_schema.sql" + }, + { + "type": "delete", + "name": "Drop Extension with all options", + "endpoint": "NODE-extension.obj_id", + "data": {} + }, + { + "type": "create", + "name": "Create Extension with default schema", + "endpoint": "NODE-extension.obj", + "sql_endpoint": "NODE-extension.sql_id", + "data": { + "name": "citext", + "version": "1.0" + }, + "expected_sql_file": "create_extension_with_default_schema.sql" + }, + { + "type": "alter", + "name": "Alter Extension version", + "endpoint": "NODE-extension.obj_id", + "sql_endpoint": "NODE-extension.sql_id", + "data": { + "version": "1.1" + }, + "expected_sql_file": "alter_extension_version.sql" + }, + { + "type": "delete", + "name": "Drop Extension default schema", + "endpoint": "NODE-extension.obj_id", + "data": {} + } + ] +} diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.5_plus/alter_extension_schema.sql b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.5_plus/alter_extension_schema.sql new file mode 100644 index 000000000..151ead412 --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.5_plus/alter_extension_schema.sql @@ -0,0 +1,7 @@ +-- Extension: sslinfo + +-- DROP EXTENSION sslinfo; + +CREATE EXTENSION sslinfo + SCHEMA public + VERSION "1.0"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.5_plus/create_extension_with_all_options.sql b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.5_plus/create_extension_with_all_options.sql new file mode 100644 index 000000000..b74929443 --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.5_plus/create_extension_with_all_options.sql @@ -0,0 +1,7 @@ +-- Extension: sslinfo + +-- DROP EXTENSION sslinfo; + +CREATE EXTENSION sslinfo + SCHEMA test_extension_schema + VERSION "1.0"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.5_plus/tests.json b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.5_plus/tests.json new file mode 100644 index 000000000..bee44eb25 --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.5_plus/tests.json @@ -0,0 +1,32 @@ +{ + "scenarios": [ + { + "type": "create", + "name": "Create Extension with all options", + "endpoint": "NODE-extension.obj", + "sql_endpoint": "NODE-extension.sql_id", + "data": { + "name": "sslinfo", + "schema": "test_extension_schema", + "version": "1.0" + }, + "expected_sql_file": "create_extension_with_all_options.sql" + }, + { + "type": "alter", + "name": "Alter Extension version", + "endpoint": "NODE-extension.obj_id", + "sql_endpoint": "NODE-extension.sql_id", + "data": { + "schema": "public" + }, + "expected_sql_file": "alter_extension_schema.sql" + }, + { + "type": "delete", + "name": "Drop Extension with all options", + "endpoint": "NODE-extension.obj_id", + "data": {} + } + ] +} diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/default/alter_extension_schema.sql b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.6_plus/alter_extension_schema.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/extensions/tests/default/alter_extension_schema.sql rename to web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.6_plus/alter_extension_schema.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/default/alter_extension_version.sql b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.6_plus/alter_extension_version.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/extensions/tests/default/alter_extension_version.sql rename to web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.6_plus/alter_extension_version.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/default/create_extension_with_all_options.sql b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.6_plus/create_extension_with_all_options.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/extensions/tests/default/create_extension_with_all_options.sql rename to web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.6_plus/create_extension_with_all_options.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/default/create_extension_with_default_schema.sql b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.6_plus/create_extension_with_default_schema.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/extensions/tests/default/create_extension_with_default_schema.sql rename to web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.6_plus/create_extension_with_default_schema.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/default/tests.json b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.6_plus/tests.json similarity index 92% rename from web/pgadmin/browser/server_groups/servers/databases/extensions/tests/default/tests.json rename to web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.6_plus/tests.json index c28934995..e50ee2453 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/default/tests.json +++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.6_plus/tests.json @@ -30,7 +30,7 @@ }, { "type": "create", - "name": "Create Extension with default(pg_catalog) schema", + "name": "Create Extension with default schema", "endpoint": "NODE-extension.obj", "sql_endpoint": "NODE-extension.sql_id", "data": { @@ -51,7 +51,7 @@ }, { "type": "delete", - "name": "Drop Extension default(pg_catalog) schema", + "name": "Drop Extension default schema", "endpoint": "NODE-extension.obj_id", "data": {} }