Skip to content

Wip#7

Merged
TheyCallMeErick merged 43 commits intomainfrom
wip
Apr 16, 2026
Merged

Wip#7
TheyCallMeErick merged 43 commits intomainfrom
wip

Conversation

@TheyCallMeErick
Copy link
Copy Markdown
Owner

No description provided.

@TheyCallMeErick
Copy link
Copy Markdown
Owner Author

@copilot resolve the merge conflicts in this pull request

@TheyCallMeErick
Copy link
Copy Markdown
Owner Author

@copilot resolve the merge conflicts in this pull request

# Conflicts:
#	docs/INDEX.md
#	docs/THEME_JSON_SCHEMA.md
#	src/AkkornStudio.UI/Assets/Localization/en-US.json
#	src/AkkornStudio.UI/Assets/Localization/es-ES.json
#	src/AkkornStudio.UI/Assets/Localization/ja-JP.json
#	src/AkkornStudio.UI/Assets/Localization/pt-BR.json
#	src/AkkornStudio.UI/Assets/Localization/ru-RU.json
#	src/AkkornStudio.UI/Assets/Localization/zh-TW.json
#	src/AkkornStudio.UI/Assets/Themes/AppStyles.axaml
#	src/AkkornStudio.UI/Controls/AppDiagnostics/AppDiagnosticsControl.axaml
#	src/AkkornStudio.UI/Controls/AutoJoin/AutoJoinOverlay.axaml
#	src/AkkornStudio.UI/Controls/AutoJoin/ManualJoinDialog.axaml
#	src/AkkornStudio.UI/Controls/Benchmark/BenchmarkOverlay.axaml
#	src/AkkornStudio.UI/Controls/CommandPalette/CommandPaletteControl.axaml
#	src/AkkornStudio.UI/Controls/ConnectionManager/ConnectionManagerControl.axaml
#	src/AkkornStudio.UI/Controls/Ddl/DdlExecuteDialogWindow.cs
#	src/AkkornStudio.UI/Controls/ExplainPlan/ExplainPlanOverlay.axaml
#	src/AkkornStudio.UI/Controls/ExplainPlan/ExplainPlanOverlay.axaml.cs
#	src/AkkornStudio.UI/Controls/FileHistory/FileVersionHistoryOverlay.axaml
#	src/AkkornStudio.UI/Controls/FlowVersions/FlowVersionOverlay.axaml
#	src/AkkornStudio.UI/Controls/InfiniteCanvas/BezierWireLayer.cs
#	src/AkkornStudio.UI/Controls/KeyboardShortcuts/KeyboardShortcutsEditorControl.cs
#	src/AkkornStudio.UI/Controls/LiveSqlBar/LiveSqlBar.axaml
#	src/AkkornStudio.UI/Controls/LiveSqlBar/LiveSqlBar.axaml.cs
#	src/AkkornStudio.UI/Controls/Node/NodeControl.axaml
#	src/AkkornStudio.UI/Controls/PropertyPanel/PropertyPanelControl.axaml
#	src/AkkornStudio.UI/Controls/SearchMenu/SearchMenuControl.axaml
#	src/AkkornStudio.UI/Controls/Shared/DatabaseConnectionCard.axaml
#	src/AkkornStudio.UI/Controls/Shared/DatabaseConnectionCard.axaml.cs
#	src/AkkornStudio.UI/Controls/Shell/DdlSchemaAnalysisWorkspaceControl.axaml
#	src/AkkornStudio.UI/Controls/Shell/DdlSchemaAnalysisWorkspaceControl.axaml.cs
#	src/AkkornStudio.UI/Controls/Shell/DiagramDocumentPageControl.axaml
#	src/AkkornStudio.UI/Controls/Shell/OutputPreviewModalControl.axaml
#	src/AkkornStudio.UI/Controls/Shell/OverlayZIndex.cs
#	src/AkkornStudio.UI/Controls/SidebarLeft/ConnectionTabControl.axaml
#	src/AkkornStudio.UI/Controls/SidebarLeft/NodesListControl.axaml
#	src/AkkornStudio.UI/Controls/SidebarLeft/SchemaControl.axaml
#	src/AkkornStudio.UI/Controls/SidebarLeft/SidebarControl.axaml
#	src/AkkornStudio.UI/Controls/SidebarLeft/SidebarDiagnosticsControl.axaml
#	src/AkkornStudio.UI/Controls/SqlEditor/SqlBracketHighlightRenderer.cs
#	src/AkkornStudio.UI/Controls/SqlEditor/SqlEditorCellExpandDialogWindow.cs
#	src/AkkornStudio.UI/Controls/SqlEditor/SqlEditorForeignKeyDialogWindow.cs
#	src/AkkornStudio.UI/Controls/SqlEditor/SqlEditorLeftSidebarControl.axaml
#	src/AkkornStudio.UI/Controls/SqlEditor/SqlEditorReportExportDialogWindow.cs
#	src/AkkornStudio.UI/Controls/SqlEditor/SqlEditorResultCellContentFormatter.cs
#	src/AkkornStudio.UI/Controls/SqlEditor/SqlEditorRightSidebarControl.axaml
#	src/AkkornStudio.UI/Controls/SqlEditor/SqlEditorRightSidebarControl.axaml.cs
#	src/AkkornStudio.UI/Controls/SqlEditor/SqlEditorSchemaBrowserControl.axaml
#	src/AkkornStudio.UI/Controls/SqlEditor/SqlEditorSchemaBrowserControl.axaml.cs
#	src/AkkornStudio.UI/Controls/SqlEditor/SqlEditorTabBar.axaml
#	src/AkkornStudio.UI/Controls/SqlEditor/SqlExecutionStatementHighlightRenderer.cs
#	src/AkkornStudio.UI/Controls/SqlEditor/SqlToolOutputDialogWindow.cs
#	src/AkkornStudio.UI/Controls/SqlImporter/SqlImporterOverlay.axaml
#	src/AkkornStudio.UI/Controls/Start/StartMenuControl.axaml
#	src/AkkornStudio.UI/Serialization/Canvas/CanvasSerializer.Connections.cs
#	src/AkkornStudio.UI/Serialization/Canvas/CanvasSerializer.Load.cs
#	src/AkkornStudio.UI/Serialization/Canvas/CanvasSerializer.Nodes.cs
#	src/AkkornStudio.UI/Services/CommandPalette/CommandPaletteFactory.cs
#	src/AkkornStudio.UI/Services/ConnectionManager/Contracts/ConnectionContextLevel.cs
#	src/AkkornStudio.UI/Services/ConnectionManager/Contracts/Dtos/ConnectionCatalogCapabilityDto.cs
#	src/AkkornStudio.UI/Services/ConnectionManager/Contracts/IConnectionCatalogCapabilityProvider.cs
#	src/AkkornStudio.UI/Services/ConnectionManager/Workflow/ConnectionCatalogCapabilityProvider.cs
#	src/AkkornStudio.UI/Services/QueryPreview/Compilation/Graph/QueryCompilationNodeGraphAssembler.cs
#	src/AkkornStudio.UI/Services/QueryPreview/Compilation/Sources/QueryCompilationSourceResolver.cs
#	src/AkkornStudio.UI/Services/QueryPreview/Compilation/Stages/QueryCompilationInputStage.cs
#	src/AkkornStudio.UI/Services/QueryPreview/Compilation/Validation/Validators/QueryCompilationAliasAmbiguityValidator.cs
#	src/AkkornStudio.UI/Services/QueryPreview/Compilation/Validation/Validators/QueryCompilationOutputSourceReachabilityValidator.cs
#	src/AkkornStudio.UI/Services/QueryPreview/Compilation/Validation/Validators/QueryCompilationSourceConflictValidator.cs
#	src/AkkornStudio.UI/Services/QueryPreview/Graph/JoinResolver.cs
#	src/AkkornStudio.UI/Services/QueryPreview/Graph/QueryGraphBuilder.cs
#	src/AkkornStudio.UI/Services/QueryPreview/Validation/CteValidator.cs
#	src/AkkornStudio.UI/Services/Session/FileOperationsService.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/AppSettingsSqlCompletionFrequencyStore.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/CompletionRankingEngine.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/CompletionUsageStats.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/FunctionParameterSignature.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/FunctionSignature.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/FunctionSignatureRegistry.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/FuzzyScorer.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/HoverDocumentationInfo.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/ISqlCompletionEngine.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/ISqlCompletionFrequencyStore.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/SignatureHelpInfo.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/SqlCompletionContext.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/SqlCompletionDocumentWindow.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/SqlCompletionDocumentWindowExtractor.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/SqlCompletionMetadataIndex.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/SqlCompletionMetadataIndexFactory.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/SqlCompletionPipelineStage.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/SqlCompletionRequestContext.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/SqlCompletionSearchCandidate.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/SqlCompletionStageSnapshot.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/SqlCompletionTelemetry.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/SqlContextDetector.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/SqlEditorCompletionItemContent.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/SqlEditorCompletionLoadingContent.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/SqlEditorCompletionLoadingData.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/SqlEditorSnippetTabStopSession.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/SqlEditorSnippetTabStopSessionStore.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/SqlEditorSnippetTemplate.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/SqlEditorSnippetTemplateParser.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/SqlFoldingStrategy.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/SqlHoverDocumentationService.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/SqlSignatureHelpService.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/SqlStatementContext.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/SqlStatementExtractor.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/SqlSymbolTable.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/SqlSymbolTableBuilder.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/SqlTableBindingSymbol.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/SqlToken.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/SqlTokenKind.cs
#	src/AkkornStudio.UI/Services/SqlEditor/Completion/SqlTokenizer.cs
#	src/AkkornStudio.UI/Services/SqlEditor/ISqlCompletionWorker.cs
#	src/AkkornStudio.UI/Services/SqlEditor/ISqlEditorSessionDraftStore.cs
#	src/AkkornStudio.UI/Services/SqlEditor/SqlCompletionWorker.cs
#	src/AkkornStudio.UI/Services/SqlEditor/SqlEditorBenchmarkService.cs
#	src/AkkornStudio.UI/Services/SqlEditor/SqlEditorCompletionController.cs
#	src/AkkornStudio.UI/Services/SqlEditor/SqlEditorExecutionController.cs
#	src/AkkornStudio.UI/Services/SqlEditor/SqlEditorExecutionFeedbackService.cs
#	src/AkkornStudio.UI/Services/SqlEditor/SqlEditorExplainService.cs
#	src/AkkornStudio.UI/Services/SqlEditor/SqlEditorPropertyChangePublisher.cs
#	src/AkkornStudio.UI/Services/SqlEditor/SqlEditorResultStateService.cs
#	src/AkkornStudio.UI/Services/SqlEditor/SqlEditorSessionDraftEntry.cs
#	src/AkkornStudio.UI/Services/SqlEditor/SqlEditorSessionDraftStore.cs
#	src/AkkornStudio.UI/Services/SqlEditor/SqlInlineEditEligibility.cs
#	src/AkkornStudio.UI/Services/SqlEditor/SqlInlineUpdateStatementBuilder.cs
#	src/AkkornStudio.UI/Services/SqlEditor/SqlResultEligibilityDetector.cs
#	src/AkkornStudio.UI/Services/SqlImport/Build/ImportModelToCanvasBuilder.cs
#	src/AkkornStudio.UI/Services/SqlImport/Execution/Applying/SqlImportGroupingClauseApplier.cs
#	src/AkkornStudio.UI/Services/SqlImport/Execution/Applying/SqlImportOrderingClauseApplier.cs
#	src/AkkornStudio.UI/Services/SqlImport/Execution/Parsing/SqlImportClauseParser.cs
#	src/AkkornStudio.UI/Services/SqlImport/Execution/SqlImportExecutionResult.cs
#	src/AkkornStudio.UI/Services/SqlImport/Mapping/SqlImportAstToIrMapper.cs
#	src/AkkornStudio.UI/Services/SqlImport/Mapping/SqlImportPredicateIrParser.cs
#	src/AkkornStudio.UI/Services/SqlImport/SqlImportReportDiagnostics.cs
#	src/AkkornStudio.UI/Services/SqlImport/SqlImportReportFactory.cs
#	src/AkkornStudio.UI/Services/Validation/GraphValidator.cs
#	src/AkkornStudio.UI/Services/Validation/OrphanNodeDetector.cs
#	src/AkkornStudio.UI/ViewModels/Benchmark/BenchmarkViewModel.cs
#	src/AkkornStudio.UI/ViewModels/Canvas/ExplainPlanViewModel.cs
#	src/AkkornStudio.UI/ViewModels/Canvas/NodeViewModel.cs
#	src/AkkornStudio.UI/ViewModels/Canvas/PinViewModel.cs
#	src/AkkornStudio.UI/ViewModels/Canvas/SqlImporterViewModel.cs
#	src/AkkornStudio.UI/ViewModels/Canvas/Strategies/QueryDomainStrategy.cs
#	src/AkkornStudio.UI/ViewModels/Canvas/SubCanvasEditingController.cs
#	src/AkkornStudio.UI/ViewModels/CanvasViewModel.cs
#	src/AkkornStudio.UI/ViewModels/ConnectionManager/ConnectionManagerViewModel.cs
#	src/AkkornStudio.UI/ViewModels/Ddl/SchemaAnalysisPanelViewModel.cs
#	src/AkkornStudio.UI/ViewModels/Ddl/SchemaAnalysisViewState.cs
#	src/AkkornStudio.UI/ViewModels/LiveDdlBar/LiveDdlBarViewModel.cs
#	src/AkkornStudio.UI/ViewModels/PropertyPanel/PropertyPanelViewModel.cs
#	src/AkkornStudio.UI/ViewModels/Shell/ShellViewModel.cs
#	src/AkkornStudio.UI/ViewModels/Shortcuts/KeyboardShortcutsViewModel.cs
#	src/AkkornStudio.UI/ViewModels/SidebarLeft/Models/NodeTypeItemViewModel.cs
#	src/AkkornStudio.UI/ViewModels/SidebarLeft/NodesListViewModel.cs
#	src/AkkornStudio.UI/ViewModels/SidebarLeft/SchemaViewModel.cs
#	src/AkkornStudio.UI/ViewModels/SqlEditor/Reports/SqlEditorReportExportDialogViewModel.cs
#	src/AkkornStudio.UI/ViewModels/SqlEditor/SqlEditorCompletionTelemetry.cs
#	src/AkkornStudio.UI/ViewModels/SqlEditor/SqlEditorCompletionTelemetryTracker.cs
#	src/AkkornStudio.UI/ViewModels/SqlEditor/SqlEditorMessageEntry.cs
#	src/AkkornStudio.UI/ViewModels/SqlEditor/SqlEditorOutputPane.cs
#	src/AkkornStudio.UI/ViewModels/SqlEditor/SqlEditorTabManagerViewModel.cs
#	src/AkkornStudio.UI/ViewModels/SqlEditor/SqlEditorTabState.cs
#	src/AkkornStudio.UI/ViewModels/Start/StartMenuViewModel.cs
#	src/AkkornStudio.UI/ViewModels/UndoRedo/Commands/AutoLayoutCommand.cs
#	src/AkkornStudio.UI/Views/Shell/MainWindow.ModeAndDdl.cs
#	src/AkkornStudio.UI/Views/Shell/MainWindow.Settings.cs
#	src/AkkornStudio.UI/Views/Shell/MainWindow.axaml
#	src/AkkornStudio.UI/Views/Shell/MainWindow.axaml.cs
#	src/AkkornStudio/Ddl/DdlGraphCompiler.cs
#	src/AkkornStudio/Ddl/IDdlExpression.cs
#	src/AkkornStudio/Expressions/ISqlExpression.cs
#	src/AkkornStudio/Nodes/Compilers/AggregateCompiler.cs
#	src/AkkornStudio/Nodes/Compilers/DataSourceCompiler.cs
#	src/AkkornStudio/Nodes/Compilers/OutputCompiler.cs
#	src/AkkornStudio/Nodes/Definitions/AggregateDefinitions.cs
#	src/AkkornStudio/Nodes/ISqlExpression.cs
#	src/AkkornStudio/Nodes/LogicalPlan/LogicalPlanner.cs
#	src/AkkornStudio/Nodes/NodeDefinition.cs
#	src/AkkornStudio/Nodes/NodeGraphCompiler.cs
#	src/AkkornStudio/Nodes/NodeTagCatalog.cs
#	src/AkkornStudio/Nodes/NodeTaxonomy.cs
#	src/AkkornStudio/Nodes/PinTypes/PinTypeRegistry.cs
#	src/AkkornStudio/QueryEngine/QueryGeneratorService.cs
#	src/DBWeaver.UI/App.axaml
#	src/DBWeaver.UI/Controls/Shell/DiagramDocumentPageControl.axaml.cs
#	src/DBWeaver.UI/Controls/Shell/OutputPreviewModalControl.axaml.cs
#	src/DBWeaver.UI/Controls/SqlEditor/MutationConfirmDialog.axaml
#	src/DBWeaver.UI/Controls/SqlEditor/SqlEditorControl.axaml
#	src/DBWeaver.UI/Controls/SqlEditor/SqlEditorControl.axaml.cs
#	src/DBWeaver.UI/Controls/SqlEditor/SqlEditorResultPanel.axaml
#	src/DBWeaver.UI/Controls/SqlEditor/SqlEditorResultPanel.axaml.cs
#	src/DBWeaver.UI/Controls/SqlEditor/SqlEditorTabBar.axaml.cs
#	src/DBWeaver.UI/Serialization/Canvas/CanvasLoadResult.cs
#	src/DBWeaver.UI/Services/CommandPalette/FuzzyScorer.cs
#	src/DBWeaver.UI/Services/QueryPreview/Validation/SubqueryValidator.cs
#	src/DBWeaver.UI/Services/Settings/AppSettingsStore.cs
#	src/DBWeaver.UI/Services/SqlEditor/Completion/SqlCompletionProvider.cs
#	src/DBWeaver.UI/Services/SqlEditor/Completion/SqlEditorCompletionData.cs
#	src/DBWeaver.UI/Services/SqlImport/Contracts/ISqlImportExecutionService.cs
#	src/DBWeaver.UI/Services/SqlImport/Execution/Applying/SqlImportHavingClauseApplier.cs
#	src/DBWeaver.UI/Services/SqlImport/Execution/Applying/SqlImportWhereClauseApplier.cs
#	src/DBWeaver.UI/Services/SqlImport/Execution/SqlImportExecutionService.cs
#	src/DBWeaver.UI/Services/SqlImport/SqlImportFeatureFlags.cs
#	src/DBWeaver.UI/ViewModels/Canvas/SearchMenuViewModel.cs
#	src/DBWeaver.UI/ViewModels/Shell/OutputPreviewModalViewModel.cs
#	src/DBWeaver.UI/ViewModels/SqlEditor/SqlEditorSchemaColumnItem.cs
#	src/DBWeaver.UI/ViewModels/SqlEditor/SqlEditorSchemaTableItem.cs
#	src/DBWeaver.UI/ViewModels/SqlEditor/SqlEditorViewModel.cs
#	tests/AkkornStudio.Tests/Integration/SqlImportBasicRegressionIntegrationTests.cs
#	tests/AkkornStudio.Tests/Integration/SqlImportPartialFallbackIntegrationTests.cs
#	tests/AkkornStudio.Tests/Integration/SqlImportRoundTripTests.cs
#	tests/AkkornStudio.Tests/Integration/SqlImportWhereLogicalConditionsIntegrationTests.cs
#	tests/AkkornStudio.Tests/Integration/SqlImportWiringAssertions.cs
#	tests/AkkornStudio.Tests/Integration/TemplateThreeTableJoinEndToEndIntegrationTests.cs
#	tests/AkkornStudio.Tests/Unit/Controls/AppCompletionTemplateRegressionTests.cs
#	tests/AkkornStudio.Tests/Unit/Controls/ConnectionTabControlTemplateRegressionTests.cs
#	tests/AkkornStudio.Tests/Unit/Controls/DatabaseConnectionCardTemplateRegressionTests.cs
#	tests/AkkornStudio.Tests/Unit/Controls/ExplainPlanOverlaySqlPreviewRegressionTests.cs
#	tests/AkkornStudio.Tests/Unit/Controls/ListRenderingVirtualizationRegressionTests.cs
#	tests/AkkornStudio.Tests/Unit/Controls/Shell/OutputPreviewModalControlCodeBehindRegressionTests.cs
#	tests/AkkornStudio.Tests/Unit/Controls/Shell/OutputPreviewModalControlTemplateRegressionTests.cs
#	tests/AkkornStudio.Tests/Unit/Controls/SidebarControlTemplateRegressionTests.cs
#	tests/AkkornStudio.Tests/Unit/Controls/SqlEditorControlTemplateRegressionTests.cs
#	tests/AkkornStudio.Tests/Unit/Controls/SqlEditorLeftSidebarControlTemplateRegressionTests.cs
#	tests/AkkornStudio.Tests/Unit/Controls/SqlEditorResultCellContentFormatterTests.cs
#	tests/AkkornStudio.Tests/Unit/Controls/SqlEditorRightSidebarControlTemplateRegressionTests.cs
#	tests/AkkornStudio.Tests/Unit/Controls/SqlEditorTabBarTemplateRegressionTests.cs
#	tests/AkkornStudio.Tests/Unit/Nodes/NodeEmissionTests.cs
#	tests/AkkornStudio.Tests/Unit/Nodes/PinTypeRegistryTests.cs
#	tests/AkkornStudio.Tests/Unit/Nodes/Pins/NodeGraphCompilerGraphFirstContractTests.cs
#	tests/AkkornStudio.Tests/Unit/Serialization/CanvasSerializerViewSubgraphPersistenceTests.cs
#	tests/AkkornStudio.Tests/Unit/Services/AppSettingsStoreTests.cs
#	tests/AkkornStudio.Tests/Unit/Services/CommandPaletteFactoryNewCanvasTests.cs
#	tests/AkkornStudio.Tests/Unit/Services/Ddl/DdlSchemaImporterTests.cs
#	tests/AkkornStudio.Tests/Unit/Services/LocalizationSensitiveCollection.cs
#	tests/AkkornStudio.Tests/Unit/Services/Search/TextSearchServiceTests.cs
#	tests/AkkornStudio.Tests/Unit/Services/SqlEditor/CompletionRankingEngineTests.cs
#	tests/AkkornStudio.Tests/Unit/Services/SqlEditor/CompletionUsageStatsTests.cs
#	tests/AkkornStudio.Tests/Unit/Services/SqlEditor/FuzzyScorerTests.cs
#	tests/AkkornStudio.Tests/Unit/Services/SqlEditor/SqlCompletionWorkerTests.cs
#	tests/AkkornStudio.Tests/Unit/Services/SqlEditor/SqlContextDetectorTests.cs
#	tests/AkkornStudio.Tests/Unit/Services/SqlEditor/SqlEditorCompletionControllerTests.cs
#	tests/AkkornStudio.Tests/Unit/Services/SqlEditor/SqlEditorCompletionDataTests.cs
#	tests/AkkornStudio.Tests/Unit/Services/SqlEditor/SqlEditorCompletionLoadingDataTests.cs
#	tests/AkkornStudio.Tests/Unit/Services/SqlEditor/SqlEditorExecutionControllerTests.cs
#	tests/AkkornStudio.Tests/Unit/Services/SqlEditor/SqlEditorReportExportServiceTests.cs
#	tests/AkkornStudio.Tests/Unit/Services/SqlEditor/SqlEditorSnippetTemplateParserTests.cs
#	tests/AkkornStudio.Tests/Unit/Services/SqlEditor/SqlHoverDocumentationServiceTests.cs
#	tests/AkkornStudio.Tests/Unit/Services/SqlEditor/SqlInlineUpdateStatementBuilderTests.cs
#	tests/AkkornStudio.Tests/Unit/Services/SqlEditor/SqlResultEligibilityDetectorTests.cs
#	tests/AkkornStudio.Tests/Unit/Services/SqlEditor/SqlSignatureHelpServiceTests.cs
#	tests/AkkornStudio.Tests/Unit/Services/SqlEditor/SqlStatementExtractorTests.cs
#	tests/AkkornStudio.Tests/Unit/Services/SqlEditor/SqlSymbolTableBuilderTests.cs
#	tests/AkkornStudio.Tests/Unit/Services/SqlEditor/SqlTokenizerTests.cs
#	tests/AkkornStudio.Tests/Unit/Services/SqlImport/Execution/SqlImportExecutionServiceOutcomeTests.cs
#	tests/AkkornStudio.Tests/Unit/Services/SqlImport/SqlImportAstToIrMapperTests.cs
#	tests/AkkornStudio.Tests/Unit/Services/SqlImport/SqlImportFeatureFlagsTests.cs
#	tests/AkkornStudio.Tests/Unit/ViewModels/Canvas/CanvasViewModelPrimaryFromSourceIndicatorTests.cs
#	tests/AkkornStudio.Tests/Unit/ViewModels/Canvas/QueryDomainStrategyTests.cs
#	tests/AkkornStudio.Tests/Unit/ViewModels/Canvas/SqlImporterFocusReportItemTests.cs
#	tests/AkkornStudio.Tests/Unit/ViewModels/Canvas/SqlImporterReportNotesTests.cs
#	tests/AkkornStudio.Tests/Unit/ViewModels/CanvasSubEditorSoftLockTests.cs
#	tests/AkkornStudio.Tests/Unit/ViewModels/ConnectionCatalogCapabilityProviderTests.cs
#	tests/AkkornStudio.Tests/Unit/ViewModels/Ddl/SchemaAnalysisPanelViewModelTests.cs
#	tests/AkkornStudio.Tests/Unit/ViewModels/PropertyPanel/ParameterRowViewModelSuggestedValuesTests.cs
#	tests/AkkornStudio.Tests/Unit/ViewModels/Shell/ShellExtractedPanelsTests.cs
#	tests/AkkornStudio.Tests/Unit/ViewModels/Shell/ShellWorkspaceDocumentRoutingTests.cs
#	tests/AkkornStudio.Tests/Unit/ViewModels/ShellViewModelDdlModeTests.cs
#	tests/AkkornStudio.Tests/Unit/ViewModels/ShellViewModelTests.cs
#	tests/AkkornStudio.Tests/Unit/ViewModels/SidebarLeft/NodeTypeItemViewModelTooltipTests.cs
#	tests/AkkornStudio.Tests/Unit/ViewModels/SidebarLeft/NodesListViewModelTests.cs
#	tests/AkkornStudio.Tests/Unit/ViewModels/SidebarLeft/SchemaViewModelSidebarFlowTests.cs
#	tests/AkkornStudio.Tests/Unit/ViewModels/SqlEditor/SqlEditorViewModelTests.cs
#	tests/AkkornStudio.Tests/Unit/ViewModels/ViewSubcanvasEditorTests.cs
#	tests/AkkornStudio.Tests/Unit/Views/MainWindowModeSwitchTemplateRegressionTests.cs
#	tests/VisualSqlArchitect.Tests/Unit/Controls/SqlEditorResultPanelTemplateRegressionTests.cs
#	tests/VisualSqlArchitect.Tests/Unit/Nodes/Pins/ReportNodeGraphContractTests.cs
#	tests/VisualSqlArchitect.Tests/Unit/Serialization/CanvasSerializerDocumentWorkspaceSchemaTests.cs
#	tests/VisualSqlArchitect.Tests/Unit/Services/LocalizationServiceTests.cs
#	tests/VisualSqlArchitect.Tests/Unit/Services/SqlEditor/SqlCompletionProviderTests.cs
#	tests/VisualSqlArchitect.Tests/Unit/ViewModels/LiveDdlBar/LiveDdlBarViewModelTests.cs
#	tests/VisualSqlArchitect.Tests/Unit/ViewModels/QueryPreview/QueryCompilationSourceResolverTests.cs
#	tests/VisualSqlArchitect.Tests/Unit/ViewModels/QueryPreview/QueryGraphBuilderReportOutputTests.cs
#	tests/VisualSqlArchitect.Tests/Unit/ViewModels/Shell/OutputPreviewModalViewModelTests.cs

Co-authored-by: TheyCallMeErick <70616235+TheyCallMeErick@users.noreply.github.com>
Copy link
Copy Markdown

Copilot AI commented Apr 16, 2026

@copilot resolve the merge conflicts in this pull request

Resolved. The merge conflicts between wip and origin/main have been fixed in commit 9c98654.

The main branch had made changes to files still using the old DBWeaver/VisualSqlArchitect naming, while wip had renamed everything to AkkornStudio. The resolution:

  • Kept all wip (HEAD) versions for content conflicts, preserving the correct AkkornStudio naming throughout
  • Removed old-path files (src/DBWeaver.UI/, src/DBWeaver/, tests/VisualSqlArchitect.Tests/) that main had modified/added but wip had already renamed
  • Incorporated the new TextSearchServiceTests.cs from main with updated AkkornStudio namespaces

@TheyCallMeErick TheyCallMeErick merged commit fd3d8cf into main Apr 16, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants