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

Update the regression tests to fix issues with Python 3.5 and PG 9.2. Fixes #3057

Browse Source
This commit is contained in:
Joao Pedro De Almeida Pereira
2018-01-26 16:45:09 +00:00
committed by Dave Page
parent abcb8c36a3
commit de1c767e88
4 changed files with 235 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/acl.sql
View File

@@ -1,4 +1,4 @@
SELECT 'relacl' as deftype, privileges_information.grantee, privileges_information.grantor,
SELECT 'relacl' as deftype, COALESCE(privileges_information.grantee, 'PUBLIC') grantee, privileges_information.grantor,
array_agg(privilege_type) as privileges, array_agg(is_grantable) as grantable
from (
SELECT
@@ -32,4 +32,4 @@ from (
GROUP BY privileges_information.grantee,privileges_information.grantor
ORDER BY privileges_information.grantee
ORDER BY privileges_information.grantee

3
web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_utils.py
View File

@@ -83,6 +83,7 @@ class DataTypeReaderTest(BaseTestGenerator):
@patch('pgadmin.browser.server_groups.servers.databases.schemas.utils.render_template')
def runTest(self, template_mock):
template_mock.return_value = 'Some SQL'
connection = Mock()
connection.execute_2darray.return_value = [
True,
@@ -104,7 +105,7 @@ class DataTypeReaderTest(BaseTestGenerator):
self.assertEqual(result[1], self.expected_function_output)
self.assertTrue(result[0])
connection.execute_2darray.assert_called()
connection.execute_2darray.assert_called_with('Some SQL')
template_mock.assert_called_with(
self.expected_sql_template_path + '/get_types.sql',
condition=self.sql_condition,