Changeset 541 for trunk/sources/HeuristicLab.CEDMA.DB

Timestamp:

09/04/08 18:39:11 (16 years ago)

Author:

gkronber

Message:

fixed a bug in the method to query items and added two columns (id and creation date) to the statement table. (ticket #261 (Items are stored multiple times in the result entries in the CEDMA DB))

File:

• trunk/sources/HeuristicLab.CEDMA.DB/Database.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.CEDMA.DB/Database.cs

@@ -75 +75 @@
             }
             using(DbCommand cmd = cnn.CreateCommand()) {
-              cmd.CommandText = "CREATE TABLE Statement (subject GUID, predicate GUID, property GUID)";
+              cmd.CommandText = "CREATE TABLE Statement (id integer primary key autoincrement, subject GUID, predicate GUID, property GUID, CreationTime DateTime)";
               cmd.Transaction = t;
               cmd.ExecuteNonQuery();
@@ -682 +682 @@
             DbParameter predParam = c.CreateParameter();
             predParam.ParameterName = "@Predicate";
-            predParam.Value = predicate;
+            predParam.Value = predicate.ToString();
             c.Parameters.Add(predParam);
             DbParameter propertyParam = c.CreateParameter();
             propertyParam.ParameterName = "@Property";
-            propertyParam.Value = property;
+            propertyParam.Value = property.ToString();
             c.Parameters.Add(propertyParam);
             using(DbDataReader r = c.ExecuteReader()) {
-              r.Read();
-              ItemEntry item = new ItemEntry();
-              item.Guid = r.GetGuid(0);
-              item.RawData = (byte[])r.GetValue(1);
-              items.Add(item);
+              while(r.Read()) {
+                ItemEntry item = new ItemEntry();
+                item.Guid = r.GetGuid(0);
+                item.RawData = (byte[])r.GetValue(1);
+                items.Add(item);
+              }
             }
           }
@@ -737 +738 @@
             using(SQLiteCommand c = cnn.CreateCommand()) {
               c.Transaction = t;
-              c.CommandText = "insert into Statement (Subject, Predicate, Property) values (@Subject, @Predicate, @Property)";
+              c.CommandText = "insert into Statement (Subject, Predicate, Property, CreationTime) values (@Subject, @Predicate, @Property, @CreationTime)";
               DbParameter subjectParam = c.CreateParameter();
               subjectParam.ParameterName = "@Subject";
@@ -750 +751 @@
               propertyParam.Value = property.Guid.ToString();
               c.Parameters.Add(propertyParam);
+              DbParameter timeParam = c.CreateParameter();
+              timeParam.ParameterName = "@CreationTime";
+              timeParam.Value = DateTime.Now;
+              c.Parameters.Add(timeParam);
               c.ExecuteNonQuery();
             }