More PR feedback. Put all version switches into one class.

Author: Nate McMaster

.travis.yml

@@ -4,7 +4,6 @@ env:
   - MONO_THREADS_PER_CPU=2000 MONO_MANAGED_WATCHER=disabled
 mono:
   - beta
-  - alpha
 os:
   - linux
   - osx

src/Microsoft.Data.Sqlite/Interop/MarshalEx.cs

@@ -61,27 +61,7 @@ public static void ThrowExceptionForRC(int rc, Sqlite3Handle db)
                 return;
             }
 
-
-            string message;
-
-            if (db != null && !db.IsInvalid)
-            {
-                message = Strings.FormatSqliteNativeError(
-                            rc,
-                            NativeMethods.sqlite3_errmsg(db));
-            }
-            else if (SqliteVersion.Current >= new Version("3.7.15"))
-            {
-                message = Strings.FormatSqliteNativeError(
-                            rc,
-                            NativeMethods.sqlite3_errstr(rc));
-            }
-            else
-            {
-                message = Strings.FormatSqliteNativeErrorStringMissing(rc);
-            }
-
-            throw new SqliteException(message, rc);
+            throw new SqliteException(VersionedMethods.SqliteErrorMessage(rc, db), rc);
         }
     }
 }

src/Microsoft.Data.Sqlite/Interop/Sqlite3Handle.cs

@@ -18,19 +18,9 @@ private Sqlite3Handle()
 
         protected override bool ReleaseHandle()
         {
-            int rc = -1;
-            if (SqliteVersion.Current < new Version("3.7.15"))
-            {
-                rc = NativeMethods.sqlite3_close(handle);
-                handle = IntPtr.Zero;
-            }
-            else
-            {
-                rc = NativeMethods.sqlite3_close_v2(handle);
-                handle = IntPtr.Zero;
-            }
-
-            return rc == Constants.SQLITE_OK;
+            var result = VersionedMethods.SqliteClose(handle);
+            handle = IntPtr.Zero;
+            return result;
         }
     }
 }

src/Microsoft.Data.Sqlite/Interop/VersionedMethods.cs

@@ -0,0 +1,53 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.Data.Sqlite.Interop
+{
+	internal class VersionedMethods
+	{
+        private static Version Current => new Version(NativeMethods.sqlite3_libversion());
+        
+		public static string SqliteErrorMessage(int rc, Sqlite3Handle db)
+		{
+			if (db != null && !db.IsInvalid)
+            {
+                return Strings.FormatSqliteNativeError(
+                            rc,
+                            NativeMethods.sqlite3_errmsg(db));
+            }
+            else if (Current >= new Version("3.7.15"))
+            {
+                return Strings.FormatSqliteNativeError(
+                            rc,
+                            NativeMethods.sqlite3_errstr(rc));
+            }
+			return Strings.FormatSqliteNativeErrorStringMissing(rc);
+		}
+
+        internal static bool SqliteClose(IntPtr handle)
+        {
+            int rc = -1;
+            if (Current < new Version("3.7.15"))
+            {
+                rc = NativeMethods.sqlite3_close(handle);
+            }
+            else
+            {
+                rc = NativeMethods.sqlite3_close_v2(handle);
+            }
+
+            return rc == Constants.SQLITE_OK;
+        }
+        
+        internal static string SqliteDbFilename(Sqlite3Handle db, string databaseName)
+        {
+            if(Current < new Version("3.7.10"))
+            {
+                return null;
+            }
+            return NativeMethods.sqlite3_db_filename(db, databaseName);
+        }
+    }
+}

src/Microsoft.Data.Sqlite/SqliteConnection.cs

@@ -61,8 +61,8 @@ public override string ConnectionString
         public override string Database => MainDatabaseName;
 
         public override string DataSource =>
-            State == ConnectionState.Open && SqliteVersion.Current >= new Version("3.7.10") ?
-                NativeMethods.sqlite3_db_filename(_db, MainDatabaseName) :
+            State == ConnectionState.Open ?
+                VersionedMethods.SqliteDbFilename(_db, MainDatabaseName) ?? ConnectionStringBuilder.DataSource :
                 ConnectionStringBuilder.DataSource;
 
         /// <summary>

src/Microsoft.Data.Sqlite/Utilities/SqliteVersion.cs

@@ -116,7 +116,7 @@ public void It_throws_sqlite_busy_on_deadlock()
 
                         Assert.Equal(SQLITE_BUSY, ex.SqliteErrorCode);
 
-                        if (SqliteVersion.Current >= new Version("3.7.15"))
+                        if (CurrentVersion >= new Version("3.7.15"))
                         {
                             var message = NativeMethods.sqlite3_errstr(SQLITE_BUSY);
                             Assert.Equal(Strings.FormatSqliteNativeError(SQLITE_BUSY, message), ex.Message);
@@ -195,7 +195,7 @@ public void Command_times_out()
 
                             Assert.Equal(SQLITE_BUSY, ex.SqliteErrorCode);
 
-                            if (SqliteVersion.Current >= new Version("3.7.15"))
+                            if (CurrentVersion >= new Version("3.7.15"))
                             {
                                 var message = NativeMethods.sqlite3_errstr(SQLITE_BUSY);
                                 Assert.Equal(Strings.FormatSqliteNativeError(SQLITE_BUSY, message), ex.Message);
@@ -209,6 +209,8 @@ public void Command_times_out()
                 }
             }
         }
+        
+        private Version CurrentVersion => new Version(NativeMethods.sqlite3_libversion());
 
         private const string FileName = "./concurrency.db";
 

test/Microsoft.Data.Sqlite.Tests/SqliteConcurrencyTest.cs

@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Reflection;
-using Microsoft.Data.Sqlite.Utilities;
+using Microsoft.Data.Sqlite.Interop;
 using Xunit;
 using Xunit.Abstractions;
 using Xunit.Sdk;
@@ -25,7 +25,7 @@ protected override ITestFrameworkExecutor CreateExecutor(AssemblyName assemblyNa
         {
             _messageSink.OnMessage(new Xunit.Sdk.DiagnosticMessage
             {
-                Message = $"Using SQLite v{ SqliteVersion.Current }"
+                Message = $"Using SQLite v{ NativeMethods.sqlite3_libversion() }"
             });
 
             return base.CreateExecutor(assemblyName);

test/Microsoft.Data.Sqlite.Tests/TestUtilities/SqliteTestFramework.cs

@@ -3,7 +3,6 @@
 
 using System;
 using Microsoft.AspNet.Testing.xunit;
-using Microsoft.Data.Sqlite.Utilities;
 
 namespace Microsoft.Data.Sqlite
 {
@@ -17,11 +16,13 @@ internal class SqliteVersionConditionAttribute : Attribute, ITestCondition
         public string Max { get { return _max.ToString(); } set { _max = new Version(value); } }
         public string Skip { get { return _skip.ToString(); } set { _skip = new Version(value); } }
 
+        private Version Current = new Version(NativeMethods.sqlite3_libversion());
+
         public bool IsMet
         {
             get
             {
-                if (SqliteVersion.Current == _skip)
+                if (Current == _skip)
                 {
                     return false;
                 }
@@ -33,15 +34,15 @@ public bool IsMet
 
                 if (_min == null)
                 {
-                    return SqliteVersion.Current <= _max;
+                    return Current <= _max;
                 }
 
                 if (_max == null)
                 {
-                    return SqliteVersion.Current >= _min;
+                    return Current >= _min;
                 }
 
-                return SqliteVersion.Current <= _max && SqliteVersion.Current >= _min;
+                return Current <= _max && Current >= _min;
             }
         }