Merge branch 'development'

Author: groue

CHANGELOG.md

@@ -7,6 +7,7 @@ GRDB adheres to [Semantic Versioning](https://semver.org/), with one exception:
 
 #### 6.x Releases
 
+- `6.1.x` Releases - [6.1.0](#610)
 - `6.0.x` Releases - [6.0.0](#600)
 - `6.0.0` Betas - [6.0.0-beta](#600-beta) | [6.0.0-beta.2](#600-beta2) | [6.0.0-beta.3](#600-beta3) | [6.0.0-beta.4](#600-beta4)
 
@@ -98,6 +99,12 @@ GRDB adheres to [Semantic Versioning](https://semver.org/), with one exception:
 
 ---
 
+## 6.1.0
+
+Released October 20, 2022 • [diff](https://github.com/groue/GRDB.swift/compare/v6.0.0...v6.1.0)
+
+- **New**: [#1288](https://github.com/groue/GRDB.swift/pull/1288) by [@jcavar](https://github.com/jcavar): Support for strict tables
+
 ## 6.0.0
 
 Released September 9, 2022 • [diff](https://github.com/groue/GRDB.swift/compare/v6.0.0-beta.4...v6.0.0)

Documentation/FullTextSearch.md

@@ -304,7 +304,7 @@ let pattern = FTS3Pattern(matchingAnyTokenIn: "")  // nil
 let pattern = FTS3Pattern(matchingAnyTokenIn: "*") // nil
 ```
 
-FTS3Pattern are regular [values](../README.md#values). You can use them as query [arguments](http://groue.github.io/GRDB.swift/docs/6.0/Structs/StatementArguments.html):
+FTS3Pattern are regular [values](../README.md#values). You can use them as query [arguments](http://groue.github.io/GRDB.swift/docs/6.1/Structs/StatementArguments.html):
 
 ```swift
 let documents = try Document.fetchAll(db,
@@ -587,7 +587,7 @@ let pattern = FTS5Pattern(matchingAnyTokenIn: "")  // nil
 let pattern = FTS5Pattern(matchingAnyTokenIn: "*") // nil
 ```
 
-FTS5Pattern are regular [values](../README.md#values). You can use them as query [arguments](http://groue.github.io/GRDB.swift/docs/6.0/Structs/StatementArguments.html):
+FTS5Pattern are regular [values](../README.md#values). You can use them as query [arguments](http://groue.github.io/GRDB.swift/docs/6.1/Structs/StatementArguments.html):
 
 ```swift
 let documents = try Document.fetchAll(db,

Documentation/Migrations.md

@@ -77,7 +77,7 @@ try dbQueue.read { db in
 }
 ```
 
-See the [DatabaseMigrator reference](http://groue.github.io/GRDB.swift/docs/6.0/Structs/DatabaseMigrator.html) for more migrator methods.
+See the [DatabaseMigrator reference](http://groue.github.io/GRDB.swift/docs/6.1/Structs/DatabaseMigrator.html) for more migrator methods.
 
 
 ## The `eraseDatabaseOnSchemaChange` Option

GRDB.swift.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'GRDB.swift'
-  s.version  = '6.0.0'
+  s.version  = '6.1.0'
 
   s.license  = { :type => 'MIT', :file => 'LICENSE' }
   s.summary  = 'A toolkit for SQLite databases, with a focus on application development.'

GRDB/Core/Statement.swift

@@ -504,7 +504,7 @@ final class StatementCursor: DatabaseCursor {
         try? _statement.reset()
     }
 
-    @usableFromInline
+    @inlinable
     func _element(sqliteStatement: SQLiteStatement) throws { }
 }
 

GRDB/QueryInterface/Schema/TableDefinition.swift

@@ -241,8 +241,16 @@ public struct TableOptions: OptionSet {
     /// Creates a without rowid table. See <https://www.sqlite.org/withoutrowid.html>
     public static let withoutRowID = TableOptions(rawValue: 1 << 2)
 
-#if GRDBCUSTOMSQLITE
-    /// Creates a strict table. See <https://www.sqlite.org/stricttables.html>
+#if GRDBCUSTOMSQLITE || GRDBCIPHER
+    /// Creates a STRICT table
+    ///
+    /// See <https://www.sqlite.org/stricttables.html>
+    public static let strict = TableOptions(rawValue: 1 << 3)
+#else
+    /// Creates a STRICT table
+    ///
+    /// See <https://www.sqlite.org/stricttables.html>
+    @available(iOS 15.4, macOS 12.4, tvOS 15.4, watchOS 8.5, *) // SQLite 3.37+
     public static let strict = TableOptions(rawValue: 1 << 3)
 #endif
 }
@@ -641,12 +649,17 @@ public final class TableDefinition {
 
             var tableOptions: [String] = []
 
-#if GRDBCUSTOMSQLITE
+#if GRDBCUSTOMSQLITE || GRDBCIPHER
             if options.contains(.strict) {
                 tableOptions.append("STRICT")
             }
+#else
+            if #available(iOS 15.4, macOS 12.4, tvOS 15.4, watchOS 8.5, *) {
+                if options.contains(.strict) {
+                    tableOptions.append("STRICT")
+                }
+            }
 #endif
-            
             if options.contains(.withoutRowID) {
                 tableOptions.append("WITHOUT ROWID")
             }

GRDB/Record/FetchableRecord.swift

@@ -521,11 +521,12 @@ public final class RecordCursor<Record: FetchableRecord>: DatabaseCursor {
     public let _statement: Statement
     /// :nodoc:
     public var _isDone = false
-    private let row: Row // Instantiated once, reused for performance
+    @usableFromInline
+    let _row: Row // Instantiated once, reused for performance
 
     init(statement: Statement, arguments: StatementArguments? = nil, adapter: (any RowAdapter)? = nil) throws {
         self._statement = statement
-        row = try Row(statement: statement).adapted(with: adapter, layout: statement)
+        _row = try Row(statement: statement).adapted(with: adapter, layout: statement)
         try statement.reset(withArguments: arguments)
     }
 
@@ -536,8 +537,9 @@ public final class RecordCursor<Record: FetchableRecord>: DatabaseCursor {
     }
 
     /// :nodoc:
+    @inlinable
     public func _element(sqliteStatement: SQLiteStatement) throws -> Record {
-        try Record(row: row)
+        try Record(row: _row)
     }
 }
 

Makefile

@@ -8,7 +8,7 @@
 # make distclean - Restore repository to a pristine state
 
 default: test
-smokeTest: test_framework_GRDBiOS_maxTarget test_framework_GRDBiOS_minTarget test_framework_SQLCipher4Encrypted test_framework_GRDBCustomSQLiteiOS_maxTarget test_SPM
+smokeTest: test_framework_GRDBiOS_maxTarget test_framework_GRDBiOS_minTarget test_framework_SQLCipher3 test_framework_SQLCipher4Encrypted test_framework_GRDBCustomSQLiteiOS_maxTarget test_SPM
 
 # Requirements
 # ============
@@ -478,10 +478,10 @@ ifdef JAZZY
 	  --author_url https://github.com/groue \
 	  --source-host github \
 	  --source-host-url https://github.com/groue/GRDB.swift \
-	  --source-host-files-url https://github.com/groue/GRDB.swift/tree/v6.0.0 \
-	  --module-version 6.0.0 \
+	  --source-host-files-url https://github.com/groue/GRDB.swift/tree/v6.1.0 \
+	  --module-version 6.1.0 \
 	  --module GRDB \
-	  --root-url http://groue.github.io/GRDB.swift/docs/6.0/ \
+	  --root-url http://groue.github.io/GRDB.swift/docs/6.1/ \
 	  --output Documentation/Reference \
 	  --swift-build-tool xcodebuild \
 	  --undocumented-text '' \