1) Fixed an issue where the 'save_password' column threw an error for the shared server when using an external database. #5535

2) Fixed integrity error while removing server when using an external database.
3) Remove the length of the password column of the server and the shared server table.
This commit is contained in:
Akshay Joshi 2022-11-16 14:01:55 +05:30
parent 6d881fa34e
commit 749138791a
8 changed files with 25 additions and 21 deletions

View File

@ -2,7 +2,7 @@
Version 6.16
************
Release date: 2022-11-17
Release date: 2022-11-18
This release contains a number of bug fixes and new features since the release of pgAdmin 4 v6.15.
@ -47,3 +47,5 @@ Bug fixes
| `Issue #5507 <https://github.com/pgadmin-org/pgadmin4/issues/5507>`_ - Fixed an issue where pgadmin does not respect reverse proxy any more.
| `Issue #5521 <https://github.com/pgadmin-org/pgadmin4/issues/5521>`_ - Fixed SocketIO calls when pgAdmin 4 server is running from a sub directory.
| `Issue #5522 <https://github.com/pgadmin-org/pgadmin4/issues/5522>`_ - Ensure that the load file paths are children of the storage directory.
| `Issue #5533 <https://github.com/pgadmin-org/pgadmin4/issues/5533>`_ - Use the shared server username when opening query tool.
| `Issue #5535 <https://github.com/pgadmin-org/pgadmin4/issues/5535>`_ - Fixed an issue where the 'save_password' column threw an error for the shared server when using an external database.

View File

@ -39,7 +39,7 @@ def upgrade():
if version < 3:
op.add_column('server', sa.Column('comment', sa.String(length=1024)))
if version < 4:
op.add_column('server', sa.Column('password', sa.String(length=64)))
op.add_column('server', sa.Column('password', sa.String()))
if version < 5:
op.add_column('server', sa.Column('role', sa.String(length=64)))
if version < 6:
@ -82,8 +82,9 @@ def upgrade():
sa.Column('pid', sa.Integer(), nullable=False),
sa.Column('uid', sa.Integer(), nullable=False),
sa.Column('value', sa.String(length=1024), nullable=False),
sa.ForeignKeyConstraint(['pid'], ['preferences.id'], ),
sa.ForeignKeyConstraint(['uid'], ['user.id'], ),
sa.ForeignKeyConstraint(['pid'], ['preferences.id'],
ondelete='CASCADE'),
sa.ForeignKeyConstraint(['uid'], ['user.id'], ondelete='CASCADE'),
sa.PrimaryKeyConstraint('pid', 'uid'))
if version < 9:
@ -116,7 +117,8 @@ def upgrade():
sa.Column('logdir', sa.String()),
sa.Column('exit_code', sa.Integer()),
sa.Column('acknowledge', sa.String()),
sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
sa.ForeignKeyConstraint(['user_id'], ['user.id'],
ondelete='CASCADE'),
sa.PrimaryKeyConstraint('pid'))
if version < 11:

View File

@ -31,7 +31,7 @@ def upgrade():
'user_mfa', sa.Column('user_id', sa.Integer(), nullable=False),
sa.Column('mfa_auth', sa.String(length=256), nullable=False),
sa.Column('options', sa.String()),
sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
sa.ForeignKeyConstraint(['user_id'], ['user.id'], ondelete='CASCADE'),
sa.PrimaryKeyConstraint('user_id', 'mfa_auth'))
# ### end Alembic commands ###

View File

@ -39,8 +39,8 @@ def upgrade():
sa.Column('uid', sa.Integer(), nullable=False),
sa.Column('name', sa.String(length=1024), nullable=False),
sa.Column('sql', sa.String()),
sa.ForeignKeyConstraint(['mid'], ['macros.id']),
sa.ForeignKeyConstraint(['uid'], ['user.id']),
sa.ForeignKeyConstraint(['mid'], ['macros.id'], ondelete='CASCADE'),
sa.ForeignKeyConstraint(['uid'], ['user.id'], ondelete='CASCADE'),
sa.PrimaryKeyConstraint('mid', 'uid'))
op.bulk_insert(macro_table, [

View File

@ -29,7 +29,7 @@ def upgrade():
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('schema_res', sa.String()),
sa.Column('server', sa.Integer(), nullable=False),
sa.ForeignKeyConstraint(['server'], ['server.id'], ),
sa.ForeignKeyConstraint(['server'], ['server.id'], ondelete='CASCADE'),
sa.PrimaryKeyConstraint('id', 'server'))

View File

@ -36,7 +36,7 @@ def upgrade():
sa.Column('port', sa.Integer(), nullable=False),
sa.Column('maintenance_db', sa.String(length=64)),
sa.Column('username', sa.String(length=64)),
sa.Column('password', sa.String(length=64)),
sa.Column('password', sa.String()),
sa.Column('role', sa.String(length=64)),
sa.Column('ssl_mode', sa.String(length=16), nullable=False),
sa.Column('comment', sa.String(length=1024)),
@ -59,13 +59,13 @@ def upgrade():
sa.Column('tunnel_authentication', sa.Integer(), server_default='0'),
sa.Column('tunnel_identity_file', sa.String()),
sa.Column('shared', sa.Boolean(), nullable=False),
sa.Column('save_password', sa.Boolean(), nullable=False),
sa.Column('tunnel_password', sa.String(length=64)),
sa.Column('save_password', sa.Integer(), server_default='0'),
sa.Column('tunnel_password', sa.String()),
sa.Column('connect_timeout', sa.Integer()),
sa.CheckConstraint("ssl_mode IN ('allow', 'prefer', 'require', \
'disable', 'verify-ca', 'verify-full')"),
sa.ForeignKeyConstraint(['servergroup_id'], ['servergroup.id'], ),
sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
sa.ForeignKeyConstraint(['user_id'], ['user.id'], ondelete='CASCADE'),
sa.PrimaryKeyConstraint('id'))
# Named constraint

View File

@ -33,8 +33,8 @@ def upgrade():
sa.Column('dbname', sa.String(), nullable=False),
sa.Column('query_info', sa.String(), nullable=False),
sa.Column('last_updated_flag', sa.String(), nullable=False),
sa.ForeignKeyConstraint(['sid'], ['server.id']),
sa.ForeignKeyConstraint(['uid'], ['user.id']),
sa.ForeignKeyConstraint(['sid'], ['server.id'], ondelete='CASCADE'),
sa.ForeignKeyConstraint(['uid'], ['user.id'], ondelete='CASCADE'),
sa.PrimaryKeyConstraint('srno', 'uid', 'sid', 'dbname'))

View File

@ -46,7 +46,7 @@ def upgrade():
'user',
sa.Column('id', sa.Integer(), nullable=False, autoincrement=True),
sa.Column('email', sa.String(length=256), nullable=False),
sa.Column('password', sa.String(length=256), nullable=True),
sa.Column('password', sa.String(), nullable=True),
sa.Column('active', sa.Boolean(), nullable=False),
sa.Column('confirmed_at', sa.DateTime(), nullable=True),
sa.PrimaryKeyConstraint('id'))
@ -66,21 +66,21 @@ def upgrade():
'setting', sa.Column('user_id', sa.Integer(), nullable=False),
sa.Column('setting', sa.String(length=256), nullable=False),
sa.Column('value', sa.String(length=1024), nullable=True),
sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
sa.ForeignKeyConstraint(['user_id'], ['user.id'], ondelete='CASCADE'),
sa.PrimaryKeyConstraint('user_id', 'setting'))
roles_users_table = op.create_table(
'roles_users', sa.Column('user_id', sa.Integer(), nullable=True),
sa.Column('role_id', sa.Integer(), nullable=True),
sa.ForeignKeyConstraint(['role_id'], ['role.id'], ),
sa.ForeignKeyConstraint(['user_id'], ['user.id'], ))
sa.ForeignKeyConstraint(['role_id'], ['role.id'], ondelete='CASCADE'),
sa.ForeignKeyConstraint(['user_id'], ['user.id'], ondelete='CASCADE'))
server_group_table = op.create_table(
'servergroup',
sa.Column('id', sa.Integer(), nullable=False, autoincrement=True),
sa.Column('user_id', sa.Integer(), nullable=False),
sa.Column('name', sa.String(length=128), nullable=False),
sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
sa.ForeignKeyConstraint(['user_id'], ['user.id'], ondelete='CASCADE'),
sa.PrimaryKeyConstraint('id'),
sa.UniqueConstraint('user_id', 'name'))
@ -96,7 +96,7 @@ def upgrade():
sa.Column('username', sa.String(length=64), nullable=False),
sa.Column('ssl_mode', sa.String(length=16), nullable=False),
sa.ForeignKeyConstraint(['servergroup_id'], ['servergroup.id'], ),
sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
sa.ForeignKeyConstraint(['user_id'], ['user.id'], ondelete='CASCADE'),
sa.PrimaryKeyConstraint('id'))
current_salt = getattr(