Slight code cleanups

mdesalvo · Dec 5, 2024 · a4ef38a · a4ef38a
1 parent e418e70
commit a4ef38a
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 23 deletions.
diff --git a/RDFSharp.Test/Query/Mirella/RDFQueryEngineTest.cs b/RDFSharp.Test/Query/Mirella/RDFQueryEngineTest.cs
@@ -52,7 +52,6 @@ public void ShouldCreateQueryEngine()
             Assert.IsNotNull(queryEngine);
             Assert.IsNotNull(queryEngine.PatternGroupMemberResultTables);
             Assert.IsNotNull(queryEngine.QueryMemberResultTables);
-            Assert.IsTrue(RDFQueryEngine.SystemString.Equals(typeof(string)));
         }
 
         [TestMethod]
@@ -5405,7 +5404,7 @@ public void ShouldAddDataColumn()
 
             Assert.IsTrue(table.Columns.Count == 1);
             Assert.IsTrue(string.Equals(table.Columns[0].ColumnName, "?COL"));
-            Assert.IsTrue(table.Columns[0].DataType.Equals(RDFQueryEngine.SystemString));
+            Assert.IsTrue(table.Columns[0].DataType.Equals(typeof(string)));
         }
 
         [TestMethod]

diff --git a/RDFSharp/Model/RDFGraph.cs b/RDFSharp/Model/RDFGraph.cs
@@ -607,9 +607,9 @@ public DataTable ToDataTable()
         {
             //Create the structure of the result datatable
             DataTable result = new DataTable(ToString());
-            result.Columns.Add("?SUBJECT", RDFQueryEngine.SystemString);
-            result.Columns.Add("?PREDICATE", RDFQueryEngine.SystemString);
-            result.Columns.Add("?OBJECT", RDFQueryEngine.SystemString);
+            result.Columns.Add("?SUBJECT", typeof(string));
+            result.Columns.Add("?PREDICATE", typeof(string));
+            result.Columns.Add("?OBJECT", typeof(string));
 
             //Iterate the triples of the graph to populate the result datatable
             result.BeginLoadData();

diff --git a/RDFSharp/Query/Mirella/RDFOperationEngine.cs b/RDFSharp/Query/Mirella/RDFOperationEngine.cs
@@ -408,10 +408,10 @@ private DataTable PopulateInsertOperationResults(List<RDFPattern> insertDataTemp
         {
             DataTable resultTable = new DataTable("INSERT_RESULTS");
             if (datasource.IsStore())
-                resultTable.Columns.Add("?CONTEXT", SystemString);
-            resultTable.Columns.Add("?SUBJECT", SystemString);
-            resultTable.Columns.Add("?PREDICATE", SystemString);
-            resultTable.Columns.Add("?OBJECT", SystemString);
+                resultTable.Columns.Add("?CONTEXT", typeof(string));
+            resultTable.Columns.Add("?SUBJECT", typeof(string));
+            resultTable.Columns.Add("?PREDICATE", typeof(string));
+            resultTable.Columns.Add("?OBJECT", typeof(string));
 
             Dictionary<string, string> bindings = new Dictionary<string, string>();
             insertDataTemplates.ForEach(insertTemplate =>
@@ -469,10 +469,10 @@ private DataTable PopulateDeleteOperationResults(List<RDFPattern> deleteDataTemp
         {
             DataTable resultTable = new DataTable("DELETE_RESULTS");
             if (datasource.IsStore())
-                resultTable.Columns.Add("?CONTEXT", SystemString);
-            resultTable.Columns.Add("?SUBJECT", SystemString);
-            resultTable.Columns.Add("?PREDICATE", SystemString);
-            resultTable.Columns.Add("?OBJECT", SystemString);
+                resultTable.Columns.Add("?CONTEXT", typeof(string));
+            resultTable.Columns.Add("?SUBJECT", typeof(string));
+            resultTable.Columns.Add("?PREDICATE", typeof(string));
+            resultTable.Columns.Add("?OBJECT", typeof(string));
 
             Dictionary<string, string> bindings = new Dictionary<string, string>();
             deleteDataTemplates.ForEach(deleteTemplate =>

diff --git a/RDFSharp/Query/Mirella/RDFQueryEngine.cs b/RDFSharp/Query/Mirella/RDFQueryEngine.cs
@@ -45,11 +45,6 @@ internal class RDFQueryEngine
         /// </summary>
         internal Dictionary<long, DataTable> QueryMemberResultTables { get; set; }
 
-        /// <summary>
-        /// Default column type used for Mirella tables
-        /// </summary>
-        internal static readonly Type SystemString = typeof(string);
-
         /// <summary>
         /// Attribute denoting an optional pattern/patternGroup/query
         /// </summary>
@@ -1405,7 +1400,7 @@ internal static void AddColumn(DataTable table, string columnName)
         {
             string colName = columnName.Trim().ToUpperInvariant();
             if (!table.Columns.Contains(colName))
-                table.Columns.Add(colName, SystemString);
+                table.Columns.Add(colName, typeof(string));
         }
 
         /// <summary>

diff --git a/RDFSharp/Store/RDFStore.cs b/RDFSharp/Store/RDFStore.cs
@@ -380,10 +380,10 @@ public DataTable ToDataTable()
         {
             //Create the structure of the result datatable
             DataTable result = new DataTable(ToString());
-            result.Columns.Add("?CONTEXT", RDFQueryEngine.SystemString);
-            result.Columns.Add("?SUBJECT", RDFQueryEngine.SystemString);
-            result.Columns.Add("?PREDICATE", RDFQueryEngine.SystemString);
-            result.Columns.Add("?OBJECT", RDFQueryEngine.SystemString);
+            result.Columns.Add("?CONTEXT", typeof(string));
+            result.Columns.Add("?SUBJECT", typeof(string));
+            result.Columns.Add("?PREDICATE", typeof(string));
+            result.Columns.Add("?OBJECT", typeof(string));
 
             //Iterate the quadruples of the store to populate the result datatable
             result.BeginLoadData();