mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2025-02-25 18:55:31 -06:00
1) Added support for setting PostgreSQL connection parameters. #4728
2) Fixed an issue where Kerberos authentication to the server is not imported/exported. #5732 3) Increase the length of the value column of the setting table. #5746 4) Upgrade Flask-Migrate to 4.0.0. #5525
This commit is contained in:
@@ -54,14 +54,9 @@ describe('ServerSchema', ()=>{
|
||||
let setError = jasmine.createSpy('setError');
|
||||
|
||||
schemaObj.validate(state, setError);
|
||||
expect(setError).toHaveBeenCalledWith('host', 'Either Host name, Address or Service must be specified.');
|
||||
|
||||
state.hostaddr = 'incorrectip';
|
||||
schemaObj.validate(state, setError);
|
||||
expect(setError).toHaveBeenCalledWith('hostaddr', 'Host address must be valid IPv4 or IPv6 address.');
|
||||
expect(setError).toHaveBeenCalledWith('host', 'Either Host name or Service must be specified.');
|
||||
|
||||
state.host = '127.0.0.1';
|
||||
state.hostaddr = null;
|
||||
schemaObj.validate(state, setError);
|
||||
expect(setError).toHaveBeenCalledWith('username', 'Username must be specified.');
|
||||
|
||||
|
||||
@@ -74,9 +74,18 @@ describe('VariableSchema', ()=>{
|
||||
expect(schemaObj.getValueFieldProps({vartype: 'enum', enumvals: []})).toEqual(jasmine.objectContaining({
|
||||
cell: 'select',
|
||||
}));
|
||||
expect(schemaObj.getValueFieldProps({vartype: 'integer'})).toBe('int');
|
||||
expect(schemaObj.getValueFieldProps({vartype: 'real'})).toBe('numeric');
|
||||
expect(schemaObj.getValueFieldProps({vartype: 'string'})).toBe('text');
|
||||
expect(schemaObj.getValueFieldProps({vartype: 'integer'})).toEqual(jasmine.objectContaining({
|
||||
cell: 'int',
|
||||
}));
|
||||
expect(schemaObj.getValueFieldProps({vartype: 'real'})).toEqual(jasmine.objectContaining({
|
||||
cell: 'numeric',
|
||||
}));
|
||||
expect(schemaObj.getValueFieldProps({vartype: 'string'})).toEqual(jasmine.objectContaining({
|
||||
cell: 'text',
|
||||
}));
|
||||
expect(schemaObj.getValueFieldProps({vartype: 'file'})).toEqual(jasmine.objectContaining({
|
||||
cell: 'file',
|
||||
}));
|
||||
expect(schemaObj.getValueFieldProps({})).toBe('');
|
||||
});
|
||||
|
||||
|
||||
@@ -611,10 +611,10 @@ def create_server(server):
|
||||
cur = conn.cursor()
|
||||
server_details = (1, SERVER_GROUP, server['name'], server['host'],
|
||||
server['port'], server['db'], server['username'],
|
||||
server['role'], server['sslmode'], server['comment'])
|
||||
server['role'], server['comment'])
|
||||
cur.execute('INSERT INTO server (user_id, servergroup_id, name, host, '
|
||||
'port, maintenance_db, username, role, ssl_mode,'
|
||||
' comment) VALUES (?,?,?,?,?,?,?,?,?,?)', server_details)
|
||||
'port, maintenance_db, username, role,'
|
||||
' comment) VALUES (?,?,?,?,?,?,?,?,?)', server_details)
|
||||
server_id = cur.lastrowid
|
||||
conn.commit()
|
||||
conn.close()
|
||||
@@ -776,7 +776,7 @@ def get_db_server(sid):
|
||||
cur = conn.cursor()
|
||||
server = cur.execute(
|
||||
'SELECT name, host, port, maintenance_db,'
|
||||
' username, ssl_mode FROM server where id=%s' % sid
|
||||
' username FROM server where id=%s' % sid
|
||||
)
|
||||
server = server.fetchone()
|
||||
if server:
|
||||
@@ -785,14 +785,13 @@ def get_db_server(sid):
|
||||
db_port = server[2]
|
||||
db_name = server[3]
|
||||
username = server[4]
|
||||
ssl_mode = server[5]
|
||||
config_servers = test_setup.config_data['server_credentials']
|
||||
# Get the db password from config file for appropriate server
|
||||
db_password = get_db_password(config_servers, name, host, db_port)
|
||||
if db_password:
|
||||
# Drop database
|
||||
connection = get_db_connection(
|
||||
db_name, username, db_password, host, db_port, ssl_mode
|
||||
db_name, username, db_password, host, db_port
|
||||
)
|
||||
conn.close()
|
||||
return connection
|
||||
|
||||
Reference in New Issue
Block a user