13 files changed, 87 insertions, 79 deletions
diff --git a/product/database/transactions/ChangeTracker.cs b/product/database/transactions/ChangeTracker.cs
index 4bfd41a..b6d12f2 100644
--- a/product/database/transactions/ChangeTracker.cs
+++ b/product/database/transactions/ChangeTracker.cs
@@ -8,11 +8,11 @@ namespace momoney.database.transactions
     public class ChangeTracker<T> : IChangeTracker<T> where T : Identifiable<Guid>
     {
         readonly ITrackerEntryMapper<T> mapper;
-        readonly IStatementRegistry registry;
+        readonly DatabaseCommandRegistry registry;
         readonly IList<ITrackerEntry<T>> items;
         readonly IList<T> to_be_deleted;
 
-        public ChangeTracker(ITrackerEntryMapper<T> mapper, IStatementRegistry registry)
+        public ChangeTracker(ITrackerEntryMapper<T> mapper, DatabaseCommandRegistry registry)
         {
             this.mapper = mapper;
             this.registry = registry;
@@ -33,7 +33,7 @@ namespace momoney.database.transactions
         public void commit_to(IDatabase database)
         {
             items.each(x => commit(x, database));
-            to_be_deleted.each(x => database.apply(registry.prepare_command_for(x)));
+            to_be_deleted.each(x => database.apply(registry.prepare_for_deletion(x)));
         }
 
         public bool is_dirty()
@@ -48,7 +48,7 @@ namespace momoney.database.transactions
 
         void commit(ITrackerEntry<T> entry, IDatabase database)
         {
-            if (entry.has_changes()) database.apply(registry.prepare_command_for(entry.current));
+            if (entry.has_changes()) database.apply(registry.prepare_for_flushing(entry.current));
         }
     }
 }
 \ No newline at end of file
diff --git a/product/database/transactions/ChangeTrackerFactory.cs b/product/database/transactions/ChangeTrackerFactory.cs
index a346cf8..940b2f6 100644
--- a/product/database/transactions/ChangeTrackerFactory.cs
+++ b/product/database/transactions/ChangeTrackerFactory.cs
@@ -6,10 +6,10 @@ namespace momoney.database.transactions
 {
     public class ChangeTrackerFactory : IChangeTrackerFactory
     {
-        readonly IStatementRegistry statement_registry;
+        readonly DatabaseCommandRegistry statement_registry;
         readonly DependencyRegistry registry;
 
-        public ChangeTrackerFactory(IStatementRegistry statement_registry, DependencyRegistry registry)
+        public ChangeTrackerFactory(DatabaseCommandRegistry statement_registry, DependencyRegistry registry)
         {
             this.statement_registry = statement_registry;
             this.registry = registry;
diff --git a/product/database/transactions/ChangeTrackerSpecs.cs b/product/database/transactions/ChangeTrackerSpecs.cs
index ef0cbb7..0a1d1bc 100644
--- a/product/database/transactions/ChangeTrackerSpecs.cs
+++ b/product/database/transactions/ChangeTrackerSpecs.cs
@@ -15,11 +15,11 @@ namespace momoney.database.transactions
             context c = () =>
             {
                 mapper = the_dependency<ITrackerEntryMapper<Identifiable<Guid>>>();
-                registry = the_dependency<IStatementRegistry>();
+                registry = the_dependency<DatabaseCommandRegistry>();
             };
 
             static protected ITrackerEntryMapper<Identifiable<Guid>> mapper;
-            static protected IStatementRegistry registry;
+            static protected DatabaseCommandRegistry registry;
         }
 
         [Concern(typeof (ChangeTracker<Identifiable<Guid>>))]
@@ -30,14 +30,14 @@ namespace momoney.database.transactions
             context c = () =>
             {
                 item = an<Identifiable<Guid>>();
-                statement = an<IStatement>();
+                statement = an<DatabaseCommand>();
                 database = an<IDatabase>();
                 var entry = an<ITrackerEntry<Identifiable<Guid>>>();
 
                 when_the(mapper).is_told_to(x => x.map_from(item)).it_will_return(entry);
                 when_the(entry).is_told_to(x => x.has_changes()).it_will_return(true);
                 when_the(entry).is_told_to(x => x.current).it_will_return(item);
-                when_the(registry).is_told_to(x => x.prepare_command_for(item)).it_will_return(statement);
+                when_the(registry).is_told_to(x => x.prepare_for_flushing(item)).it_will_return(statement);
             };
 
             because b = () =>
@@ -48,7 +48,7 @@ namespace momoney.database.transactions
 
             static Identifiable<Guid> item;
             static IDatabase database;
-            static IStatement statement;
+            static DatabaseCommand statement;
         }
 
         [Concern(typeof (ChangeTracker<Identifiable<Guid>>))]
diff --git a/product/database/transactions/DatabaseCommand.cs b/product/database/transactions/DatabaseCommand.cs
new file mode 100644
index 0000000..0f1f283
--- /dev/null
+++ b/product/database/transactions/DatabaseCommand.cs
@@ -0,0 +1,8 @@
+using gorilla.commons.utility;
+
+namespace momoney.database.transactions
+{
+    public interface DatabaseCommand : ParameterizedCommand<DatabaseConnection>
+    {
+    }
+}
+\ No newline at end of file
diff --git a/product/database/transactions/DatabaseCommandRegistry.cs b/product/database/transactions/DatabaseCommandRegistry.cs
new file mode 100644
index 0000000..16f01c8
--- /dev/null
+++ b/product/database/transactions/DatabaseCommandRegistry.cs
@@ -0,0 +1,11 @@
+using System;
+using gorilla.commons.utility;
+
+namespace momoney.database.transactions
+{
+    public interface DatabaseCommandRegistry
+    {
+        DatabaseCommand prepare_for_deletion<T>(T entity) where T : Identifiable<Guid>;
+        DatabaseCommand prepare_for_flushing<T>(T entity) where T : Identifiable<Guid>;
+    }
+}
+\ No newline at end of file
diff --git a/product/database/transactions/IDatabaseConnection.cs b/product/database/transactions/DatabaseConnection.cs
index 98f79f4..19bd725 100644
--- a/product/database/transactions/IDatabaseConnection.cs
+++ b/product/database/transactions/DatabaseConnection.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace momoney.database.transactions
 {
-    public interface IDatabaseConnection : IDisposable
+    public interface DatabaseConnection : IDisposable
     {
         IEnumerable<T> query<T>();
         IEnumerable<T> query<T>(Predicate<T> predicate);
diff --git a/product/database/transactions/DeleteFromDatabase.cs b/product/database/transactions/DeleteFromDatabase.cs
new file mode 100644
index 0000000..07c2879
--- /dev/null
+++ b/product/database/transactions/DeleteFromDatabase.cs
@@ -0,0 +1,17 @@
+namespace momoney.database.transactions
+{
+    public class DeleteFromDatabase<T> : DatabaseCommand
+    {
+        readonly T entity;
+
+        public DeleteFromDatabase(T entity)
+        {
+            this.entity = entity;
+        }
+
+        public void run(DatabaseConnection connection)
+        {
+            connection.delete(entity);
+        }
+    }
+}
+\ No newline at end of file
diff --git a/product/database/transactions/IDatabase.cs b/product/database/transactions/IDatabase.cs
index 433f52a..4401e64 100644
--- a/product/database/transactions/IDatabase.cs
+++ b/product/database/transactions/IDatabase.cs
@@ -7,6 +7,6 @@ namespace momoney.database.transactions
     public interface IDatabase
     {
         IEnumerable<T> fetch_all<T>() where T : Identifiable<Guid>;
-        void apply(IStatement statement);
+        void apply(DatabaseCommand command);
     }
 }
 \ No newline at end of file
diff --git a/product/database/transactions/IStatement.cs b/product/database/transactions/IStatement.cs
deleted file mode 100644
index ea2092f..0000000
--- a/product/database/transactions/IStatement.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace momoney.database.transactions
-{
-    public interface IStatement
-    {
-        void prepare(IDatabaseConnection connection);
-    }
-}
-\ No newline at end of file
diff --git a/product/database/transactions/IStatementRegistry.cs b/product/database/transactions/IStatementRegistry.cs
deleted file mode 100644
index e2b3b16..0000000
--- a/product/database/transactions/IStatementRegistry.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using gorilla.commons.utility;
-
-namespace momoney.database.transactions
-{
-    public interface IStatementRegistry
-    {
-        IStatement prepare_delete_statement_for<T>(T entity) where T : Identifiable<Guid>;
-        IStatement prepare_command_for<T>(T entity) where T : Identifiable<Guid>;
-    }
-}
-\ No newline at end of file
diff --git a/product/database/transactions/ObjectDatabaseCommandRegistry.cs b/product/database/transactions/ObjectDatabaseCommandRegistry.cs
new file mode 100644
index 0000000..8b2d97e
--- /dev/null
+++ b/product/database/transactions/ObjectDatabaseCommandRegistry.cs
@@ -0,0 +1,18 @@
+using System;
+using gorilla.commons.utility;
+
+namespace momoney.database.transactions
+{
+    public class ObjectDatabaseCommandRegistry : DatabaseCommandRegistry
+    {
+        public DatabaseCommand prepare_for_deletion<T>(T entity) where T : Identifiable<Guid>
+        {
+            return new DeleteFromDatabase<T>(entity);
+        }
+
+        public DatabaseCommand prepare_for_flushing<T>(T entity) where T : Identifiable<Guid>
+        {
+            return new SaveOrUpdateFromDatabase<T>(entity);
+        }
+    }
+}
+\ No newline at end of file
diff --git a/product/database/transactions/SaveOrUpdateFromDatabase.cs b/product/database/transactions/SaveOrUpdateFromDatabase.cs
new file mode 100644
index 0000000..c8babda
--- /dev/null
+++ b/product/database/transactions/SaveOrUpdateFromDatabase.cs
@@ -0,0 +1,20 @@
+using System;
+using gorilla.commons.utility;
+
+namespace momoney.database.transactions
+{
+    public class SaveOrUpdateFromDatabase<T> : DatabaseCommand where T : Identifiable<Guid>
+    {
+        readonly T entity;
+
+        public SaveOrUpdateFromDatabase(T entity)
+        {
+            this.entity = entity;
+        }
+
+        public void run(DatabaseConnection connection)
+        {
+            connection.store(entity);
+        }
+    }
+}
+\ No newline at end of file
diff --git a/product/database/transactions/StatementRegistry.cs b/product/database/transactions/StatementRegistry.cs
deleted file mode 100644
index 66ca362..0000000
--- a/product/database/transactions/StatementRegistry.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System;
-using gorilla.commons.utility;
-
-namespace momoney.database.transactions
-{
-    public class StatementRegistry : IStatementRegistry
-    {
-        public IStatement prepare_delete_statement_for<T>(T entity) where T : Identifiable<Guid>
-        {
-            return new DeletionStatement<T>(entity);
-        }
-
-        public IStatement prepare_command_for<T>(T entity) where T : Identifiable<Guid>
-        {
-            return new SaveOrUpdateStatement<T>(entity);
-        }
-    }
-
-    public class SaveOrUpdateStatement<T> : IStatement where T : Identifiable<Guid>
-    {
-        readonly T entity;
-
-        public SaveOrUpdateStatement(T entity)
-        {
-            this.entity = entity;
-        }
-
-        public void prepare(IDatabaseConnection connection)
-        {
-            connection.store(entity);
-        }
-    }
-
-    public class DeletionStatement<T> : IStatement
-    {
-        readonly T entity;
-
-        public DeletionStatement(T entity)
-        {
-            this.entity = entity;
-        }
-
-        public void prepare(IDatabaseConnection connection)
-        {
-            connection.delete(entity);
-        }
-    }
-}
-\ No newline at end of file