vsscanf() based date string parser

GRDB.xcodeproj/project.pbxproj

@@ -259,6 +259,7 @@
 		566B91331FA4D3810012D5B0 /* TransactionObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566B91321FA4D3810012D5B0 /* TransactionObserver.swift */; };
 		566B91361FA4D3810012D5B0 /* TransactionObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566B91321FA4D3810012D5B0 /* TransactionObserver.swift */; };
 		566B91391FA4D3810012D5B0 /* TransactionObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566B91321FA4D3810012D5B0 /* TransactionObserver.swift */; };
+		56707201208A509C006AD95A /* DateParsingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 567071FA208A509C006AD95A /* DateParsingTests.swift */; };
 		567156181CB142AA007DC145 /* DatabaseQueueReadOnlyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 567156151CB142AA007DC145 /* DatabaseQueueReadOnlyTests.swift */; };
 		5671FC201DA3CAC9003BF4FF /* FTS3TokenizerDescriptor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5671FC1F1DA3CAC9003BF4FF /* FTS3TokenizerDescriptor.swift */; };
 		5671FC231DA3CAC9003BF4FF /* FTS3TokenizerDescriptor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5671FC1F1DA3CAC9003BF4FF /* FTS3TokenizerDescriptor.swift */; };
@@ -625,6 +626,9 @@
 		56FF455A1D2CDA5200F21EF9 /* RecordUniqueIndexTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56FF45551D2CDA5200F21EF9 /* RecordUniqueIndexTests.swift */; };
 		6340BF801E5E3F7900832805 /* RecordPersistenceConflictPolicy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6340BF7F1E5E3F7900832805 /* RecordPersistenceConflictPolicy.swift */; };
 		6340BF841E5E3F7900832805 /* RecordPersistenceConflictPolicy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6340BF7F1E5E3F7900832805 /* RecordPersistenceConflictPolicy.swift */; };
+		C96C0F2B2084A442006B2981 /* SQLiteDateParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = C96C0F242084A442006B2981 /* SQLiteDateParser.swift */; };
+		C96C0F2C2084A459006B2981 /* SQLiteDateParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = C96C0F242084A442006B2981 /* SQLiteDateParser.swift */; };
+		C96C0F2D2084A45A006B2981 /* SQLiteDateParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = C96C0F242084A442006B2981 /* SQLiteDateParser.swift */; };
 		DC2393C81ABE35F8003FF113 /* GRDB-Bridging.h in Headers */ = {isa = PBXBuildFile; fileRef = DC2393C61ABE35F8003FF113 /* GRDB-Bridging.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DC3773F919C8CBB3004FCF85 /* GRDB.h in Headers */ = {isa = PBXBuildFile; fileRef = DC3773F819C8CBB3004FCF85 /* GRDB.h */; settings = {ATTRIBUTES = (Public, ); }; };
 /* End PBXBuildFile section */
@@ -840,6 +844,7 @@
 		566B91221FA4CF810012D5B0 /* Database+Schema.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Database+Schema.swift"; sourceTree = "<group>"; };
 		566B912A1FA4D0CC0012D5B0 /* StatementAuthorizer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatementAuthorizer.swift; sourceTree = "<group>"; };
 		566B91321FA4D3810012D5B0 /* TransactionObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransactionObserver.swift; sourceTree = "<group>"; };
+		567071FA208A509C006AD95A /* DateParsingTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DateParsingTests.swift; sourceTree = "<group>"; };
 		567156151CB142AA007DC145 /* DatabaseQueueReadOnlyTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DatabaseQueueReadOnlyTests.swift; sourceTree = "<group>"; };
 		567156701CB18050007DC145 /* EncryptionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EncryptionTests.swift; sourceTree = "<group>"; };
 		5671FC1F1DA3CAC9003BF4FF /* FTS3TokenizerDescriptor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FTS3TokenizerDescriptor.swift; sourceTree = "<group>"; };
@@ -1028,6 +1033,7 @@
 		56FF453F1D2C23BA00F21EF9 /* MutablePersistableDeleteTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MutablePersistableDeleteTests.swift; sourceTree = "<group>"; };
 		56FF45551D2CDA5200F21EF9 /* RecordUniqueIndexTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RecordUniqueIndexTests.swift; sourceTree = "<group>"; };
 		6340BF7F1E5E3F7900832805 /* RecordPersistenceConflictPolicy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RecordPersistenceConflictPolicy.swift; sourceTree = "<group>"; };
+		C96C0F242084A442006B2981 /* SQLiteDateParser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SQLiteDateParser.swift; sourceTree = "<group>"; };
 		DC2393C61ABE35F8003FF113 /* GRDB-Bridging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GRDB-Bridging.h"; sourceTree = "<group>"; };
 		DC3773F319C8CBB3004FCF85 /* GRDB.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = GRDB.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		DC3773F719C8CBB3004FCF85 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -1135,6 +1141,7 @@
 				5605F1521C672E4000235C62 /* NSString.swift */,
 				5657AB0E1D10899D006283EF /* URL.swift */,
 				56A8C22F1D1914540096E9D4 /* UUID.swift */,
+				C96C0F242084A442006B2981 /* SQLiteDateParser.swift */,
 			);
 			path = Foundation;
 			sourceTree = "<group>";
@@ -1569,6 +1576,7 @@
 				56DE7B361C42BBBB00861EB8 /* PerformanceCoreDataTests.sqlite */,
 				56DE7B2D1C42B23B00861EB8 /* PerformanceModel.xcdatamodeld */,
 				563363F81C960711000BE133 /* PerformanceRealmTests.realm */,
+				567071FA208A509C006AD95A /* DateParsingTests.swift */,
 				56DE7B271C41302500861EB8 /* FetchNamedValuesTests.swift */,
 				56DE7B291C4130AF00861EB8 /* FetchPositionalValuesTests.swift */,
 				56DE7B2B1C41311900861EB8 /* FetchRecordClassTests.swift */,
@@ -2131,6 +2139,7 @@
 			files = (
 				56D3BE711F4EB1A00034C6D2 /* FetchRecordStructTests.swift in Sources */,
 				560C98231C0E23BB00BF8471 /* InsertRecordClassTests.swift in Sources */,
+				56707201208A509C006AD95A /* DateParsingTests.swift in Sources */,
 				56DE7B2C1C41311900861EB8 /* FetchRecordClassTests.swift in Sources */,
 				56DE7B281C41302500861EB8 /* FetchNamedValuesTests.swift in Sources */,
 				56D507831F6D7B2E00AE1C5B /* InsertRecordStructTests.swift in Sources */,
@@ -2195,6 +2204,7 @@
 				565490D91D5AE252005622CB /* Migration.swift in Sources */,
 				56CEB5001EAA2F4D00BFAF62 /* FTS3.swift in Sources */,
 				5698AD271DABAEFA0056AF8C /* FTS5WrapperTokenizer.swift in Sources */,
+				C96C0F2D2084A45A006B2981 /* SQLiteDateParser.swift in Sources */,
 				566A841C2041146100E50BFD /* DatabaseSnapshot.swift in Sources */,
 				565490D51D5AE252005622CB /* DatabaseValueConvertible+RawRepresentable.swift in Sources */,
 				565490C51D5AE236005622CB /* SerializedDatabase.swift in Sources */,
@@ -2360,6 +2370,7 @@
 				56D1215D1ED34978001347D2 /* Fixits-0.109.0.swift in Sources */,
 				566AD8B51D5318F4002EC1A8 /* TableDefinition.swift in Sources */,
 				5698AD241DABAEFA0056AF8C /* FTS5WrapperTokenizer.swift in Sources */,
+				C96C0F2C2084A459006B2981 /* SQLiteDateParser.swift in Sources */,
 				5605F1681C672E4000235C62 /* NSNumber.swift in Sources */,
 				56CEB5041EAA2F4D00BFAF62 /* FTS4.swift in Sources */,
 				5605F1741C672E4000235C62 /* StandardLibrary.swift in Sources */,
@@ -2762,6 +2773,7 @@
 				5698AD211DABAEFA0056AF8C /* FTS5WrapperTokenizer.swift in Sources */,
 				56A238831B9C75030082EB20 /* DatabaseQueue.swift in Sources */,
 				5605F1671C672E4000235C62 /* NSNumber.swift in Sources */,
+				C96C0F2B2084A442006B2981 /* SQLiteDateParser.swift in Sources */,
 				56A238871B9C75030082EB20 /* Row.swift in Sources */,
 				5605F1731C672E4000235C62 /* StandardLibrary.swift in Sources */,
 				567517C820131B220094BF41 /* RecordBox.swift in Sources */,

GRDB.xcodeproj/xcshareddata/xcschemes/GRDBOSXPerformanceTests.xcscheme

@@ -10,6 +10,7 @@
       buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -30,6 +31,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

GRDB/Core/Support/Foundation/DatabaseDateComponents.swift

@@ -1,8 +1,13 @@
 import Foundation
+#if SWIFT_PACKAGE
+    import CSQLite
+#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+    import SQLite3
+#endif
 
 /// DatabaseDateComponents reads and stores DateComponents in the database.
-public struct DatabaseDateComponents : DatabaseValueConvertible {
-    
+public struct DatabaseDateComponents : DatabaseValueConvertible, StatementColumnConvertible {
+
     /// The available formats for reading and storing date components.
     public enum Format : String {
 
@@ -68,6 +73,22 @@ public struct DatabaseDateComponents : DatabaseValueConvertible {
         self.dateComponents = dateComponents
     }
 
+    // MARK: - StatementColumnConvertible adoption
+
+    /// Returns a value initialized from a raw SQLite statement pointer.
+    ///
+    /// - parameters:
+    ///     - sqliteStatement: A pointer to an SQLite statement.
+    ///     - index: The column index.
+    public init(sqliteStatement: SQLiteStatement, index: Int32) {
+        let cString = UnsafePointer<Int8>(OpaquePointer(sqlite3_column_text(sqliteStatement, index)!))
+        let length = Int(sqlite3_column_bytes(sqliteStatement, index)) // avoid an strlen
+        guard let components = SQLiteDateParser().components(cString: cString, length: length) else {
+            fatalError("could not convert database value \(String(cString: cString)) to DatabaseDateComponents")
+        }
+        self.dateComponents = components.dateComponents
+        self.format = components.format
+    }
 
     // MARK: - DatabaseValueConvertible adoption
 
@@ -131,158 +152,6 @@ public struct DatabaseDateComponents : DatabaseValueConvertible {
             return nil
         }
 
-        var dateComponents = DateComponents()
-        let scanner = Scanner(string: string)
-        scanner.charactersToBeSkipped = CharacterSet()
-
-        let hasDate: Bool
-
-        // YYYY or HH
-        var initialNumber: Int = 0
-        if !scanner.scanInt(&initialNumber) {
-            return nil
-        }
-        switch scanner.scanLocation {
-        case 2:
-            // HH
-            hasDate = false
-
-            let hour = initialNumber
-            if hour >= 0 && hour <= 23 {
-                dateComponents.hour = hour
-            } else {
-                return nil
-            }
-
-        case 4:
-            // YYYY
-            hasDate = true
-
-            let year = initialNumber
-            if year >= 0 && year <= 9999 {
-                dateComponents.year = year
-            } else {
-                return nil
-            }
-
-            // -
-            if !scanner.scanString("-", into: nil) {
-                return nil
-            }
-
-            // MM
-            var month: Int = 0
-            if scanner.scanInt(&month) && month >= 1 && month <= 12 {
-                dateComponents.month = month
-            } else {
-                return nil
-            }
-
-            // -
-            if !scanner.scanString("-", into: nil) {
-                return nil
-            }
-
-            // DD
-            var day: Int = 0
-            if scanner.scanInt(&day) && day >= 1 && day <= 31 {
-                dateComponents.day = day
-            } else {
-                return nil
-            }
-
-            // YYYY-MM-DD
-            if scanner.isAtEnd {
-                return DatabaseDateComponents(dateComponents, format: .YMD)
-            }
-
-            // T/space
-            if !scanner.scanString("T", into: nil) && !scanner.scanString(" ", into: nil) {
-                return nil
-            }
-
-            // HH
-            var hour: Int = 0
-            if scanner.scanInt(&hour) && hour >= 0 && hour <= 23 {
-                dateComponents.hour = hour
-            } else {
-                return nil
-            }
-
-        default:
-            return nil
-        }
-
-        // :
-        if !scanner.scanString(":", into: nil) {
-            return nil
-        }
-
-        // MM
-        var minute: Int = 0
-        if scanner.scanInt(&minute) && minute >= 0 && minute <= 59 {
-            dateComponents.minute = minute
-        } else {
-            return nil
-        }
-
-        // [YYYY-MM-DD] HH:MM
-        if scanner.isAtEnd {
-            if hasDate {
-                return DatabaseDateComponents(dateComponents, format: .YMD_HM)
-            } else {
-                return DatabaseDateComponents(dateComponents, format: .HM)
-            }
-        }
-
-        // :
-        if !scanner.scanString(":", into: nil) {
-            return nil
-        }
-
-        // SS
-        var second: Int = 0
-        if scanner.scanInt(&second) && second >= 0 && second <= 59 {
-            dateComponents.second = second
-        } else {
-            return nil
-        }
-
-        // [YYYY-MM-DD] HH:MM:SS
-        if scanner.isAtEnd {
-            if hasDate {
-                return DatabaseDateComponents(dateComponents, format: .YMD_HMS)
-            } else {
-                return DatabaseDateComponents(dateComponents, format: .HMS)
-            }
-        }
-
-        // .
-        if !scanner.scanString(".", into: nil) {
-            return nil
-        }
-
-        // SSS
-        var millisecondDigits: NSString? = nil
-        if scanner.scanCharacters(from: .decimalDigits, into: &millisecondDigits), var millisecondDigits = millisecondDigits {
-            if millisecondDigits.length > 3 {
-                millisecondDigits = NSString(string: millisecondDigits.substring(to: 3))
-            }
-            dateComponents.nanosecond = millisecondDigits.integerValue * 1_000_000
-        } else {
-            return nil
-        }
-
-        // [YYYY-MM-DD] HH:MM:SS.SSS
-        if scanner.isAtEnd {
-            if hasDate {
-                return DatabaseDateComponents(dateComponents, format: .YMD_HMSS)
-            } else {
-                return DatabaseDateComponents(dateComponents, format: .HMSS)
-            }
-        }
-
-        // Unknown format
-        return nil
+        return SQLiteDateParser().components(from: string)
     }
 }

GRDB/Core/Support/Foundation/Date.swift

@@ -1,4 +1,9 @@
 import Foundation
+#if SWIFT_PACKAGE
+    import CSQLite
+#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+    import SQLite3
+#endif
 
 /// NSDate is stored in the database using the format
 /// "yyyy-MM-dd HH:mm:ss.SSS", in the UTC time zone.
@@ -108,6 +113,31 @@ extension Date : DatabaseValueConvertible {
     }
 }
 
+extension Date: StatementColumnConvertible {
+
+    /// Returns a value initialized from a raw SQLite statement pointer.
+    ///
+    /// - parameters:
+    ///     - sqliteStatement: A pointer to an SQLite statement.
+    ///     - index: The column index.
+    public init(sqliteStatement: SQLiteStatement, index: Int32) {
+        switch sqlite3_column_type(sqliteStatement, index) {
+        case SQLITE_INTEGER, SQLITE_FLOAT:
+            self.init(timeIntervalSince1970: sqlite3_column_double(sqliteStatement, Int32(index)))
+        case SQLITE_TEXT:
+            let databaseDateComponents = DatabaseDateComponents(sqliteStatement: sqliteStatement, index: index)
+            guard let date = Date(databaseDateComponents: databaseDateComponents) else {
+                let dbValue = DatabaseValue(sqliteStatement: sqliteStatement, index: index)
+                fatalError("could not convert database value \(dbValue) to Date")
+            }
+            self.init(timeIntervalSinceReferenceDate: date.timeIntervalSinceReferenceDate)
+        default:
+            let dbValue = DatabaseValue(sqliteStatement: sqliteStatement, index: index)
+            fatalError("could not convert database value \(dbValue) to Date")
+        }
+    }
+}
+
 /// The DatabaseDate date formatter for stored dates.
 private let storageDateFormatter: DateFormatter = {
     let formatter = DateFormatter()