Skip to content

refactor(workspace): extract SqlWorkspaceToolbar and introduce BaseSqlExecutionDelegate #1392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ZhuchkaTriplesix merged 3 commits into from
Oct 10, 2026
Merged

refactor(workspace): extract SqlWorkspaceToolbar and introduce BaseSqlExecutionDelegate #1392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
675e498
refactor(workspace): extract SqlWorkspaceToolbar and introduce BaseSq…
ZhuchkaTriplesix Oct 10, 2026
12d1120
fix(workspace): fix toolbar test compile error and analyzer warnings
ZhuchkaTriplesix Oct 10, 2026
a40bbcb
test(workspace): use const ThemeData.dark() in toolbar test
ZhuchkaTriplesix Oct 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions lib/features/mysql/mysql_sql_workspace.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import 'package:querya_desktop/features/workspace/workspace.dart';
import 'package:querya_desktop/features/workspace/query_plan.dart';

/// Execution delegate for MySQL / MariaDB connections.
class MysqlSqlExecutionDelegate extends SqlExecutionDelegate {
class MysqlSqlExecutionDelegate extends BaseSqlExecutionDelegate {
MysqlSqlExecutionDelegate({
required this.connectionRow,
required this.isReadOnly,
Expand Down Expand Up @@ -129,16 +129,13 @@ class MysqlSqlExecutionDelegate extends SqlExecutionDelegate {
affected = _affectedInt(rs.affectedRows);
}

String? statusMsg;
if (cols.isEmpty && outRows.isEmpty) {
statusMsg = affected != null
? 'OK. Rows affected: $affected.'
: 'Command completed.';
} else {
statusMsg = truncated
? 'Showing first $cap row(s) (result capped).'
: '$n row(s).';
}
final statusMsg = formatStatusMessage(
columnCount: cols.length,
rowCount: n,
affectedRows: affected,
isTruncated: truncated,
cap: cap,
);

return SqlExecutionResult(
columns: cols,
Expand Down
18 changes: 9 additions & 9 deletions lib/features/postgresql/postgres_sql_workspace.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ String _pgSqlSessionDatabase(ConnectionRow row) {
}

/// Execution delegate for PostgreSQL connections.
class PostgresSqlExecutionDelegate extends SqlExecutionDelegate {
class PostgresSqlExecutionDelegate extends BaseSqlExecutionDelegate {
PostgresSqlExecutionDelegate({
required this.connectionRow,
required this.isReadOnly,
Expand Down Expand Up @@ -139,14 +139,14 @@ class PostgresSqlExecutionDelegate extends SqlExecutionDelegate {
);

final isTruncated = result.length >= cap;
String? statusMsg;
if (cols.isEmpty && outRows.isEmpty) {
statusMsg = 'Command completed. Rows affected: ${result.affectedRows}.';
} else {
statusMsg = isTruncated
? 'Showing first $cap row(s) (result capped).'
: '${result.length} row(s).';
}
final statusMsg = formatStatusMessage(
columnCount: cols.length,
rowCount: outRows.length,
affectedRows: result.affectedRows,
isTruncated: isTruncated,
cap: cap,
successPrefix: 'Command completed.',
);

return SqlExecutionResult(
columns: cols,
Expand Down
17 changes: 8 additions & 9 deletions lib/features/sqlite/sqlite_sql_workspace.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import 'package:querya_desktop/features/workspace/workspace.dart';
import 'package:querya_desktop/features/workspace/query_plan.dart';

/// Execution delegate for SQLite connections.
class SqliteSqlExecutionDelegate extends SqlExecutionDelegate {
class SqliteSqlExecutionDelegate extends BaseSqlExecutionDelegate {
SqliteSqlExecutionDelegate({
required this.connectionRow,
required this.isReadOnly,
Expand Down Expand Up @@ -113,14 +113,13 @@ class SqliteSqlExecutionDelegate extends SqlExecutionDelegate {

final outRows = await convertResultRowsToStringsAdaptive(rawRows);

String? statusMsg;
if (cols.isEmpty && outRows.isEmpty) {
statusMsg = 'Command completed.';
} else if (truncated || (injectedLimit && results.length >= cap)) {
statusMsg = 'Showing first $cap row(s) (result capped).';
} else {
statusMsg = '${results.length} row(s).';
}
final isTruncated = truncated || (injectedLimit && results.length >= cap);
final statusMsg = formatStatusMessage(
columnCount: cols.length,
rowCount: results.length,
isTruncated: isTruncated,
cap: cap,
);

return SqlExecutionResult(
columns: cols,
Expand Down
Loading
Loading