Skip to content

Commit 0c24af3

Browse files
gfsgfs
authored
Minor cleanup in databasemanager.cs (#156)
1 parent d061d8c commit 0c24af3

File tree

1 file changed

+47
-46
lines changed

1 file changed

+47
-46
lines changed

‎Lib/Utils/DatabaseManager.cs‎

Lines changed: 47 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -73,74 +73,75 @@ public static void Setup()
7373
Connection = new SqliteConnection($"Filename=" + _SqliteFilename);
7474
Connection.Open();
7575

76-
var cmd = new SqliteCommand(SQL_CREATE_RUNS, DatabaseManager.Connection, DatabaseManager.Transaction);
77-
cmd.ExecuteNonQuery();
76+
using (var cmd = new SqliteCommand(SQL_CREATE_RUNS, DatabaseManager.Connection, DatabaseManager.Transaction))
77+
{
78+
cmd.ExecuteNonQuery();
79+
80+
cmd.CommandText = SQL_CREATE_FILE_MONITORED;
81+
cmd.ExecuteNonQuery();
7882

79-
cmd = new SqliteCommand(SQL_CREATE_FILE_MONITORED, DatabaseManager.Connection, DatabaseManager.Transaction);
80-
cmd.ExecuteNonQuery();
83+
cmd.CommandText = SQL_CREATE_FILE_SYSTEM_COLLECTION;
84+
cmd.ExecuteNonQuery();
8185

82-
cmd = new SqliteCommand(SQL_CREATE_FILE_SYSTEM_COLLECTION, DatabaseManager.Connection, DatabaseManager.Transaction);
83-
cmd.ExecuteNonQuery();
86+
cmd.CommandText = SQL_CREATE_OPEN_PORT_COLLECTION;
87+
cmd.ExecuteNonQuery();
8488

85-
cmd = new SqliteCommand(SQL_CREATE_OPEN_PORT_COLLECTION, DatabaseManager.Connection, DatabaseManager.Transaction);
86-
cmd.ExecuteNonQuery();
89+
cmd.CommandText = SQL_CREATE_SERVICE_COLLECTION;
90+
cmd.ExecuteNonQuery();
8791

88-
cmd = new SqliteCommand(SQL_CREATE_SERVICE_COLLECTION, DatabaseManager.Connection, DatabaseManager.Transaction);
89-
cmd.ExecuteNonQuery();
92+
cmd.CommandText = SQL_CREATE_USER_COLLECTION;
93+
cmd.ExecuteNonQuery();
9094

91-
cmd = new SqliteCommand(SQL_CREATE_USER_COLLECTION, DatabaseManager.Connection, DatabaseManager.Transaction);
92-
cmd.ExecuteNonQuery();
95+
cmd.CommandText = SQL_CREATE_REGISTRY_COLLECTION;
96+
cmd.ExecuteNonQuery();
9397

94-
cmd = new SqliteCommand(SQL_CREATE_REGISTRY_COLLECTION, DatabaseManager.Connection, DatabaseManager.Transaction);
95-
cmd.ExecuteNonQuery();
98+
cmd.CommandText = SQL_CREATE_CERTIFICATES_COLLECTION;
99+
cmd.ExecuteNonQuery();
96100

97-
cmd = new SqliteCommand(SQL_CREATE_CERTIFICATES_COLLECTION, DatabaseManager.Connection, DatabaseManager.Transaction);
98-
cmd.ExecuteNonQuery();
101+
cmd.CommandText = SQL_CREATE_COMPARE_RESULT_TABLE;
102+
cmd.ExecuteNonQuery();
99103

100-
cmd = new SqliteCommand(SQL_CREATE_COMPARE_RESULT_TABLE, DatabaseManager.Connection, DatabaseManager.Transaction);
101-
cmd.ExecuteNonQuery();
104+
cmd.CommandText = SQL_CREATE_ANALYZED_TABLE;
105+
cmd.ExecuteNonQuery();
102106

103-
cmd = new SqliteCommand(SQL_CREATE_ANALYZED_TABLE, DatabaseManager.Connection, DatabaseManager.Transaction);
104-
cmd.ExecuteNonQuery();
107+
cmd.CommandText = SQL_CREATE_PERSISTED_SETTINGS;
108+
cmd.ExecuteNonQuery();
105109

106-
cmd = new SqliteCommand(SQL_CREATE_PERSISTED_SETTINGS, DatabaseManager.Connection, DatabaseManager.Transaction);
107-
cmd.ExecuteNonQuery();
110+
cmd.CommandText = SQL_CREATE_DEFAULT_SETTINGS;
111+
cmd.Parameters.AddWithValue("@schema_version", SCHEMA_VERSION);
112+
cmd.ExecuteNonQuery();
108113

109-
cmd = new SqliteCommand(SQL_CREATE_DEFAULT_SETTINGS, DatabaseManager.Connection, DatabaseManager.Transaction);
110-
cmd.Parameters.AddWithValue("@schema_version", SCHEMA_VERSION);
111-
cmd.ExecuteNonQuery();
114+
cmd.CommandText = SQL_CREATE_FILE_SYSTEM_INDEX;
115+
cmd.ExecuteNonQuery();
112116

113-
cmd = new SqliteCommand(SQL_CREATE_FILE_SYSTEM_INDEX, DatabaseManager.Connection, DatabaseManager.Transaction);
114-
cmd.ExecuteNonQuery();
117+
cmd.CommandText = SQL_CREATE_REGISTRY_KEY_INDEX;
118+
cmd.ExecuteNonQuery();
115119

116-
cmd = new SqliteCommand(SQL_CREATE_REGISTRY_KEY_INDEX, DatabaseManager.Connection, DatabaseManager.Transaction);
117-
cmd.ExecuteNonQuery();
120+
cmd.CommandText = SQL_CREATE_REGISTRY_ROW_KEY_INDEX;
121+
cmd.ExecuteNonQuery();
118122

119-
cmd = new SqliteCommand(SQL_CREATE_REGISTRY_ROW_KEY_INDEX, DatabaseManager.Connection, DatabaseManager.Transaction);
120-
cmd.ExecuteNonQuery();
123+
cmd.CommandText = SQL_CREATE_REGISTRY_RUN_ID_INDEX;
124+
cmd.ExecuteNonQuery();
121125

122-
cmd = new SqliteCommand(SQL_CREATE_REGISTRY_RUN_ID_INDEX, DatabaseManager.Connection, DatabaseManager.Transaction);
123-
cmd.ExecuteNonQuery();
124-
125-
cmd = new SqliteCommand(SQL_CREATE_RESULT_CHANGE_TYPE_INDEX, DatabaseManager.Connection, DatabaseManager.Transaction);
126-
cmd.ExecuteNonQuery();
126+
cmd.CommandText = SQL_CREATE_RESULT_CHANGE_TYPE_INDEX;
127+
cmd.ExecuteNonQuery();
127128

128-
cmd = new SqliteCommand(SQL_CREATE_RESULT_BASE_RUN_ID_INDEX, DatabaseManager.Connection, DatabaseManager.Transaction);
129-
cmd.ExecuteNonQuery();
129+
cmd.CommandText = SQL_CREATE_RESULT_BASE_RUN_ID_INDEX;
130+
cmd.ExecuteNonQuery();
130131

131-
cmd = new SqliteCommand(SQL_CREATE_RESULT_COMPARE_RUN_ID_INDEX, DatabaseManager.Connection, DatabaseManager.Transaction);
132-
cmd.ExecuteNonQuery();
132+
cmd.CommandText = SQL_CREATE_RESULT_COMPARE_RUN_ID_INDEX;
133+
cmd.ExecuteNonQuery();
133134

134-
cmd = new SqliteCommand(SQL_CREATE_RESULT_BASE_ROW_KEY_INDEX, DatabaseManager.Connection, DatabaseManager.Transaction);
135-
cmd.ExecuteNonQuery();
135+
cmd.CommandText = SQL_CREATE_RESULT_BASE_ROW_KEY_INDEX;
136+
cmd.ExecuteNonQuery();
137+
138+
cmd.CommandText = SQL_CREATE_RESULT_DATA_TYPE_INDEX;
139+
cmd.ExecuteNonQuery();
140+
}
136141

137-
cmd = new SqliteCommand(SQL_CREATE_RESULT_DATA_TYPE_INDEX, DatabaseManager.Connection, DatabaseManager.Transaction);
138-
cmd.ExecuteNonQuery();
139-
140142
DatabaseManager.Transaction.Commit();
141143
_transaction = null;
142144
Log.Debug("Done with database setup");
143-
cmd.Dispose();
144145
}
145146
}
146147

0 commit comments

Comments
 (0)