Adjust Default Timeout precedence

Author: Nicolas Michels

src/Microsoft.Data.Sqlite.Core/SqliteConnection.cs

@@ -86,6 +86,11 @@ public override string ConnectionString
 
                 _connectionString = value ?? string.Empty;
                 ConnectionOptions = new SqliteConnectionStringBuilder(value);
+
+                if (ConnectionOptions.DefaultTimeout.HasValue)
+                {
+                    DefaultTimeout = ConnectionOptions.DefaultTimeout.Value;
+                }
             }
         }
 
@@ -275,11 +280,6 @@ public override void Open()
                     this.ExecuteNonQuery("PRAGMA recursive_triggers = 1;");
                 }
 
-                if (ConnectionOptions.DefaultTimeout.HasValue)
-                {
-                    DefaultTimeout = ConnectionOptions.DefaultTimeout.Value;
-                }
-
                 if (_collations != null)
                 {
                     foreach (var item in _collations)

test/EFCore.Sqlite.Tests/Storage/SqliteRelationalConnectionTest.cs

@@ -37,5 +37,26 @@ public void Sets_DefaultTimeout_when_connection()
             Assert.Same(originalConnection, connection);
             Assert.Equal(42, originalConnection.DefaultTimeout);
         }
+
+        [Fact]
+        public void Sets_DefaultTimeout_when_connection_overrides_connection_string()
+        {
+            var originalConnection = new SqliteConnection("Data Source=:memory:;Default Timeout=50") { DefaultTimeout = 21 };
+            Assert.Equal(21, originalConnection.DefaultTimeout);
+
+            var services = SqliteTestHelpers.Instance.CreateContextServices(
+                new DbContextOptionsBuilder()
+                    .UseSqlite(originalConnection, x => x.CommandTimeout(42))
+                    .Options);
+
+            Assert.Equal(42, originalConnection.DefaultTimeout);
+        }
+
+        [Fact]
+        public void Sets_DefaultTimeout_when_connection_string()
+        {
+            var originalConnection = new SqliteConnection("Data Source=:memory:;Default Timeout=50");
+            Assert.Equal(50, originalConnection.DefaultTimeout);
+        }
     }
 }