Skip to content

Commit c2ef9d0

Browse files
committed
1) Remove migrations folder from the exclude list of .pycodestyle file.
2) Fixed all the PEP8 issues in the migration files.
1 parent db5943b commit c2ef9d0

File tree

9 files changed

+42
-17
lines changed

9 files changed

+42
-17
lines changed

.pycodestyle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ show-source = False
66
show-pep8 = False
77
count = True
88
format = pylint
9-
exclude = migrations,node_modules,config_local.py,config_distro.py
9+
exclude = node_modules,config_local.py,config_distro.py

docs/en_US/release_notes_9_5.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Bundled PostgreSQL Utilities
2020
New features
2121
************
2222

23+
| `Issue #1926 <https://github.com/pgadmin-org/pgadmin4/issues/1926>`_ - Add a new permission to allow disabling "Change Password" feature for a pgAdmin role.
2324
| `Issue #8665 <https://github.com/pgadmin-org/pgadmin4/issues/8665>`_ - Supports JSON logging for gunicorn process within Docker.
2425
2526
Housekeeping

web/migrations/versions/1f0eddc8fc79_.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ def upgrade():
3939
meta.reflect(op.get_bind(), only=('role',))
4040
role_table = sa.Table('role', meta)
4141

42-
from pgadmin.tools.user_management.PgAdminPermissions import AllPermissionTypes
42+
from pgadmin.tools.user_management.PgAdminPermissions import (
43+
AllPermissionTypes)
4344
op.execute(
4445
role_table.update().where(role_table.c.name == 'User')
4546
.values(permissions=",".join(AllPermissionTypes.list())))

web/migrations/versions/255e2842e4d7_.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@
2626

2727

2828
def upgrade():
29-
with op.batch_alter_table("server",
30-
table_kwargs={'sqlite_autoincrement': True}) as batch_op:
29+
with (op.batch_alter_table("server",
30+
table_kwargs={'sqlite_autoincrement': True})
31+
as batch_op):
3132
if context.get_impl().bind.dialect.name == "sqlite":
3233
batch_op.alter_column('id', autoincrement=True)
3334
batch_op.add_column(sa.Column('is_adhoc', sa.Integer(),

web/migrations/versions/44b9ce549393_.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ def upgrade():
4949
table.update().values(prepare_threshold=5)
5050
)
5151

52+
5253
def downgrade():
5354
# pgAdmin only upgrades, downgrade not implemented.
5455
pass

web/migrations/versions/81c7ffeffeee_.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ def upgrade():
3535
qt_open_tab_setting = session.query(Preferences).filter_by(
3636
name='new_browser_tab').order_by(Preferences.id.desc()).first()
3737
debugger_tab_setting = session.query(Preferences).filter_by(
38-
name='debugger_new_browser_tab').order_by(Preferences.id.desc()).first()
38+
name='debugger_new_browser_tab').order_by(
39+
Preferences.id.desc()).first()
3940
schema_diff_tab_setting = session.query(Preferences).filter_by(
4041
name='schema_diff_new_browser_tab').order_by(
4142
Preferences.id.desc()).first()

web/migrations/versions/9426ad06a63b_.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ def upgrade():
3333
"server", table_kwargs={'sqlite_autoincrement': True}) as batch_op:
3434
if context.get_impl().bind.dialect.name == "sqlite":
3535
batch_op.alter_column('id', autoincrement=True)
36-
batch_op.add_column(sa.Column('shared_username', sa.String(64), nullable=True))
36+
batch_op.add_column(sa.Column('shared_username', sa.String(64),
37+
nullable=True))
3738

3839

3940
def downgrade():

web/migrations/versions/ac2c2e27dc2d_.py

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
1-
2-
"""empty message
1+
##########################################################################
2+
#
3+
# pgAdmin 4 - PostgreSQL Tools
4+
#
5+
# Copyright (C) 2013 - 2025, The pgAdmin Development Team
6+
# This software is released under the PostgreSQL Licence
7+
#
8+
##########################################################################
9+
"""
310
411
Revision ID: ac2c2e27dc2d
512
Revises: ec0f11f9a4e6
@@ -20,11 +27,11 @@
2027

2128
def upgrade():
2229
session = Session(bind=op.get_bind())
23-
30+
2431
session.query(Preferences).filter(
25-
Preferences.name == 'execute_query').update({'name': 'execute_script'})
32+
Preferences.name == 'execute_query').update({'name': 'execute_script'})
2633
session.commit()
27-
34+
2835
meta = sa.MetaData()
2936
meta.reflect(op.get_bind(), only=('user_macros',))
3037
user_macros_table = sa.Table('user_macros', meta)
@@ -37,7 +44,7 @@ def upgrade():
3744
)
3845
# Fetch the data from the user_macros table
3946
results = op.get_bind().execute(stmt).fetchall()
40-
47+
4148
# Drop and re-create user macro table.
4249
op.drop_table('user_macros')
4350
op.create_table(
@@ -47,8 +54,10 @@ def upgrade():
4754
sa.Column('uid', sa.Integer(), nullable=False),
4855
sa.Column('name', sa.String(length=1024), nullable=False),
4956
sa.Column('sql', sa.String()),
50-
sa.ForeignKeyConstraint(['mid'], ['macros.id'], ondelete='CASCADE'),
51-
sa.ForeignKeyConstraint(['uid'], ['user.id'], ondelete='CASCADE'),
57+
sa.ForeignKeyConstraint(['mid'], ['macros.id'],
58+
ondelete='CASCADE'),
59+
sa.ForeignKeyConstraint(['uid'], ['user.id'],
60+
ondelete='CASCADE'),
5261
sa.PrimaryKeyConstraint('id',))
5362

5463
# Reflect the new table structure
@@ -64,6 +73,7 @@ def upgrade():
6473
]
6574
)
6675

76+
6777
def downgrade():
6878
# pgAdmin only upgrades, downgrade not implemented.
6979
pass

web/migrations/versions/c62bcc14c3d6_.py

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
1-
2-
"""empty message
1+
##########################################################################
2+
#
3+
# pgAdmin 4 - PostgreSQL Tools
4+
#
5+
# Copyright (C) 2013 - 2025, The pgAdmin Development Team
6+
# This software is released under the PostgreSQL Licence
7+
#
8+
##########################################################################
9+
"""
310
411
Revision ID: c62bcc14c3d6
512
Revises: 1f0eddc8fc79
@@ -15,6 +22,7 @@
1522
branch_labels = None
1623
depends_on = None
1724

25+
1826
def upgrade():
1927
# Add 'change_password' permission to all roles except 'Administrator'.
2028
meta = sa.MetaData()
@@ -26,12 +34,13 @@ def upgrade():
2634
(role_table.c.name != 'Administrator')
2735
).values(
2836
permissions=sa.case(
29-
(perm == None, 'change_password'),
37+
(perm.is_(None), 'change_password'),
3038
(perm == '', 'change_password'),
3139
else_=perm + ',change_password'
3240
))
3341
)
3442

43+
3544
def downgrade():
3645
# pgAdmin only upgrades, downgrade not implemented.
3746
pass

0 commit comments

Comments
 (0)