Consolodate DB inits

This commit is contained in:
Matt Nadareski
2016-04-06 00:26:13 -07:00
parent ad8d026134
commit 97ee13681b
2 changed files with 41 additions and 60 deletions

View File

@@ -6,6 +6,8 @@ using System.Linq;
using System.Security.Cryptography; using System.Security.Cryptography;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using SabreTools.Helper;
namespace SabreTools namespace SabreTools
{ {
/// <summary> /// <summary>
@@ -40,7 +42,7 @@ Options:
types.Add("snes", 512); types.Add("snes", 512);
// Ensure that the header database is set up // Ensure that the header database is set up
EnsureDatabase(_dbName, _connectionString); DBTools.EnsureDatabase(_dbName, _connectionString);
if (args.Length == 0 || args.Length > 2) if (args.Length == 0 || args.Length > 2)
{ {
@@ -275,45 +277,5 @@ Options:
} }
} }
} }
/// <summary>
/// Ensure that the databse exists and has the proper schema
/// </summary>
/// <param name="db">Name of the databse</param>
/// <param name="connectionString">Connection string for SQLite</param>
public static void EnsureDatabase(string db, string connectionString)
{
// Make sure the file exists
if (!File.Exists(db))
{
SQLiteConnection.CreateFile(db);
}
// Connect to the file
SQLiteConnection dbc = new SQLiteConnection(connectionString);
dbc.Open();
try
{
// Make sure the database has the correct schema
string query = @"
CREATE TABLE IF NOT EXISTS data (
'sha1' TEXT NOT NULL,
'header' TEXT NOT NULL,
'type' TEXT NOT NULL,
PRIMARY KEY (sha1, header, type)
)";
SQLiteCommand slc = new SQLiteCommand(query, dbc);
slc.ExecuteNonQuery();
}
catch (Exception ex)
{
Console.WriteLine(ex);
}
finally
{
// Close and return the database connection
dbc.Close();
}
}
} }
} }

View File

@@ -22,12 +22,18 @@ namespace SabreTools.Helper
SQLiteConnection.CreateFile(db); SQLiteConnection.CreateFile(db);
} }
//Get "type" from the filename
string type = Path.GetFileNameWithoutExtension(db);
// Connect to the file // Connect to the file
SQLiteConnection dbc = new SQLiteConnection(connectionString); SQLiteConnection dbc = new SQLiteConnection(connectionString);
dbc.Open(); dbc.Open();
// Make sure the database has the correct schema
try try
{ {
// Make sure the database has the correct schema if (type == "DATabase")
{
string query = @" string query = @"
CREATE TABLE IF NOT EXISTS checksums ( CREATE TABLE IF NOT EXISTS checksums (
'file' INTEGER NOT NULL, 'file' INTEGER NOT NULL,
@@ -88,6 +94,19 @@ CREATE TABLE IF NOT EXISTS systems (
slc = new SQLiteCommand(query, dbc); slc = new SQLiteCommand(query, dbc);
slc.ExecuteNonQuery(); slc.ExecuteNonQuery();
} }
else if (type == "Headerer")
{
string query = @"
CREATE TABLE IF NOT EXISTS data (
'sha1' TEXT NOT NULL,
'header' TEXT NOT NULL,
'type' TEXT NOT NULL,
PRIMARY KEY (sha1, header, type)
)";
SQLiteCommand slc = new SQLiteCommand(query, dbc);
slc.ExecuteNonQuery();
}
}
catch (Exception ex) catch (Exception ex)
{ {
Console.WriteLine(ex); Console.WriteLine(ex);