Skip to content

Commit 7c0b8a6

Browse files
committed
Enhance object naming in extractDbItems function to include schema for non-unique pure names
1 parent 9b8b070 commit 7c0b8a6

1 file changed

Lines changed: 8 additions & 1 deletion

File tree

packages/web/src/commands/CommandPalette.svelte

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,18 @@
2525
});
2626
2727
function extractDbItems(db, dbConnectionInfo, connectionList, $extensions, currentThemeType) {
28+
const allObjects = _.flatten(
29+
['tables', 'collections', 'views', 'matviews', 'procedures', 'functions'].map(objectTypeField =>
30+
((db || {})[objectTypeField] || []).map(obj => ({ objectTypeField, obj }))
31+
)
32+
);
33+
const pureNameCounts = _.countBy(allObjects, ({ obj }) => obj.pureName);
2834
const objectList = _.flatten(
2935
['tables', 'collections', 'views', 'matviews', 'procedures', 'functions'].map(objectTypeField =>
3036
_.sortBy(
3137
((db || {})[objectTypeField] || []).map(obj => ({
32-
text: obj.schemaName ? `${obj.schemaName}.${obj.pureName}` : obj.pureName,
38+
text:
39+
obj.schemaName && pureNameCounts[obj.pureName] > 1 ? `${obj.schemaName}.${obj.pureName}` : obj.pureName,
3340
onClick: () => handleDatabaseObjectClick({ objectTypeField, ...dbConnectionInfo, ...obj }),
3441
icon: databaseObjectIcons[objectTypeField],
3542
})),

0 commit comments

Comments
 (0)