diff --git a/.pycodestyle b/.pycodestyle index 8fb7461fc..4a54af529 100644 --- a/.pycodestyle +++ b/.pycodestyle @@ -6,4 +6,4 @@ show-source = False show-pep8 = False count = True format = pylint -exclude = migrations,node_modules,config_local.py,config_distro.py +exclude = node_modules,config_local.py,config_distro.py diff --git a/docs/en_US/release_notes_9_5.rst b/docs/en_US/release_notes_9_5.rst index 82e151cc5..a83355095 100644 --- a/docs/en_US/release_notes_9_5.rst +++ b/docs/en_US/release_notes_9_5.rst @@ -20,6 +20,7 @@ Bundled PostgreSQL Utilities New features ************ + | `Issue #1926 `_ - Add a new permission to allow disabling "Change Password" feature for a pgAdmin role. | `Issue #8665 `_ - Supports JSON logging for gunicorn process within Docker. Housekeeping diff --git a/web/migrations/versions/1f0eddc8fc79_.py b/web/migrations/versions/1f0eddc8fc79_.py index bad79b21a..de71e4884 100644 --- a/web/migrations/versions/1f0eddc8fc79_.py +++ b/web/migrations/versions/1f0eddc8fc79_.py @@ -39,7 +39,8 @@ def upgrade(): meta.reflect(op.get_bind(), only=('role',)) role_table = sa.Table('role', meta) - from pgadmin.tools.user_management.PgAdminPermissions import AllPermissionTypes + from pgadmin.tools.user_management.PgAdminPermissions import ( + AllPermissionTypes) op.execute( role_table.update().where(role_table.c.name == 'User') .values(permissions=",".join(AllPermissionTypes.list()))) diff --git a/web/migrations/versions/255e2842e4d7_.py b/web/migrations/versions/255e2842e4d7_.py index e07949d4a..d4d73a76f 100644 --- a/web/migrations/versions/255e2842e4d7_.py +++ b/web/migrations/versions/255e2842e4d7_.py @@ -26,8 +26,9 @@ depends_on = None def upgrade(): - with op.batch_alter_table("server", - table_kwargs={'sqlite_autoincrement': True}) as batch_op: + with (op.batch_alter_table("server", + table_kwargs={'sqlite_autoincrement': True}) + as batch_op): if context.get_impl().bind.dialect.name == "sqlite": batch_op.alter_column('id', autoincrement=True) batch_op.add_column(sa.Column('is_adhoc', sa.Integer(), diff --git a/web/migrations/versions/44b9ce549393_.py b/web/migrations/versions/44b9ce549393_.py index f7c91184b..1737bc54b 100644 --- a/web/migrations/versions/44b9ce549393_.py +++ b/web/migrations/versions/44b9ce549393_.py @@ -49,6 +49,7 @@ def upgrade(): table.update().values(prepare_threshold=5) ) + def downgrade(): # pgAdmin only upgrades, downgrade not implemented. pass diff --git a/web/migrations/versions/81c7ffeffeee_.py b/web/migrations/versions/81c7ffeffeee_.py index 59cf7a456..41e953270 100644 --- a/web/migrations/versions/81c7ffeffeee_.py +++ b/web/migrations/versions/81c7ffeffeee_.py @@ -35,7 +35,8 @@ def upgrade(): qt_open_tab_setting = session.query(Preferences).filter_by( name='new_browser_tab').order_by(Preferences.id.desc()).first() debugger_tab_setting = session.query(Preferences).filter_by( - name='debugger_new_browser_tab').order_by(Preferences.id.desc()).first() + name='debugger_new_browser_tab').order_by( + Preferences.id.desc()).first() schema_diff_tab_setting = session.query(Preferences).filter_by( name='schema_diff_new_browser_tab').order_by( Preferences.id.desc()).first() diff --git a/web/migrations/versions/9426ad06a63b_.py b/web/migrations/versions/9426ad06a63b_.py index 989bd552b..1923e6485 100644 --- a/web/migrations/versions/9426ad06a63b_.py +++ b/web/migrations/versions/9426ad06a63b_.py @@ -33,7 +33,8 @@ def upgrade(): "server", table_kwargs={'sqlite_autoincrement': True}) as batch_op: if context.get_impl().bind.dialect.name == "sqlite": batch_op.alter_column('id', autoincrement=True) - batch_op.add_column(sa.Column('shared_username', sa.String(64), nullable=True)) + batch_op.add_column(sa.Column('shared_username', sa.String(64), + nullable=True)) def downgrade(): diff --git a/web/migrations/versions/ac2c2e27dc2d_.py b/web/migrations/versions/ac2c2e27dc2d_.py index ab4ce69f5..127d3366a 100644 --- a/web/migrations/versions/ac2c2e27dc2d_.py +++ b/web/migrations/versions/ac2c2e27dc2d_.py @@ -1,5 +1,12 @@ - -"""empty message +########################################################################## +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2025, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# +########################################################################## +""" Revision ID: ac2c2e27dc2d Revises: ec0f11f9a4e6 @@ -20,11 +27,11 @@ depends_on = None def upgrade(): session = Session(bind=op.get_bind()) - + session.query(Preferences).filter( - Preferences.name == 'execute_query').update({'name': 'execute_script'}) + Preferences.name == 'execute_query').update({'name': 'execute_script'}) session.commit() - + meta = sa.MetaData() meta.reflect(op.get_bind(), only=('user_macros',)) user_macros_table = sa.Table('user_macros', meta) @@ -37,7 +44,7 @@ def upgrade(): ) # Fetch the data from the user_macros table results = op.get_bind().execute(stmt).fetchall() - + # Drop and re-create user macro table. op.drop_table('user_macros') op.create_table( @@ -47,8 +54,10 @@ 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'], ondelete='CASCADE'), - sa.ForeignKeyConstraint(['uid'], ['user.id'], ondelete='CASCADE'), + sa.ForeignKeyConstraint(['mid'], ['macros.id'], + ondelete='CASCADE'), + sa.ForeignKeyConstraint(['uid'], ['user.id'], + ondelete='CASCADE'), sa.PrimaryKeyConstraint('id',)) # Reflect the new table structure @@ -64,6 +73,7 @@ def upgrade(): ] ) + def downgrade(): # pgAdmin only upgrades, downgrade not implemented. pass diff --git a/web/migrations/versions/c62bcc14c3d6_.py b/web/migrations/versions/c62bcc14c3d6_.py index 455ae4d55..0b3cfcf76 100644 --- a/web/migrations/versions/c62bcc14c3d6_.py +++ b/web/migrations/versions/c62bcc14c3d6_.py @@ -1,5 +1,12 @@ - -"""empty message +########################################################################## +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2025, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# +########################################################################## +""" Revision ID: c62bcc14c3d6 Revises: 1f0eddc8fc79 @@ -15,6 +22,7 @@ down_revision = '1f0eddc8fc79' branch_labels = None depends_on = None + def upgrade(): # Add 'change_password' permission to all roles except 'Administrator'. meta = sa.MetaData() @@ -26,12 +34,13 @@ def upgrade(): (role_table.c.name != 'Administrator') ).values( permissions=sa.case( - (perm == None, 'change_password'), + (perm.is_(None), 'change_password'), (perm == '', 'change_password'), else_=perm + ',change_password' )) ) + def downgrade(): # pgAdmin only upgrades, downgrade not implemented. pass