IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-16 10:15:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix a crash issue occurring when debugging a function with arguments when using pgAdmin with external config database. #6904

Browse Source
This commit is contained in:
Aditya Toshniwal 2023-11-15 17:42:58 +05:30
parent 75a2d880f6
commit c4a5f8d707
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/migrations/versions/9426ad06a63b_.py
View File

@ -13,7 +13,7 @@ Revision ID: 9426ad06a63b
Revises: f656e56dfdc8 Revises: f656e56dfdc8
Create Date: 2023-10-09 15:09:50.773035 Create Date: 2023-10-09 15:09:50.773035
""" """
from alembic import op from alembic import op, context
import sqlalchemy as sa import sqlalchemy as sa
@ -31,6 +31,7 @@ def upgrade():
# batch_alter_table # batch_alter_table
with op.batch_alter_table( with op.batch_alter_table(
"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":
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))

6
web/pgadmin/tools/debugger/__init__.py
View File

@ -1844,7 +1844,7 @@ def set_arguments_sqlite(sid, did, scid, func_id):
for i in range(0, len(data)): for i in range(0, len(data)):
dbg_func_args_exists = int( dbg_func_args_exists = int(
DebuggerFunctionArguments.query.filter_by( DebuggerFunctionArguments.query.filter_by(
server_id=data[i]['server_id'], server_id=int(data[i]['server_id']),
database_id=data[i]['database_id'], database_id=data[i]['database_id'],
schema_id=data[i]['schema_id'], schema_id=data[i]['schema_id'],
function_id=data[i]['function_id'], function_id=data[i]['function_id'],
@ -1863,7 +1863,7 @@ def set_arguments_sqlite(sid, did, scid, func_id):
# existing value otherwise add the new value # existing value otherwise add the new value
if dbg_func_args_exists: if dbg_func_args_exists:
dbg_func_args = DebuggerFunctionArguments.query.filter_by( dbg_func_args = DebuggerFunctionArguments.query.filter_by(
server_id=data[i]['server_id'], server_id=int(data[i]['server_id']),
database_id=data[i]['database_id'], database_id=data[i]['database_id'],
schema_id=data[i]['schema_id'], schema_id=data[i]['schema_id'],
function_id=data[i]['function_id'], function_id=data[i]['function_id'],
@ -1876,7 +1876,7 @@ def set_arguments_sqlite(sid, did, scid, func_id):
dbg_func_args.value = array_string dbg_func_args.value = array_string
else: else:
debugger_func_args = DebuggerFunctionArguments( debugger_func_args = DebuggerFunctionArguments(
server_id=data[i]['server_id'], server_id=int(data[i]['server_id']),
database_id=data[i]['database_id'], database_id=data[i]['database_id'],
schema_id=data[i]['schema_id'], schema_id=data[i]['schema_id'],
function_id=data[i]['function_id'], function_id=data[i]['function_id'],