Merge pull request #396 from ilyalukyanov/master

Fixinf VistaDB assembly discovery

Author: mythz

src/ServiceStack.OrmLite.VistaDB.Tests/App.config

@@ -10,7 +10,7 @@
       <remove invariant="System.Data.VistaDB5" />
       <add invariant="System.Data.VistaDB5" name="VistaDB 5 Data Provider"
            description="VistaDB 5 ADO.NET Provider for .Net"
-            type="VistaDB.Provider.VistaDBProviderFactory, VistaDB.5.NET40" />
+            type="VistaDB.Provider.VistaDBProviderFactory, VistaDB.5.NET40, Version=5.0.0.0, Culture=neutral, PublicKeyToken=dfc935afe2125461" />
     </DbProviderFactories>
   </system.data>
 </configuration>

src/ServiceStack.OrmLite.VistaDB.Tests/OrmLiteTestBase.cs

@@ -17,18 +17,12 @@ public void TestFixtureSetUp()
         {
             LogManager.LogFactory = new ConsoleLogFactory();
 
+            VistaDbDialect.Provider.UseLibraryFromGac = true;
             OrmLiteConfig.DialectProvider = VistaDbDialect.Provider;
 
-            var dataFileName = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".vdb5");
-            var sourceStream = typeof(OrmLiteTestBase).Assembly
-                .GetManifestResourceStream("ServiceStack.OrmLite.VistaDB.Tests.Resources.test.vdb5");
+            DataFileName = TestVistaDb.ExtractTestDatabaseFileToTempFile();
 
-            using (sourceStream)
-            using (var destStream = File.Create(dataFileName))
-                sourceStream.CopyTo(destStream);
-
-            DataFileName = dataFileName;
-            ConnectionString = "Data Source=" + dataFileName + ";";
+            ConnectionString = "Data Source=" + DataFileName + ";";
         }
 
         [TestFixtureTearDown]

src/ServiceStack.OrmLite.VistaDB.Tests/TestVistaDb.cs

@@ -1,12 +1,44 @@
-using System.Data;
+using System;
+using System.Configuration;
+using System.Data;
 using System.Data.Common;
+using System.IO;
 using NUnit.Framework;
 
 namespace ServiceStack.OrmLite.VistaDB.Tests
 {
     [TestFixture]
     public class TestVistaDb
     {
+        public static string ExtractTestDatabaseFileToTempFile()
+        {
+            var dataFileName = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".vdb5");
+
+            ExtractTestDatabaseFile(dataFileName);
+
+            return dataFileName;
+        }
+
+        public static void ExtractTestDatabaseFile(string dataFileName)
+        {
+            var sourceStream = typeof(OrmLiteTestBase).Assembly
+                .GetManifestResourceStream("ServiceStack.OrmLite.VistaDB.Tests.Resources.test.vdb5");
+
+            using (sourceStream)
+            using (var destStream = File.Create(dataFileName))
+                sourceStream.CopyTo(destStream);
+        }
+
+        public static void CreateDatabase(DbProviderFactory factory)
+        {
+            using (var conn = factory.CreateConnection())
+            using (var comm = conn.CreateCommand())
+            {
+                comm.CommandText = @"CREATE DATABASE '|DataDirectory|\Database.vdb5', PAGE SIZE 4, LCID 1033, CASE SENSITIVE FALSE;";
+                comm.ExecuteNonQuery();
+            }
+        }
+
         [Test]
         public void TestVistaDB()
         {
@@ -24,8 +56,24 @@ public void TestVistaDB()
                 VersionInfo = "Failed to load connectionString from config file";
                 Assert.Fail(VersionInfo);
             }
+
+            DbProviderFactory factory = null;
             // Loads the factory
-            DbProviderFactory factory = DbProviderFactories.GetFactory(connectionString.ProviderName);
+            try
+            {
+                factory = DbProviderFactories.GetFactory(connectionString.ProviderName);
+            }
+            catch
+            {
+                Assert.Fail("VistaDB library should be copied locally or installed into GAC.");
+            }
+
+            try
+            {
+                CreateDatabase(factory);
+            }
+            catch { }
+
             // After this it looks pretty normal
             using (DbConnection connection = factory.CreateConnection())
             {

src/ServiceStack.OrmLite.VistaDB/ReflectionBasedDialectProvider.cs

@@ -8,31 +8,81 @@ namespace ServiceStack.OrmLite.VistaDB
     public abstract class ReflectionBasedDialectProvider<T> : OrmLiteDialectProviderBase<T>
         where T: IOrmLiteDialectProvider
     {
-        protected Type ConnectionType { get; private set; }
+        private Lazy<Type> _connectionType;
 
-        protected ReflectionBasedDialectProvider(Type connectionType)
+        private AssemblyName _assemblyGacName;
+        private AssemblyName _assemblyLocalName;
+        private string _providerTypeName;
+
+        protected ReflectionBasedDialectProvider()
         {
-            if (connectionType == null)
-                throw new ArgumentNullException("connectionType");
+            _connectionType = new Lazy<Type>(LoadAssemblyAndGetType);
+        }
+
+        protected abstract AssemblyName DefaultAssemblyGacName { get; }
+
+        protected abstract AssemblyName DefaultAssemblyLocalName { get; }
+
+        protected abstract string DefaultProviderTypeName { get; }
+
+        protected Type ConnectionType { get { return _connectionType.Value; } }
 
-            if (!typeof(IDbConnection).IsAssignableFrom(connectionType))
-                throw new ArgumentException("Invalid connectionType");
+        public bool UseLibraryFromGac { get; set; }
 
-            this.ConnectionType = connectionType;
+        public AssemblyName AssemblyGacName 
+        {
+            get
+            {
+                if (_assemblyGacName == null)
+                    _assemblyGacName = DefaultAssemblyGacName;
+
+                return _assemblyGacName;
+            }
+            set
+            {
+                SetValueSafe(value, v => _assemblyGacName = v);
+            }
         }
 
-        protected ReflectionBasedDialectProvider(AssemblyName assemblyName, string typeName)
-            : this (LoadAssemblyAndGetType(assemblyName, typeName))
-        {}
+        public AssemblyName AssemblyLocalName 
+        {
+            get 
+            {
+                if (_assemblyLocalName == null)
+                    _assemblyLocalName = DefaultAssemblyLocalName;
 
-        protected ReflectionBasedDialectProvider(string assemblyName, string typeName)
-            : this (new AssemblyName(assemblyName), typeName)
-        {}
+                return _assemblyLocalName;
+            }
+            set
+            {
+                SetValueSafe(value, v => _assemblyLocalName = v);
+            }
+        }
 
-        protected static Type LoadAssemblyAndGetType(AssemblyName assemblyName, string typeName)
+        public string ProviderTypeName 
         {
+            get
+            {
+                if (_providerTypeName == null)
+                    _providerTypeName = DefaultProviderTypeName;
+
+                return _providerTypeName;
+            }
+            set
+            {
+                SetValueSafe(value, v => _providerTypeName = v);
+            } 
+        }
+
+        protected Type LoadAssemblyAndGetType()
+        {
+            var assemblyName = this.UseLibraryFromGac
+                ? this.AssemblyGacName
+                : this.AssemblyLocalName;
+
             var assembly = Assembly.Load(assemblyName);
-            return assembly.GetType(typeName, true);
+
+            return assembly.GetType(this.ProviderTypeName, true);
         }
 
         protected virtual IDbConnection ActivateDbConnection(string connectionString)
@@ -47,5 +97,19 @@ public override IDbConnection CreateConnection(string connectionString, Dictiona
         {
             return this.ActivateDbConnection(connectionString);
         }
+
+        private static void ThrowUnableToChangeProperty()
+        {
+            throw new InvalidOperationException("This property should only be set before the first time a connection is created");
+        }
+
+        private void SetValueSafe<TValue>(TValue value, Action<TValue> action)
+            where TValue: class
+        {
+            if (_connectionType.IsValueCreated)
+                ThrowUnableToChangeProperty();
+
+            action.Invoke(value);
+        }
     }
 }

src/ServiceStack.OrmLite.VistaDB/VistaDBExpression.cs

@@ -36,43 +36,6 @@ public override string ToUpdateStatement(T item, bool excludeDefaults = false)
                 dialectProvider.GetQuotedTableName(ModelDef), setFields, WhereExpression);
         }
 
-        protected virtual string BuildOrderByIdExpression()
-        {
-            if (ModelDef.PrimaryKey == null)
-                throw new ApplicationException("Malformed model, no PrimaryKey defined");
-
-            return String.Format("ORDER BY {0}", OrmLiteConfig.DialectProvider.GetQuotedColumnName(ModelDef.PrimaryKey.FieldName));
-        }
-
-        protected virtual string BuildWhereIdGTEFirstId()
-        {
-            if (ModelDef.PrimaryKey == null)
-                throw new ApplicationException("Malformed model, no PrimaryKey defined");
-
-            var where = String.IsNullOrWhiteSpace(WhereExpression)
-                ? String.Format("{0} > @first_id", OrmLiteConfig.DialectProvider.GetQuotedColumnName(ModelDef.PrimaryKey.FieldName))
-                : String.Format("({0}) AND {1} > @first_id", WhereExpression.Trim().Substring("WHERE".Length), OrmLiteConfig.DialectProvider.GetQuotedColumnName(ModelDef.PrimaryKey.FieldName));
-            
-            return "WHERE " + where;
-        }
-
-        protected virtual string BuildSelectTopNIdExpression(int skip)
-        {
-            if (ModelDef.PrimaryKey == null)
-                throw new ApplicationException("Malformed model, no PrimaryKey defined");
-            
-            return String.Format("SELECT TOP {0} @first_id = {1} ", skip, OrmLiteConfig.DialectProvider.GetQuotedColumnName(ModelDef.PrimaryKey.FieldName));
-        }
-
-        protected virtual string BuildDeclareFirstIdExpression()
-        {
-            if (ModelDef.PrimaryKey == null)
-                throw new ApplicationException("Malformed model, no PrimaryKey defined");
-
-            return String.Format("DECLARE @first_id {0};",
-                OrmLiteConfig.DialectProvider.GetColumnTypeDefinition(ModelDef.PrimaryKey.FieldType));
-        }
-
         protected override object VisitColumnAccessMethod(MethodCallExpression m)
         {
             if (m.Arguments.Count == 1 && m.Method.Name == "Equals")

src/ServiceStack.OrmLite.VistaDB/VistaDbDialect.cs

@@ -4,6 +4,6 @@ namespace ServiceStack.OrmLite
 {
     public static class VistaDbDialect
     {
-        public static IOrmLiteDialectProvider Provider { get { return VistaDbDialectProvider.Instance; } }
+        public static VistaDbDialectProvider Provider { get { return VistaDbDialectProvider.Instance; } }
     }
 }