Microsoft.Data.Sqlite: Pool connections

Resolves dotnet#13837
bricelam · Jun 18, 2021 · ea3a867 · ea3a867
1 parent 4f7f65c
commit ea3a867
Show file tree

Hide file tree

Showing 21 changed files with 1,055 additions and 192 deletions.
diff --git a/src/EFCore.Sqlite.Core/Scaffolding/Internal/SqliteDatabaseModelFactory.cs b/src/EFCore.Sqlite.Core/Scaffolding/Internal/SqliteDatabaseModelFactory.cs
@@ -88,7 +88,10 @@ public override DatabaseModel Create(DbConnection connection, DatabaseModelFacto
             {
                 connection.Open();
 
-                SpatialiteLoader.TryLoad(connection);
+                if (HasGeometryColumns(connection))
+                {
+                    SpatialiteLoader.TryLoad(connection);
+                }
             }
 
             try
@@ -124,6 +127,18 @@ public override DatabaseModel Create(DbConnection connection, DatabaseModelFacto
             return databaseModel;
         }
 
+        private static bool HasGeometryColumns(DbConnection connection)
+        {
+            using var command = connection.CreateCommand();
+            command.CommandText = new StringBuilder()
+                .AppendLine("SELECT COUNT(*)")
+                .AppendLine("FROM \"sqlite_master\"")
+                .AppendLine("WHERE \"name\" = 'geometry_columns' AND \"type\" = 'table';")
+                .ToString();
+
+            return (long)command.ExecuteScalar()! != 0L;
+        }
+
         private static string GetDatabaseName(DbConnection connection)
         {
             var name = Path.GetFileNameWithoutExtension(connection.DataSource);
@@ -150,7 +165,8 @@ private void GetTables(DbConnection connection, DatabaseModel databaseModel, IEn
                     .Append("', 'ElementaryGeometries', 'geometry_columns', 'geometry_columns_auth', ")
                     .Append("'geometry_columns_field_infos', 'geometry_columns_statistics', 'geometry_columns_time', ")
                     .Append("'spatial_ref_sys', 'spatial_ref_sys_aux', 'SpatialIndex', 'spatialite_history', ")
-                    .Append("'sql_statements_log', 'views_geometry_columns', 'views_geometry_columns_auth', ")
+                    .Append("'sql_statements_log', 'vector_layers', 'vector_layers_auth', 'vector_layers_statistics', ")
+                    .Append("'vector_layers_field_infos', 'views_geometry_columns', 'views_geometry_columns_auth', ")
                     .Append("'views_geometry_columns_field_infos', 'views_geometry_columns_statistics', ")
                     .Append("'virts_geometry_columns', 'virts_geometry_columns_auth', ")
                     .Append("'geom_cols_ref_sys', 'spatial_ref_sys_all', ")

diff --git a/src/EFCore.Sqlite.Core/Storage/Internal/SqliteDatabaseCreator.cs b/src/EFCore.Sqlite.Core/Storage/Internal/SqliteDatabaseCreator.cs
@@ -146,6 +146,7 @@ public override void Delete()
 
             if (!string.IsNullOrEmpty(path))
             {
+                SqliteConnection.ClearPool(new SqliteConnection(Dependencies.Connection.ConnectionString));
                 File.Delete(path);
             }
         }

diff --git a/src/EFCore.Sqlite.Core/Storage/Internal/SqliteRelationalConnection.cs b/src/EFCore.Sqlite.Core/Storage/Internal/SqliteRelationalConnection.cs
@@ -92,8 +92,11 @@ protected override DbConnection CreateDbConnection()
         /// </summary>
         public virtual ISqliteRelationalConnection CreateReadOnlyConnection()
         {
-            var connectionStringBuilder =
-                new SqliteConnectionStringBuilder(GetValidatedConnectionString()) { Mode = SqliteOpenMode.ReadOnly };
+            var connectionStringBuilder = new SqliteConnectionStringBuilder(GetValidatedConnectionString())
+            {
+                Mode = SqliteOpenMode.ReadOnly,
+                Pooling = false
+            };
 
             var contextOptions = new DbContextOptionsBuilder().UseSqlite(connectionStringBuilder.ToString()).Options;
 

diff --git a/src/Microsoft.Data.Sqlite.Core/SqliteBlob.cs b/src/Microsoft.Data.Sqlite.Core/SqliteBlob.cs
@@ -17,7 +17,7 @@ namespace Microsoft.Data.Sqlite
     public class SqliteBlob : Stream
     {
         private sqlite3_blob? _blob;
-        private readonly sqlite3 _db;
+        private readonly SqliteConnection _connection;
         private long _position;
 
         /// <summary>
@@ -72,17 +72,17 @@ public SqliteBlob(
                 throw new ArgumentNullException(nameof(columnName));
             }
 
-            _db = connection.Handle!;
+            _connection = connection;
             CanWrite = !readOnly;
             var rc = sqlite3_blob_open(
-                _db,
+                _connection.Handle,
                 databaseName,
                 tableName,
                 columnName,
                 rowid,
                 readOnly ? 0 : 1,
                 out _blob);
-            SqliteException.ThrowExceptionForRC(rc, _db);
+            SqliteException.ThrowExceptionForRC(rc, _connection.Handle);
             Length = sqlite3_blob_bytes(_blob);
         }
 
@@ -207,7 +207,7 @@ public virtual int Read(Span<byte> buffer)
             }
 
             var rc = sqlite3_blob_read(_blob, buffer.Slice(0, count), (int)position);
-            SqliteException.ThrowExceptionForRC(rc, _db);
+            SqliteException.ThrowExceptionForRC(rc, _connection.Handle);
             _position += count;
             return count;
         }
@@ -281,7 +281,7 @@ public virtual void Write(ReadOnlySpan<byte> buffer)
             }
 
             var rc = sqlite3_blob_write(_blob, buffer.Slice(0, count), (int)position);
-            SqliteException.ThrowExceptionForRC(rc, _db);
+            SqliteException.ThrowExceptionForRC(rc, _connection.Handle);
             _position += count;
         }