Easier database creation. Closes #51

Author: stefanmielke

DataCore.Database.MySql/MySqlDatabase.cs

@@ -1,11 +1,18 @@
 using System.Data;
+using MySql.Data.MySqlClient;
 
 namespace DataCore.Database.MySql
 {
-    public class MySqlDatabase : Database
+    public class MySqlDatabase : IDatabaseDefinition
     {
-        public MySqlDatabase(IDbConnection connection) : base(connection, new MySqlTranslator())
+        public IDbConnection GetNewDbConnection(string connectionString)
         {
+            return new MySqlConnection(connectionString);
+        }
+
+        public ITranslator GetTranslator()
+        {
+            return new MySqlTranslator();
         }
     }
 }

DataCore.Database.Oracle/OracleDatabase.cs

@@ -1,12 +1,18 @@
 using System.Data;
+using Oracle.ManagedDataAccess.Client;
 
 namespace DataCore.Database.Oracle
 {
-    public class OracleDatabase : Database
+    public class OracleDatabase : IDatabaseDefinition
     {
-        public OracleDatabase(IDbConnection connection)
-            : base(connection, new OracleTranslator())
+        public IDbConnection GetNewDbConnection(string connectionString)
         {
+            return new OracleConnection(connectionString);
+        }
+
+        public ITranslator GetTranslator()
+        {
+            return new OracleTranslator();
         }
     }
 }

DataCore.Database.Postgres/PostgresDatabase.cs

@@ -1,11 +1,18 @@
 using System.Data;
+using Npgsql;
 
 namespace DataCore.Database.Postgres
 {
-    public class PostgresDatabase : Database
+    public class PostgresDatabase : IDatabaseDefinition
     {
-        public PostgresDatabase(IDbConnection connection) : base(connection, new PostgresTranslator())
+        public IDbConnection GetNewDbConnection(string connectionString)
         {
+            return new NpgsqlConnection(connectionString);
+        }
+
+        public ITranslator GetTranslator()
+        {
+            return new PostgresTranslator();
         }
     }
 }

DataCore.Database.SqlServer/SqlServerDatabase.cs

@@ -1,12 +1,18 @@
 using System.Data;
+using System.Data.SqlClient;
 
 namespace DataCore.Database.SqlServer
 {
-    public class SqlServerDatabase : Database
+    public class SqlServerDatabase : IDatabaseDefinition
     {
-        public SqlServerDatabase(IDbConnection connection)
-            : base(connection, new SqlServerTranslator())
+        public IDbConnection GetNewDbConnection(string connectionString)
         {
+            return new SqlConnection(connectionString);
+        }
+
+        public ITranslator GetTranslator()
+        {
+            return new SqlServerTranslator();
         }
     }
 }

DataCore.Database.Sqlite/SqliteDatabase.cs

@@ -1,12 +1,18 @@
 using System.Data;
+using System.Data.SQLite;
 
 namespace DataCore.Database.Sqlite
 {
-    public class SqliteDatabase : Database
+    public class SqliteDatabase : IDatabaseDefinition
     {
-        public SqliteDatabase(IDbConnection connection)
-            : base(connection, new SqliteTranslator())
+        public IDbConnection GetNewDbConnection(string connectionString)
         {
+            return new SQLiteConnection(connectionString);
+        }
+
+        public ITranslator GetTranslator()
+        {
+            return new SqliteTranslator();
         }
     }
 }

DataCore.Database/DataCore.Database.csproj

@@ -45,6 +45,7 @@
   <ItemGroup>
     <Compile Include="Database.cs" />
     <Compile Include="IDatabase.cs" />
+    <Compile Include="IDatabaseDefinition.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>

DataCore.Database/Database.cs

@@ -9,16 +9,24 @@
 
 namespace DataCore.Database
 {
-    public abstract class Database : IDatabase
+    public class Database : IDatabase
     {
-        private readonly IDbConnection _connection;
+        private readonly IDatabaseDefinition _dbDefinition;
+        private IDbConnection _connection;
 
-        public ITranslator Translator { get; private set; }
+        public ITranslator Translator { get; }
 
-        protected Database(IDbConnection connection, ITranslator translator)
+        public Database(IDatabaseDefinition dbDefinition, string connectionString)
         {
-            _connection = connection;
-            Translator = translator;
+            _dbDefinition = dbDefinition;
+            Translator = dbDefinition.GetTranslator();
+
+            OpenConnection(connectionString);
+        }
+
+        public void OpenConnection(string connectionString)
+        {
+            _connection = _dbDefinition.GetNewDbConnection(connectionString);
         }
 
         public Query<T> From<T>()
@@ -724,17 +732,38 @@ public IEnumerable<T> Execute<T>(string query, Parameters parameters)
 
         public int Execute(string query)
         {
+            if (_connection == null)
+                throw new ApplicationException("Call the method OpenConnection before executing a query.");
+
+            if (_connection.State == ConnectionState.Closed)
+                _connection.Open();
+
             return _connection.Execute(query);
         }
 
         public int Execute(string query, Parameters parameters)
         {
+            if (_connection == null)
+                throw new ApplicationException("Call the method OpenConnection before executing a query.");
+
+            if (_connection.State == ConnectionState.Closed)
+                _connection.Open();
+
             return _connection.Execute(query, parameters.GetValues());
         }
 
         private TableDefinition GetTableDefinition(Type type)
         {
             return new TableDefinition(type);
         }
+
+        public void Dispose()
+        {
+            if (_connection != null)
+            {
+                _connection.Close();
+                _connection.Dispose();
+            }
+        }
     }
 }

DataCore.Database/IDatabase.cs

@@ -4,8 +4,10 @@
 
 namespace DataCore.Database
 {
-    public interface IDatabase
+    public interface IDatabase : IDisposable
     {
+        void OpenConnection(string connectionString);
+
         ITranslator Translator { get; }
 
         int Execute(string query);

DataCore.Database/IDatabaseDefinition.cs

@@ -0,0 +1,10 @@
+using System.Data;
+
+namespace DataCore.Database
+{
+    public interface IDatabaseDefinition
+    {
+        IDbConnection GetNewDbConnection(string connectionString);
+        ITranslator GetTranslator();
+    }
+}