Skip to content

fix(workspace): make restoreLastSelectedObject connection-type-aware (#640) #643

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 1 commit into from
Aug 30, 2026
Merged

fix(workspace): make restoreLastSelectedObject connection-type-aware (#640) #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
120 changes: 66 additions & 54 deletions lib/features/main_screen/main_screen_workspace_state.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,40 +176,52 @@ class MainScreenWorkspaceState {
MainScreenWorkspaceState restoreLastSelectedObject() {
final conn = activeConnection;
if (conn == null) return this;
if (lastSelectedPostgresObject != null) {
final obj = lastSelectedPostgresObject!;
return selectPostgresObject(
conn,
obj.database,
obj.schema,
obj.name,
obj.kind,
);
}
if (lastSelectedMysqlObject != null) {
final obj = lastSelectedMysqlObject!;
return selectMysqlObject(
conn,
obj.database,
obj.name,
obj.kind,
);
}
if (lastSelectedSqliteObject != null) {
final obj = lastSelectedSqliteObject!;
return selectSqliteObject(
conn,
obj.name,
obj.kind,
);
}
if (lastSelectedExtensionObject != null) {
final obj = lastSelectedExtensionObject!;
return selectExtensionObject(
conn,
obj.database,
obj.name,
);
final type = conn.type.toLowerCase();
switch (type) {
case 'postgres':
case 'postgresql':
if (lastSelectedPostgresObject != null) {
final obj = lastSelectedPostgresObject!;
return selectPostgresObject(
conn,
obj.database,
obj.schema,
obj.name,
obj.kind,
);
}
break;
case 'mysql':
if (lastSelectedMysqlObject != null) {
final obj = lastSelectedMysqlObject!;
return selectMysqlObject(
conn,
obj.database,
obj.name,
obj.kind,
);
}
break;
case 'sqlite':
if (lastSelectedSqliteObject != null) {
final obj = lastSelectedSqliteObject!;
return selectSqliteObject(
conn,
obj.name,
obj.kind,
);
}
break;
default:
if (lastSelectedExtensionObject != null) {
final obj = lastSelectedExtensionObject!;
return selectExtensionObject(
conn,
obj.database,
obj.name,
);
}
break;
}
return this;
}
Expand Down Expand Up @@ -240,9 +252,9 @@ class MainScreenWorkspaceState {
selectedSqliteObject: null,
sqliteSqlTabRequestToken: sqliteSqlTabRequestToken,
lastSelectedPostgresObject: pg,
lastSelectedMysqlObject: lastSelectedMysqlObject,
lastSelectedSqliteObject: lastSelectedSqliteObject,
lastSelectedExtensionObject: lastSelectedExtensionObject,
lastSelectedMysqlObject: null,
lastSelectedSqliteObject: null,
lastSelectedExtensionObject: null,
isReadOnly: isReadOnly,
);
}
Expand Down Expand Up @@ -270,10 +282,10 @@ class MainScreenWorkspaceState {
mysqlSqlTabRequestToken: mysqlSqlTabRequestToken,
selectedSqliteObject: null,
sqliteSqlTabRequestToken: sqliteSqlTabRequestToken,
lastSelectedPostgresObject: lastSelectedPostgresObject,
lastSelectedPostgresObject: null,
lastSelectedMysqlObject: my,
lastSelectedSqliteObject: lastSelectedSqliteObject,
lastSelectedExtensionObject: lastSelectedExtensionObject,
lastSelectedSqliteObject: null,
lastSelectedExtensionObject: null,
isReadOnly: isReadOnly,
);
}
Expand All @@ -299,10 +311,10 @@ class MainScreenWorkspaceState {
mysqlSqlTabRequestToken: mysqlSqlTabRequestToken,
selectedSqliteObject: sq,
sqliteSqlTabRequestToken: sqliteSqlTabRequestToken,
lastSelectedPostgresObject: lastSelectedPostgresObject,
lastSelectedMysqlObject: lastSelectedMysqlObject,
lastSelectedPostgresObject: null,
lastSelectedMysqlObject: null,
lastSelectedSqliteObject: sq,
lastSelectedExtensionObject: lastSelectedExtensionObject,
lastSelectedExtensionObject: null,
isReadOnly: isReadOnly,
);
}
Expand All @@ -329,9 +341,9 @@ class MainScreenWorkspaceState {
selectedSqliteObject: null,
sqliteSqlTabRequestToken: sqliteSqlTabRequestToken,
selectedExtensionObject: ext,
lastSelectedPostgresObject: lastSelectedPostgresObject,
lastSelectedMysqlObject: lastSelectedMysqlObject,
lastSelectedSqliteObject: lastSelectedSqliteObject,
lastSelectedPostgresObject: null,
lastSelectedMysqlObject: null,
lastSelectedSqliteObject: null,
lastSelectedExtensionObject: ext,
isReadOnly: isReadOnly,
);
Expand All @@ -350,10 +362,10 @@ class MainScreenWorkspaceState {
mysqlSqlTabRequestToken: mysqlSqlTabRequestToken,
selectedSqliteObject: null,
sqliteSqlTabRequestToken: sqliteSqlTabRequestToken,
lastSelectedPostgresObject: lastSelectedPostgresObject,
lastSelectedMysqlObject: lastSelectedMysqlObject,
lastSelectedSqliteObject: lastSelectedSqliteObject,
lastSelectedExtensionObject: lastSelectedExtensionObject,
lastSelectedPostgresObject: null,
lastSelectedMysqlObject: null,
lastSelectedSqliteObject: null,
lastSelectedExtensionObject: null,
isReadOnly: isReadOnly,
);
}
Expand All @@ -372,10 +384,10 @@ class MainScreenWorkspaceState {
mysqlSqlTabRequestToken: mysqlSqlTabRequestToken,
selectedSqliteObject: null,
sqliteSqlTabRequestToken: sqliteSqlTabRequestToken,
lastSelectedPostgresObject: lastSelectedPostgresObject,
lastSelectedMysqlObject: lastSelectedMysqlObject,
lastSelectedSqliteObject: lastSelectedSqliteObject,
lastSelectedExtensionObject: lastSelectedExtensionObject,
lastSelectedPostgresObject: null,
lastSelectedMysqlObject: null,
lastSelectedSqliteObject: null,
lastSelectedExtensionObject: null,
isReadOnly: isReadOnly,
);
}
Expand Down
115 changes: 115 additions & 0 deletions test/features/main_screen/main_screen_workspace_state_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import 'package:flutter_test/flutter_test.dart';
import 'package:querya_desktop/core/storage/local_db.dart';
import 'package:querya_desktop/features/connections/connections_panel.dart'
show SqliteObjectKind;
import 'package:querya_desktop/features/main_screen/main_screen_workspace_state.dart';
import 'package:querya_desktop/features/mysql/mysql_object_kind.dart';
import 'package:querya_desktop/features/postgresql/postgres_object_kind.dart';
Expand All @@ -22,6 +24,21 @@ void main() {
createdAt: createdAt,
id: 11,
);
final sqliteConn = ConnectionRow(
type: 'sqlite',
name: 'lite',
databaseName: '/tmp/test.db',
createdAt: createdAt,
id: 12,
);
final clickhouseConn = ConnectionRow(
type: 'clickhouse',
name: 'ch',
host: '127.0.0.1',
port: 8123,
createdAt: createdAt,
id: 13,
);

group('MainScreenWorkspaceState', () {
test('empty has no selection', () {
Expand Down Expand Up @@ -214,5 +231,103 @@ void main() {
final diffConn = reselectedSame.selectConnection(mysqlConn);
expect(diffConn.lastSelectedPostgresObject, isNull);
});

test('restoreLastSelectedObject is connection-type-aware', () {
// 1. MySQL connection
final mysqlState = MainScreenWorkspaceState.empty
.selectMysqlObject(mysqlConn, 'app_db', 'users', MysqlObjectKind.table)
.unselectActiveObject();
expect(mysqlState.selectedMysqlObject, isNull);
expect(mysqlState.lastSelectedMysqlObject?.name, 'users');
final restoredMy = mysqlState.restoreLastSelectedObject();
expect(restoredMy.selectedMysqlObject?.name, 'users');
expect(restoredMy.selectedPostgresObject, isNull);

// 2. SQLite connection
final sqliteState = MainScreenWorkspaceState.empty
.selectSqliteObject(sqliteConn, 'settings', SqliteObjectKind.table)
.unselectActiveObject();
expect(sqliteState.selectedSqliteObject, isNull);
expect(sqliteState.lastSelectedSqliteObject?.name, 'settings');
final restoredSq = sqliteState.restoreLastSelectedObject();
expect(restoredSq.selectedSqliteObject?.name, 'settings');

// 3. Extension (ClickHouse) connection
final extState = MainScreenWorkspaceState.empty
.selectExtensionObject(clickhouseConn, 'analytics', 'hits')
.unselectActiveObject();
expect(extState.selectedExtensionObject, isNull);
expect(extState.lastSelectedExtensionObject?.name, 'hits');
final restoredExt = extState.restoreLastSelectedObject();
expect(restoredExt.selectedExtensionObject?.name, 'hits');
});

test('restoreLastSelectedObject ignores cached references from other drivers', () {
// Craft a state where active connection is MySQL but lastSelectedPostgresObject is non-null
const mismatchedState = MainScreenWorkspaceState(
activeConnection: ConnectionRow(
type: 'mysql',
name: 'my_db',
createdAt: '2025-01-01',
id: 50,
),
lastSelectedPostgresObject: (
database: 'pg_db',
schema: 'public',
name: 'pg_table',
kind: PostgresObjectKind.table,
),
);

final restored = mismatchedState.restoreLastSelectedObject();
// Must NOT invoke selectPostgresObject with a MySQL connection
expect(restored.selectedPostgresObject, isNull);
expect(restored.selectedMysqlObject, isNull);
});

test('select*Object clears cached object references of other drivers', () {
final statePg = MainScreenWorkspaceState.empty.selectPostgresObject(
pgConn,
'db',
'public',
't1',
PostgresObjectKind.table,
);
expect(statePg.lastSelectedPostgresObject?.name, 't1');
expect(statePg.lastSelectedMysqlObject, isNull);
expect(statePg.lastSelectedSqliteObject, isNull);
expect(statePg.lastSelectedExtensionObject, isNull);

final stateMy = statePg.selectMysqlObject(
mysqlConn,
'db',
't2',
MysqlObjectKind.table,
);
expect(stateMy.lastSelectedPostgresObject, isNull);
expect(stateMy.lastSelectedMysqlObject?.name, 't2');
expect(stateMy.lastSelectedSqliteObject, isNull);
expect(stateMy.lastSelectedExtensionObject, isNull);

final stateSq = stateMy.selectSqliteObject(
sqliteConn,
't3',
SqliteObjectKind.table,
);
expect(stateSq.lastSelectedPostgresObject, isNull);
expect(stateSq.lastSelectedMysqlObject, isNull);
expect(stateSq.lastSelectedSqliteObject?.name, 't3');
expect(stateSq.lastSelectedExtensionObject, isNull);

final stateExt = stateSq.selectExtensionObject(
clickhouseConn,
'db',
't4',
);
expect(stateExt.lastSelectedPostgresObject, isNull);
expect(stateExt.lastSelectedMysqlObject, isNull);
expect(stateExt.lastSelectedSqliteObject, isNull);
expect(stateExt.lastSelectedExtensionObject?.name, 't4');
});
});
}
Loading