Changeset 1449 for trunk/sources/HeuristicLab.DataAccess.ADOHelper

Timestamp:

03/27/09 14:04:47 (16 years ago)

Author:

svonolfe

Message:

Refactored DAL (now using GUIDs as IDs instead of longs) (#527)

Location:

trunk/sources/HeuristicLab.DataAccess.ADOHelper

Files:

• CachedDataAdapter.cs (modified) (5 diffs)
• DataAdapterBase.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.DataAccess.ADOHelper/CachedDataAdapter.cs

@@ -145 +145 @@
     protected abstract bool PutInCache(ObjT obj);
 
-    protected abstract RowT FindCachedById(long id);
+    protected abstract RowT FindCachedById(Guid id);
 
     public void SyncWithDb() {
@@ -169 +169 @@
         cacheLock.EnterReadLock();
 
-        bool cached = FindCachedById((long)row[row.Table.PrimaryKey[0]]) != null;
+        bool cached = FindCachedById((Guid)row[row.Table.PrimaryKey[0]]) != null;
 
         cacheLock.ExitReadLock();
@@ -177 +177 @@
     }
 
-    protected override RowT GetRowById(long id) {
+    protected override RowT GetRowById(Guid id) {
       cacheLock.EnterReadLock();
 
@@ -227 +227 @@
       if (obj != null) {
         RowT row = null;
-        long locked = default(long);
-
-        if (obj.Id != default(long)) {
+        Guid locked = Guid.Empty;
+
+        if (obj.Id != Guid.Empty) {
           LockRow(obj.Id);
           locked = obj.Id;
 
           row = GetRowById(obj.Id);
+        } else {
+          obj.Id = Guid.NewGuid();
         }
 
@@ -241 +243 @@
           } else {
             row = InsertNewRow(obj);
+            UpdateRow(row);
           }
-
-          UpdateRow(row);
-          obj.Id = (long)row[row.Table.PrimaryKey[0]];
-        }
-
-        if (locked == default(long)) {
+        }
+
+        if (locked == Guid.Empty)
+        {
           LockRow(obj.Id);
           locked = obj.Id;

trunk/sources/HeuristicLab.DataAccess.ADOHelper/DataAdapterBase.cs

@@ -92 +92 @@
     protected abstract void UpdateRow(RowT row);
 
-    protected abstract IEnumerable<RowT> FindById(long id);
+    protected abstract IEnumerable<RowT> FindById(Guid id);
 
     protected abstract IEnumerable<RowT> FindAll();
@@ -154 +154 @@
     }
 
-    protected virtual RowT GetRowById(long id) {
+    protected virtual RowT GetRowById(Guid id) {
       return FindSingleRow(
         delegate() {
@@ -164 +164 @@
       if (obj != null) {
         RowT row = null;
-        long locked = default(long);
-        
-        if (obj.Id != default(long)) {
-           LockRow(obj.Id);
-           locked = obj.Id;
-
-           row = GetRowById(obj.Id);
-        }          
+        Guid locked = Guid.Empty;
+
+        if (obj.Id != Guid.Empty) {
+          LockRow(obj.Id);
+          locked = obj.Id;
+
+          row = GetRowById(obj.Id);
+        } else {
+          obj.Id = Guid.NewGuid();
+        }
 
         if (row == null) {
           row = InsertNewRow(obj);
           UpdateRow(row);
-
-          obj.Id = (long)row[row.Table.PrimaryKey[0]];
-        }
-
-        if (locked == default(long)) {
+        }
+
+        if (locked == Guid.Empty) {
           LockRow(obj.Id);
           locked = obj.Id;
@@ -192 +192 @@
     }
 
-    public virtual ObjT GetById(long id) {
+    public virtual ObjT GetById(Guid id) {
       return FindSingle(delegate() {
         return FindById(id);