Skip to content

Claude/fix sqlite warning zwa8 n #33

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
NerdsCorp merged 2 commits into from
Dec 28, 2025
Merged

Claude/fix sqlite warning zwa8 n #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3797644
fix: Update SQLite connection strings to Microsoft.Data.Sqlite syntax
claude Dec 28, 2025
3aef0ab
fix: Replace Microsoft.Data.Sqlite with System.Data.SQLite
claude Dec 28, 2025
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
46 changes: 23 additions & 23 deletions Intersect.Editor/Core/Database.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Intersect.Configuration;
using Intersect.Editor.Configuration;
using Microsoft.Data.Sqlite;
using System.Data.SQLite;

namespace Intersect.Editor.Core;

Expand Down Expand Up @@ -41,7 +41,7 @@ public static partial class Database

public static int GridLightColor = System.Drawing.Color.White.ToArgb();

private static SqliteConnection sDbConnection;
private static SQLiteConnection sDbConnection;

//Options File
public static void LoadOptions()
Expand All @@ -64,15 +64,15 @@ public static void InitMapCache()
Directory.CreateDirectory("resources");
}

// Note: Microsoft.Data.Sqlite handles thread safety internally, no need to set serialized mode
// Note: System.Data.SQLite handles thread safety internally, no need to set serialized mode
if (!File.Exists(DB_FILENAME))
{
CreateDatabase();
}

if (sDbConnection == null)
{
sDbConnection = new SqliteConnection("Data Source=" + DB_FILENAME + ",Version=3");
sDbConnection = new SQLiteConnection("Data Source=" + DB_FILENAME + ";Version=3");
sDbConnection.Open();
}

Expand All @@ -86,7 +86,7 @@ public static void InitMapCache()

private static void CreateDatabase()
{
sDbConnection = new SqliteConnection("Data Source=" + DB_FILENAME + ",Version=3,New=True");
sDbConnection = new SQLiteConnection("Data Source=" + DB_FILENAME + ";Version=3");
sDbConnection.Open();
CreateOptionsTable();
CreateMapCacheTable();
Expand Down Expand Up @@ -138,20 +138,20 @@ public static void SaveOption(string name, string value)
OPTION_VALUE +
");";

using (var cmd = new SqliteCommand(query, sDbConnection))
using (var cmd = new SQLiteCommand(query, sDbConnection))
{
cmd.Parameters.Add(new SqliteParameter("@" + OPTION_NAME, name));
cmd.Parameters.Add(new SqliteParameter("@" + OPTION_VALUE, value));
cmd.Parameters.Add(new SQLiteParameter("@" + OPTION_NAME, name));
cmd.Parameters.Add(new SQLiteParameter("@" + OPTION_VALUE, value));
cmd.ExecuteNonQuery();
}
}

public static string GetOptionStr(string name)
{
var query = "SELECT * from " + OPTION_TABLE + " WHERE " + OPTION_NAME + "=@" + OPTION_NAME + ";";
using (var cmd = new SqliteCommand(query, sDbConnection))
using (var cmd = new SQLiteCommand(query, sDbConnection))
{
cmd.Parameters.Add(new SqliteParameter("@" + OPTION_NAME, name));
cmd.Parameters.Add(new SQLiteParameter("@" + OPTION_NAME, name));
var dataReader = cmd.ExecuteReader();
while (dataReader.Read())
{
Expand Down Expand Up @@ -281,12 +281,12 @@ public static byte[] LoadMapCacheRaw(Guid id, int revision)
query += " AND " + MAP_CACHE_REVISION + "=@" + MAP_CACHE_REVISION;
}

using (var cmd = new SqliteCommand(query, sDbConnection))
using (var cmd = new SQLiteCommand(query, sDbConnection))
{
cmd.Parameters.Add(new SqliteParameter("@" + MAP_CACHE_ID, id.ToString()));
cmd.Parameters.Add(new SQLiteParameter("@" + MAP_CACHE_ID, id.ToString()));
if (revision > -1)
{
cmd.Parameters.Add(new SqliteParameter("@" + MAP_CACHE_REVISION, revision.ToString()));
cmd.Parameters.Add(new SQLiteParameter("@" + MAP_CACHE_REVISION, revision.ToString()));
}

var dataReader = cmd.ExecuteReader();
Expand Down Expand Up @@ -324,17 +324,17 @@ public static void SaveMapCache(Guid id, int revision, byte[] data)
MAP_CACHE_DATA +
");";

using (var cmd = new SqliteCommand(query, sDbConnection))
using (var cmd = new SQLiteCommand(query, sDbConnection))
{
cmd.Parameters.Add(new SqliteParameter("@" + MAP_CACHE_ID, id.ToString()));
cmd.Parameters.Add(new SqliteParameter("@" + MAP_CACHE_REVISION, revision));
cmd.Parameters.Add(new SQLiteParameter("@" + MAP_CACHE_ID, id.ToString()));
cmd.Parameters.Add(new SQLiteParameter("@" + MAP_CACHE_REVISION, revision));
if (data != null)
{
cmd.Parameters.Add(new SqliteParameter("@" + MAP_CACHE_DATA, data));
cmd.Parameters.Add(new SQLiteParameter("@" + MAP_CACHE_DATA, data));
}
else
{
cmd.Parameters.Add(new SqliteParameter("@" + MAP_CACHE_DATA, null));
cmd.Parameters.Add(new SQLiteParameter("@" + MAP_CACHE_DATA, null));
}

cmd.ExecuteNonQuery();
Expand All @@ -354,20 +354,20 @@ public static void ClearMapCache(Guid id)
" = @" +
MAP_CACHE_ID;

using (var cmd = new SqliteCommand(query, sDbConnection))
using (var cmd = new SQLiteCommand(query, sDbConnection))
{
cmd.Parameters.Add(new SqliteParameter("@" + MAP_CACHE_ID, id.ToString()));
cmd.Parameters.Add(new SqliteParameter("@" + MAP_CACHE_DATA, null));
cmd.Parameters.Add(new SQLiteParameter("@" + MAP_CACHE_ID, id.ToString()));
cmd.Parameters.Add(new SQLiteParameter("@" + MAP_CACHE_DATA, null));
cmd.ExecuteNonQuery();
}
}

public static void ClearAllMapCache()
{
var query = "UPDATE " + MAP_CACHE_TABLE + " SET " + MAP_CACHE_DATA + " = @" + MAP_CACHE_DATA;
using (var cmd = new SqliteCommand(query, sDbConnection))
using (var cmd = new SQLiteCommand(query, sDbConnection))
{
cmd.Parameters.Add(new SqliteParameter("@" + MAP_CACHE_DATA, null));
cmd.Parameters.Add(new SQLiteParameter("@" + MAP_CACHE_DATA, null));
cmd.ExecuteNonQuery();
}
}
Expand Down
2 changes: 1 addition & 1 deletion Intersect.Editor/Intersect.Editor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.0" />
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.119" />
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.1.303" />
<PackageReference Include="System.Collections.Concurrent" Version="4.3.0" />
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
Expand Down
Loading