rlkollman/DbTools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed async methods (except when getting data) and versioned up NuGet

Browse Source
This commit is contained in:
Russ Kollmansberger
2025-09-06 11:28:14 -05:00
parent e25a6b166a
commit df79b32d45
3 changed files with 87 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
DbTools.nuspec
View File

@@ -2,15 +2,14 @@
<package > <package >
<metadata> <metadata>
<id>DbTools</id> <id>DbTools</id>
<version>1.0.1.0</version> <version>1.0.2.0</version>
<title>DbTools</title> <title>DbTools</title>
<authors>Russ Kollmansberger</authors> <authors>Russ Kollmansberger</authors>
<requireLicenseAcceptance>false</requireLicenseAcceptance> <requireLicenseAcceptance>false</requireLicenseAcceptance>
<license type="expression">MIT</license> <license type="expression">MIT</license>
<!-- <icon>icon.png</icon> --> <!-- <icon>icon.png</icon> -->
<projectUrl>http://project_url_here_or_delete_this_line/</projectUrl>
<description>A library to sync two database structures and apply migrations.</description> <description>A library to sync two database structures and apply migrations.</description>
<releaseNotes>Added new functions to SqlBuilder to generate scripts on database differences.</releaseNotes> <releaseNotes>Removed async methods, except when capturing data.</releaseNotes>
<copyright>$copyright$</copyright> <copyright>$copyright$</copyright>
<tags>Tag1 Tag2</tags> <tags>Tag1 Tag2</tags>
</metadata> </metadata>

17
DbToolsTester/Forms/MainForm.cs
View File

@@ -57,13 +57,22 @@ namespace DbToolsTester.Forms {
private async void ToolbarItemClicked(object sender, DevExpress.XtraBars.ItemClickEventArgs e) { private async void ToolbarItemClicked(object sender, DevExpress.XtraBars.ItemClickEventArgs e) {
if (e.Item.Equals(bbiDelta)) { if (e.Item.Equals(bbiDelta)) {
deltaSql.Clear();
SQLiteConnection db1 = new SQLiteConnection("Data Source=" + Database1File + ";Version=3;"); SQLiteConnection db1 = new SQLiteConnection("Data Source=" + Database1File + ";Version=3;");
SQLiteConnection db2 = new SQLiteConnection("Data Source=" + Database2File + ";Version=3;"); SQLiteConnection db2 = new SQLiteConnection("Data Source=" + Database2File + ";Version=3;");
Delta delta = new Delta(); SqlBuilder builder = new SqlBuilder();
deltaSql.Text = delta.BuildDelta(db1, db2, btsRemoveUnusedTables.Checked, btsRemoveUnusedColumns.Checked); string[] missingTables = builder.GetMissingTables(db1, db2);
db1Sql.Text = delta.Db1Sql; foreach (string table in missingTables) {
db2Sql.Text = delta.Db2Sql; string sql = await builder.GetTableCreateSqlAsync(db2, table);
deltaSql.AppendText(sql + "\r\n");
}
//Delta delta = new Delta();
//deltaSql.Text = delta.BuildDelta(db1, db2, btsRemoveUnusedTables.Checked, btsRemoveUnusedColumns.Checked);
//db1Sql.Text = delta.Db1Sql;
//db2Sql.Text = delta.Db2Sql;
} else if (e.Item.Equals(bbiApplyBoth)) { } else if (e.Item.Equals(bbiApplyBoth)) {
if (string.IsNullOrEmpty(deltaSql.Text)) { if (string.IsNullOrEmpty(deltaSql.Text)) {
MessageBox.Show("No delta SQL to apply.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); MessageBox.Show("No delta SQL to apply.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);

70
SqlBuilder.cs
View File

@@ -155,14 +155,14 @@ namespace DbTools {
sb.AppendLine("\t" + columns.Trim()); sb.AppendLine("\t" + columns.Trim());
sb.AppendLine(sql.Substring(startIndex + length) + ";"); sb.AppendLine(sql.Substring(startIndex + length) + ";");
string indexes = await GetIndexCreateSqlAsync(cn, tableName); string indexes = GetIndexCreateSql(cn, tableName);
if (!string.IsNullOrEmpty(indexes)) { if (!string.IsNullOrEmpty(indexes)) {
sb.AppendLine(); sb.AppendLine();
sb.AppendLine("-- INDEXES --"); sb.AppendLine("-- INDEXES --");
sb.AppendLine(indexes); sb.AppendLine(indexes);
} }
string triggers = await GetTriggerCreateSqlAsync(cn, tableName); string triggers = GetTriggerCreateSql(cn, tableName);
if (!string.IsNullOrEmpty(triggers)) { if (!string.IsNullOrEmpty(triggers)) {
sb.AppendLine(); sb.AppendLine();
sb.AppendLine("-- TRIGGERS --"); sb.AppendLine("-- TRIGGERS --");
@@ -183,6 +183,60 @@ namespace DbTools {
} }
} }
public string GetTableCreateSql(IDbConnection cn, string tableName) {
if (cn == null) {
throw new ArgumentNullException("cn");
}
if (string.IsNullOrEmpty(tableName)) {
throw new ArgumentNullException("tableName");
}
if (cn.State != ConnectionState.Open) {
cn.Open();
}
using (IDbCommand cmd = cn.CreateCommand()) {
cmd.CommandText = $"select sql from sqlite_master where tbl_name='{tableName}' and type='table'";
using (IDataReader reader = cmd.ExecuteReader()) {
StringBuilder sb = new StringBuilder();
reader.Read();
string sql = reader.GetString(0);
Match m = Regex.Match(sql, "CREATE TABLE \\S+ \\((.*)\\)", RegexOptions.Singleline);
if (!m.Success) {
Trace.TraceWarning("Unable to match regex on table " + tableName);
return string.Empty;
}
sb.AppendLine("-- TABLE " + tableName + " --");
int startIndex = m.Groups[1].Index;
int length = m.Groups[1].Length;
string columns = Regex.Replace(m.Groups[1].Value, "\\s{2,}", " ");
columns = Regex.Replace(columns.Replace(", ", ",").Replace(",\n", ","), ",(?!\\d+\\))", ",\r\n\t");
sb.AppendLine(sql.Substring(0, startIndex));
sb.AppendLine("\t" + columns.Trim());
sb.AppendLine(sql.Substring(startIndex + length) + ";");
string indexes = GetIndexCreateSql(cn, tableName);
if (!string.IsNullOrEmpty(indexes)) {
sb.AppendLine();
sb.AppendLine("-- INDEXES --");
sb.AppendLine(indexes);
}
string triggers = GetTriggerCreateSql(cn, tableName);
if (!string.IsNullOrEmpty(triggers)) {
sb.AppendLine();
sb.AppendLine("-- TRIGGERS --");
sb.AppendLine(triggers);
}
sb.AppendLine("-- END TABLE " + tableName + " --");
return sb.ToString();
}
}
}
public string GetTableDropSql(IDbConnection cn, string tableName) { public string GetTableDropSql(IDbConnection cn, string tableName) {
if (cn == null) { if (cn == null) {
@@ -193,7 +247,7 @@ namespace DbTools {
} }
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
string[] indexes = GetIndexCreateSqlAsync(cn, tableName).Result.Split(new string[] { "\r\n", "\n" }, StringSplitOptions.RemoveEmptyEntries); string[] indexes = GetIndexCreateSql(cn, tableName).Split(new string[] { "\r\n", "\n" }, StringSplitOptions.RemoveEmptyEntries);
foreach (string index in indexes) { foreach (string index in indexes) {
Match m = Regex.Match(index, "CREATE INDEX (\\S+) ON .*", RegexOptions.Singleline); Match m = Regex.Match(index, "CREATE INDEX (\\S+) ON .*", RegexOptions.Singleline);
if (m.Success) { if (m.Success) {
@@ -201,7 +255,7 @@ namespace DbTools {
} }
} }
string[] triggers = GetTriggerCreateSqlAsync(cn, tableName).Result.Split(new string[] { "\r\n", "\n" }, StringSplitOptions.RemoveEmptyEntries); string[] triggers = GetTriggerCreateSql(cn, tableName).Split(new string[] { "\r\n", "\n" }, StringSplitOptions.RemoveEmptyEntries);
foreach (string trigger in triggers) { foreach (string trigger in triggers) {
Match m = Regex.Match(trigger, "CREATE TRIGGER (\\S+) .*", RegexOptions.Singleline); Match m = Regex.Match(trigger, "CREATE TRIGGER (\\S+) .*", RegexOptions.Singleline);
if (m.Success) { if (m.Success) {
@@ -224,7 +278,7 @@ namespace DbTools {
/// <returns>A string containing the SQL statements for creating all indexes on the specified table, separated by /// <returns>A string containing the SQL statements for creating all indexes on the specified table, separated by
/// newlines. Returns an empty string if no indexes are found.</returns> /// newlines. Returns an empty string if no indexes are found.</returns>
/// <exception cref="ArgumentNullException">Thrown if <paramref name="cn"/> is null or if <paramref name="tableName"/> is null or empty.</exception> /// <exception cref="ArgumentNullException">Thrown if <paramref name="cn"/> is null or if <paramref name="tableName"/> is null or empty.</exception>
public async Task<string> GetIndexCreateSqlAsync(IDbConnection cn, string tableName) { public string GetIndexCreateSql(IDbConnection cn, string tableName) {
if (cn == null) { if (cn == null) {
throw new ArgumentNullException("cn"); throw new ArgumentNullException("cn");
} }
@@ -236,7 +290,6 @@ namespace DbTools {
} }
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
await Task.Run(() => {
using (IDbCommand cmd = cn.CreateCommand()) { using (IDbCommand cmd = cn.CreateCommand()) {
cmd.CommandText = $"SELECT sql FROM sqlite_master WHERE type='index' AND tbl_name='{tableName}' AND sql NOT NULL;"; cmd.CommandText = $"SELECT sql FROM sqlite_master WHERE type='index' AND tbl_name='{tableName}' AND sql NOT NULL;";
using (IDataReader reader = cmd.ExecuteReader()) { using (IDataReader reader = cmd.ExecuteReader()) {
@@ -245,7 +298,6 @@ namespace DbTools {
} }
} }
} }
});
return sb.ToString(); return sb.ToString();
} }
@@ -261,7 +313,7 @@ namespace DbTools {
/// <returns>A string containing the SQL definitions of all triggers for the specified table, separated by semicolons. /// <returns>A string containing the SQL definitions of all triggers for the specified table, separated by semicolons.
/// Returns an empty string if no triggers are found.</returns> /// Returns an empty string if no triggers are found.</returns>
/// <exception cref="ArgumentNullException">Thrown if <paramref name="cn"/> is null or if <paramref name="tableName"/> is null or empty.</exception> /// <exception cref="ArgumentNullException">Thrown if <paramref name="cn"/> is null or if <paramref name="tableName"/> is null or empty.</exception>
public async Task<string> GetTriggerCreateSqlAsync(IDbConnection cn, string tableName) { public string GetTriggerCreateSql(IDbConnection cn, string tableName) {
if (cn == null) { if (cn == null) {
throw new ArgumentNullException("cn"); throw new ArgumentNullException("cn");
} }
@@ -272,7 +324,6 @@ namespace DbTools {
cn.Open(); cn.Open();
} }
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
await Task.Run(() => {
using (IDbCommand cmd = cn.CreateCommand()) { using (IDbCommand cmd = cn.CreateCommand()) {
cmd.CommandText = $"SELECT sql FROM sqlite_master WHERE type='trigger' AND tbl_name='{tableName}' AND sql NOT NULL;"; cmd.CommandText = $"SELECT sql FROM sqlite_master WHERE type='trigger' AND tbl_name='{tableName}' AND sql NOT NULL;";
using (IDataReader reader = cmd.ExecuteReader()) { using (IDataReader reader = cmd.ExecuteReader()) {
@@ -281,7 +332,6 @@ namespace DbTools {
} }
} }
} }
});
return sb.ToString(); return sb.ToString();
} }