Skip to content
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

Add database merging feature #906

Draft
wants to merge 8 commits into
base: master
Choose a base branch
from
+940 −19
Draft

Add database merging feature #906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ac1c9db
add initial implementation of dbmerger
loukylor Aug 30, 2024
a79bac6
Merge branch 'vrcx-team:master' into db-merger
loukylor Aug 30, 2024
f33194d
add handling for when user feed tables overlap
loukylor Sep 6, 2024
e5f367c
fix sqlite dll path in dbmerger build
loukylor Sep 8, 2024
754ea3f
Merge branch 'vrcx-team:master' into db-merger
loukylor Sep 8, 2024
84f5088
fix accidentally inserting rows with nonunique pks
loukylor Sep 20, 2024
c7fbad3
fix merger not handling missing columns well
loukylor Sep 20, 2024
7f4c92a
fix sort not reassigning pks
loukylor Sep 20, 2024
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
10 changes: 10 additions & 0 deletions DBMerger/Config.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
namespace DBMerger
{
public class Config(string newDBPath, string oldDBPath, bool debug, bool importConfig)
{
public string NewDBPath { get; } = newDBPath;
public string OldDBPath { get; } = oldDBPath;
public bool Debug { get; } = debug;
public bool ImportConfig { get; } = importConfig;
}
}
50 changes: 50 additions & 0 deletions DBMerger/DBMerger.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net8-windows10.0.19041.0</TargetFrameworks>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<AssemblyTitle>DBMerger</AssemblyTitle>
<Product>DBMerger</Product>
<!-- Think anyone will notice? -->
<Copyright>vrcx-team, loukylor, pypy, natsumi</Copyright>
<!-- VS REALLY wants to build to AnyCPU, and refuses to just set the
build target to x64, so just hardcode it into the path since VRCX
doesn't build to any other platforms anyway. Even adding the
`PlatformTarget` tag does nothing. Adding the `Platforms` tag will
make VS to refuse to build the project outright -->
<OutputPath>..\bin\x64\$(Configuration)\</OutputPath>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<Title>DBMerger</Title>
<Description>DBMerger - Merges VRCX sqlite databases</Description>
<RepositoryUrl>https://github.com/vrcx-team/VRCX</RepositoryUrl>
<ResourceLanguages>en</ResourceLanguages>
<SatelliteResourceLanguages>en-US;en</SatelliteResourceLanguages>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
</PropertyGroup>

<PropertyGroup>
<ContentSQLiteInteropFiles>true</ContentSQLiteInteropFiles>
<CopySQLiteInteropFiles>false</CopySQLiteInteropFiles>
<CleanSQLiteInteropFiles>false</CleanSQLiteInteropFiles>
<CollectSQLiteInteropFiles>false</CollectSQLiteInteropFiles>
</PropertyGroup>

<!-- Funny feature, didn't know it exists. Very useful for this specific use
case -->
<ItemGroup>
<Compile Include="..\Dotnet\SQLite.cs" Link="SQLite.cs" />
</ItemGroup>

<ItemGroup>
<Content Include="..\libs\sqlite3.dll" Link="sqlite3.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>

<ItemGroup>
<PackageReference Include="NLog" Version="5.3.3" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
</ItemGroup>
</Project>
Loading