IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed timezone issue in RE-SQL test cases for Roles.

Browse Source
This commit is contained in:
Akshay Joshi 2019-08-27 19:54:30 +05:30
parent 1ddc9cc889
commit 28b741a13a
4 changed files with 45 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/alter_login_role_options.sql
View File

@ -9,7 +9,7 @@ CREATE ROLE "Role2_$%{}[]()&*^!@""'`\/#" WITH
CREATEROLE
NOREPLICATION
CONNECTION LIMIT 100
VALID UNTIL '2050-01-01 00:00:00+05:30';
VALID UNTIL '<TIMESTAMPTZ>';
ALTER ROLE "Role2_$%{}[]()&*^!@""'`\/#" IN DATABASE postgres SET application_name TO 'pg4';

2
web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/alter_role_options.sql
View File

@ -9,7 +9,7 @@ CREATE ROLE "Role2_$%{}[]()&*^!@""'`\/#" WITH
NOCREATEROLE
NOREPLICATION
CONNECTION LIMIT 100
VALID UNTIL '2050-01-01 00:00:00+05:30';
VALID UNTIL '<TIMESTAMPTZ>';
ALTER ROLE "Role2_$%{}[]()&*^!@""'`\/#" IN DATABASE postgres SET application_name TO 'pg4';

6
web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/test.json
View File

@ -57,7 +57,8 @@
"rolvaliduntil": "2050-01-01 00:00:00 +05:30",
"variables": { "added": [{"name":"application_name","value":"pg4","database":"postgres"}] }
},
"expected_sql_file": "alter_role_options.sql"
"expected_sql_file": "alter_role_options.sql",
"convert_timestamp_columns": ["rolvaliduntil"]
},
{
"type": "delete",
@ -122,7 +123,8 @@
"rolvaliduntil": "2050-01-01 00:00:00 +05:30",
"variables": { "added": [{"name":"application_name","value":"pg4","database":"postgres"}] }
},
"expected_sql_file": "alter_login_role_options.sql"
"expected_sql_file": "alter_login_role_options.sql",
"convert_timestamp_columns": ["rolvaliduntil"]
},
{
"type": "delete",

40
web/regression/re_sql/tests/test_resql.py
View File

@ -90,7 +90,8 @@ class ReverseEngineeredSQLTestCases(BaseTestGenerator):
# Schema ID placeholder in JSON file which needs to be replaced
# while running the test cases
self.JSON_PLACEHOLDERS = {'schema_id': '<SCHEMA_ID>',
'owner': '<OWNER>'}
'owner': '<OWNER>',
'timestamptz': '<TIMESTAMPTZ>'}
resql_module_list = create_resql_module_list(
BaseTestGenerator.re_sql_module_list,
@ -371,6 +372,9 @@ class ReverseEngineeredSQLTestCases(BaseTestGenerator):
if 'username' in self.server:
sql = sql.replace(self.JSON_PLACEHOLDERS['owner'],
self.server['username'])
# Convert timestamp with timezone from json file to the
# database server's correct timestamp
sql = self.convert_timestamptz(scenario, sql)
try:
self.assertEquals(sql, resp_sql)
except Exception as e:
@ -427,6 +431,9 @@ class ReverseEngineeredSQLTestCases(BaseTestGenerator):
if 'username' in self.server:
sql = sql.replace(self.JSON_PLACEHOLDERS['owner'],
self.server['username'])
# Convert timestamp with timezone from json file to the
# database server's correct timestamp
sql = self.convert_timestamptz(scenario, sql)
try:
self.assertEquals(sql, resp_sql)
except Exception as e:
@ -447,6 +454,9 @@ class ReverseEngineeredSQLTestCases(BaseTestGenerator):
if 'username' in self.server:
exp_sql = exp_sql.replace(self.JSON_PLACEHOLDERS['owner'],
self.server['username'])
# Convert timestamp with timezone from json file to the
# database server's correct timestamp
sql = self.convert_timestamptz(scenario, exp_sql)
try:
self.assertEquals(exp_sql, resp_sql)
except Exception as e:
@ -509,3 +519,31 @@ class ReverseEngineeredSQLTestCases(BaseTestGenerator):
scenario['data']['schema_id'] == \
self.JSON_PLACEHOLDERS['schema_id']:
scenario['data']['schema'] = self.schema_id
def convert_timestamptz(self, scenario, sql):
"""
This function will convert the given timestamptz with database
servers timestamptz and replace that in given sql.
:param scenario:
:param sql:
:return:
"""
if 'convert_timestamp_columns' in scenario:
for col in scenario['convert_timestamp_columns']:
if 'data' in scenario and col in scenario['data']:
self.get_db_connection()
pg_cursor = self.connection.cursor()
try:
query = "SELECT timestamp with time zone '" \
+ scenario['data'][col] + "'"
pg_cursor.execute(query)
converted_tz = pg_cursor.fetchone()
if len(converted_tz) >= 1:
sql = sql.replace(
self.JSON_PLACEHOLDERS['timestamptz'],
converted_tz[0])
except Exception as e:
traceback.print_exc()
pg_cursor.close()
return sql