diff --git a/packages/web/src/commands/stdCommands.ts b/packages/web/src/commands/stdCommands.ts index e4739aee4..4bd23d8d5 100644 --- a/packages/web/src/commands/stdCommands.ts +++ b/packages/web/src/commands/stdCommands.ts @@ -173,17 +173,19 @@ registerCommand({ }, }); -registerCommand({ - id: 'new.queryDesign', - category: 'New', - icon: 'img query-design', - name: 'Query design', - menuName: 'New query design', - onClick: () => newQueryDesign(), - testEnabled: () => - getCurrentDatabase() && - findEngineDriver(getCurrentDatabase()?.connection, getExtensions())?.databaseEngineTypes?.includes('sql'), -}); +if (isProApp()) { + registerCommand({ + id: 'new.queryDesign', + category: 'New', + icon: 'img query-design', + name: 'Query design', + menuName: 'New query design', + onClick: () => newQueryDesign(), + testEnabled: () => + getCurrentDatabase() && + findEngineDriver(getCurrentDatabase()?.connection, getExtensions())?.databaseEngineTypes?.includes('sql'), + }); +} if (isProApp()) { registerCommand({ @@ -229,14 +231,16 @@ if (isProApp()) { }); } -registerCommand({ - id: 'new.perspective', - category: 'New', - icon: 'img perspective', - name: 'Perspective', - menuName: 'New perspective', - onClick: () => newPerspective(), -}); +if (isProApp()) { + registerCommand({ + id: 'new.perspective', + category: 'New', + icon: 'img perspective', + name: 'Perspective', + menuName: 'New perspective', + onClick: () => newPerspective(), + }); +} registerCommand({ id: 'new.diagram', diff --git a/packages/web/src/tabs/QueryTab.svelte b/packages/web/src/tabs/QueryTab.svelte index 2618ca133..350eaa492 100644 --- a/packages/web/src/tabs/QueryTab.svelte +++ b/packages/web/src/tabs/QueryTab.svelte @@ -416,7 +416,10 @@ } let isInitialized = false; - let queryParameterStyle = localStorage.getItem(`tabdata_queryParamStyle_${tabid}`) ?? ''; + let queryParameterStyle = + localStorage.getItem(`tabdata_queryParamStyle_${tabid}`) ?? + initialArgs?.queryParameterStyle ?? + (initialArgs?.scriptTemplate == 'EXECUTE PROCEDURE' || initialArgs?.scriptTemplate == 'CALL FUNCTION' ? ':' : null); diff --git a/plugins/dbgate-plugin-mssql/src/frontend/MsSqlDumper.js b/plugins/dbgate-plugin-mssql/src/frontend/MsSqlDumper.js index 7f5ddabdd..9fbdea5ad 100644 --- a/plugins/dbgate-plugin-mssql/src/frontend/MsSqlDumper.js +++ b/plugins/dbgate-plugin-mssql/src/frontend/MsSqlDumper.js @@ -174,7 +174,7 @@ class MsSqlDumper extends SqlDumper { this.putCollection( delimiter, (parameters || []), param => { - this.putRaw(argLiteralsByName[param]); + this.putRaw(argLiteralsByName[param.parameterName]); if (param?.parameterMode == 'OUT') this.put(' ^output'); } );