mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2026-08-17 16:34:44 -05:00
1) Remove migrations folder from the exclude list of .pycodestyle file.
2) Fixed all the PEP8 issues in the migration files.
This commit is contained in:
+1
-1
@@ -6,4 +6,4 @@ show-source = False
|
|||||||
show-pep8 = False
|
show-pep8 = False
|
||||||
count = True
|
count = True
|
||||||
format = pylint
|
format = pylint
|
||||||
exclude = migrations,node_modules,config_local.py,config_distro.py
|
exclude = node_modules,config_local.py,config_distro.py
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ Bundled PostgreSQL Utilities
|
|||||||
New features
|
New features
|
||||||
************
|
************
|
||||||
|
|
||||||
|
| `Issue #1926 <https://github.com/pgadmin-org/pgadmin4/issues/1926>`_ - Add a new permission to allow disabling "Change Password" feature for a pgAdmin role.
|
||||||
| `Issue #8665 <https://github.com/pgadmin-org/pgadmin4/issues/8665>`_ - Supports JSON logging for gunicorn process within Docker.
|
| `Issue #8665 <https://github.com/pgadmin-org/pgadmin4/issues/8665>`_ - Supports JSON logging for gunicorn process within Docker.
|
||||||
|
|
||||||
Housekeeping
|
Housekeeping
|
||||||
|
|||||||
@@ -39,7 +39,8 @@ def upgrade():
|
|||||||
meta.reflect(op.get_bind(), only=('role',))
|
meta.reflect(op.get_bind(), only=('role',))
|
||||||
role_table = sa.Table('role', meta)
|
role_table = sa.Table('role', meta)
|
||||||
|
|
||||||
from pgadmin.tools.user_management.PgAdminPermissions import AllPermissionTypes
|
from pgadmin.tools.user_management.PgAdminPermissions import (
|
||||||
|
AllPermissionTypes)
|
||||||
op.execute(
|
op.execute(
|
||||||
role_table.update().where(role_table.c.name == 'User')
|
role_table.update().where(role_table.c.name == 'User')
|
||||||
.values(permissions=",".join(AllPermissionTypes.list())))
|
.values(permissions=",".join(AllPermissionTypes.list())))
|
||||||
|
|||||||
@@ -26,8 +26,9 @@ depends_on = None
|
|||||||
|
|
||||||
|
|
||||||
def upgrade():
|
def upgrade():
|
||||||
with op.batch_alter_table("server",
|
with (op.batch_alter_table("server",
|
||||||
table_kwargs={'sqlite_autoincrement': True}) as batch_op:
|
table_kwargs={'sqlite_autoincrement': True})
|
||||||
|
as batch_op):
|
||||||
if context.get_impl().bind.dialect.name == "sqlite":
|
if context.get_impl().bind.dialect.name == "sqlite":
|
||||||
batch_op.alter_column('id', autoincrement=True)
|
batch_op.alter_column('id', autoincrement=True)
|
||||||
batch_op.add_column(sa.Column('is_adhoc', sa.Integer(),
|
batch_op.add_column(sa.Column('is_adhoc', sa.Integer(),
|
||||||
|
|||||||
@@ -49,6 +49,7 @@ def upgrade():
|
|||||||
table.update().values(prepare_threshold=5)
|
table.update().values(prepare_threshold=5)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def downgrade():
|
def downgrade():
|
||||||
# pgAdmin only upgrades, downgrade not implemented.
|
# pgAdmin only upgrades, downgrade not implemented.
|
||||||
pass
|
pass
|
||||||
|
|||||||
@@ -35,7 +35,8 @@ def upgrade():
|
|||||||
qt_open_tab_setting = session.query(Preferences).filter_by(
|
qt_open_tab_setting = session.query(Preferences).filter_by(
|
||||||
name='new_browser_tab').order_by(Preferences.id.desc()).first()
|
name='new_browser_tab').order_by(Preferences.id.desc()).first()
|
||||||
debugger_tab_setting = session.query(Preferences).filter_by(
|
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(
|
schema_diff_tab_setting = session.query(Preferences).filter_by(
|
||||||
name='schema_diff_new_browser_tab').order_by(
|
name='schema_diff_new_browser_tab').order_by(
|
||||||
Preferences.id.desc()).first()
|
Preferences.id.desc()).first()
|
||||||
|
|||||||
@@ -33,7 +33,8 @@ def upgrade():
|
|||||||
"server", table_kwargs={'sqlite_autoincrement': True}) as batch_op:
|
"server", table_kwargs={'sqlite_autoincrement': True}) as batch_op:
|
||||||
if context.get_impl().bind.dialect.name == "sqlite":
|
if context.get_impl().bind.dialect.name == "sqlite":
|
||||||
batch_op.alter_column('id', autoincrement=True)
|
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():
|
def downgrade():
|
||||||
|
|||||||
@@ -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
|
Revision ID: ac2c2e27dc2d
|
||||||
Revises: ec0f11f9a4e6
|
Revises: ec0f11f9a4e6
|
||||||
@@ -20,11 +27,11 @@ depends_on = None
|
|||||||
|
|
||||||
def upgrade():
|
def upgrade():
|
||||||
session = Session(bind=op.get_bind())
|
session = Session(bind=op.get_bind())
|
||||||
|
|
||||||
session.query(Preferences).filter(
|
session.query(Preferences).filter(
|
||||||
Preferences.name == 'execute_query').update({'name': 'execute_script'})
|
Preferences.name == 'execute_query').update({'name': 'execute_script'})
|
||||||
session.commit()
|
session.commit()
|
||||||
|
|
||||||
meta = sa.MetaData()
|
meta = sa.MetaData()
|
||||||
meta.reflect(op.get_bind(), only=('user_macros',))
|
meta.reflect(op.get_bind(), only=('user_macros',))
|
||||||
user_macros_table = sa.Table('user_macros', meta)
|
user_macros_table = sa.Table('user_macros', meta)
|
||||||
@@ -37,7 +44,7 @@ def upgrade():
|
|||||||
)
|
)
|
||||||
# Fetch the data from the user_macros table
|
# Fetch the data from the user_macros table
|
||||||
results = op.get_bind().execute(stmt).fetchall()
|
results = op.get_bind().execute(stmt).fetchall()
|
||||||
|
|
||||||
# Drop and re-create user macro table.
|
# Drop and re-create user macro table.
|
||||||
op.drop_table('user_macros')
|
op.drop_table('user_macros')
|
||||||
op.create_table(
|
op.create_table(
|
||||||
@@ -47,8 +54,10 @@ def upgrade():
|
|||||||
sa.Column('uid', sa.Integer(), nullable=False),
|
sa.Column('uid', sa.Integer(), nullable=False),
|
||||||
sa.Column('name', sa.String(length=1024), nullable=False),
|
sa.Column('name', sa.String(length=1024), nullable=False),
|
||||||
sa.Column('sql', sa.String()),
|
sa.Column('sql', sa.String()),
|
||||||
sa.ForeignKeyConstraint(['mid'], ['macros.id'], ondelete='CASCADE'),
|
sa.ForeignKeyConstraint(['mid'], ['macros.id'],
|
||||||
sa.ForeignKeyConstraint(['uid'], ['user.id'], ondelete='CASCADE'),
|
ondelete='CASCADE'),
|
||||||
|
sa.ForeignKeyConstraint(['uid'], ['user.id'],
|
||||||
|
ondelete='CASCADE'),
|
||||||
sa.PrimaryKeyConstraint('id',))
|
sa.PrimaryKeyConstraint('id',))
|
||||||
|
|
||||||
# Reflect the new table structure
|
# Reflect the new table structure
|
||||||
@@ -64,6 +73,7 @@ def upgrade():
|
|||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def downgrade():
|
def downgrade():
|
||||||
# pgAdmin only upgrades, downgrade not implemented.
|
# pgAdmin only upgrades, downgrade not implemented.
|
||||||
pass
|
pass
|
||||||
|
|||||||
@@ -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
|
Revision ID: c62bcc14c3d6
|
||||||
Revises: 1f0eddc8fc79
|
Revises: 1f0eddc8fc79
|
||||||
@@ -15,6 +22,7 @@ down_revision = '1f0eddc8fc79'
|
|||||||
branch_labels = None
|
branch_labels = None
|
||||||
depends_on = None
|
depends_on = None
|
||||||
|
|
||||||
|
|
||||||
def upgrade():
|
def upgrade():
|
||||||
# Add 'change_password' permission to all roles except 'Administrator'.
|
# Add 'change_password' permission to all roles except 'Administrator'.
|
||||||
meta = sa.MetaData()
|
meta = sa.MetaData()
|
||||||
@@ -26,12 +34,13 @@ def upgrade():
|
|||||||
(role_table.c.name != 'Administrator')
|
(role_table.c.name != 'Administrator')
|
||||||
).values(
|
).values(
|
||||||
permissions=sa.case(
|
permissions=sa.case(
|
||||||
(perm == None, 'change_password'),
|
(perm.is_(None), 'change_password'),
|
||||||
(perm == '', 'change_password'),
|
(perm == '', 'change_password'),
|
||||||
else_=perm + ',change_password'
|
else_=perm + ',change_password'
|
||||||
))
|
))
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def downgrade():
|
def downgrade():
|
||||||
# pgAdmin only upgrades, downgrade not implemented.
|
# pgAdmin only upgrades, downgrade not implemented.
|
||||||
pass
|
pass
|
||||||
|
|||||||
Reference in New Issue
Block a user