Swift 5: public public, index(of:) => firstIndex(of:)

Seems to compile fine now.

Author: helje5

Sources/ZeeQL/Access/ActiveRecord.swift

@@ -41,11 +41,9 @@ public protocol DatabaseBoundObject {
 
 public extension ActiveRecordType { // default imp
 
-  public func value(forKey k: String) -> Any? {
+  func value(forKey k: String) -> Any? {
     // first check extra properties
-    if let v = values[k] {
-      return v
-    }
+    if let v = values[k] { return v }
 
     // then fallback to KVC
     if let v = KeyValueCoding.defaultValue(forKey: k, inObject: self) {
@@ -58,7 +56,7 @@ public extension ActiveRecordType { // default imp
 
   // MARK: - Convenience Subscripts
 
-  public subscript(key: String) -> Any? {
+  subscript(key: String) -> Any? {
     set {
       do {
         if let v = newValue { // hm, necessary?
@@ -78,12 +76,12 @@ public extension ActiveRecordType { // default imp
     }
   }
 
-  public subscript(int key: String) -> Int? {
+  subscript(int key: String) -> Int? {
     guard let v = self[key] else { return nil }
     if let i = v as? Int { return i }
     return Int("\(v)")
   }
-  public subscript(string key: String) -> String? {
+  subscript(string key: String) -> String? {
     guard let v = self[key] else { return nil }
     if let i = v as? String { return i }
     return "\(v)"
@@ -272,12 +270,15 @@ open class ActiveRecord : ActiveRecordType, SmartDescription {
     }
   }
   public func removeObject(_ o: AnyObject, fromPropertyWithKey key: String) {
-    if var list = values[key] as? [ AnyObject ] {
-      if let idx = list.index(where: { $0 === o }) {
-        list.remove(at: idx)
-        values[key] = [ list ]
-      }
-    }
+    guard var list = values[key] as? [ AnyObject ] else { return }
+    #if swift(>=5)
+      guard let idx = list.firstIndex(where: { $0 === o }) else { return }
+    #else
+      guard let idx = list.index(where: { $0 === o }) else { return }
+    #endif
+    
+    list.remove(at: idx)
+    values[key] = [ list ]
   }
 
 

Sources/ZeeQL/Access/Adaptor.swift

@@ -92,8 +92,8 @@ public extension Adaptor {
 
 public extension Adaptor { // AdaptorQueryType
 
-  public func querySQL(_ sql: String, _ optAttrs : [ Attribute ]? = nil,
-                       cb: ( AdaptorRecord ) throws -> Void) throws
+  func querySQL(_ sql: String, _ optAttrs : [ Attribute ]? = nil,
+                cb: ( AdaptorRecord ) throws -> Void) throws
   {
     let ch = try openChannelFromPool()
     defer { releaseChannel(ch) }
@@ -102,7 +102,7 @@ public extension Adaptor { // AdaptorQueryType
   }
 
   @discardableResult
-  public func performSQL(_ sql: String) throws -> Int {
+  func performSQL(_ sql: String) throws -> Int {
     let ch = try openChannelFromPool()
     defer { releaseChannel(ch) }
 

Sources/ZeeQL/Access/AdaptorChannel.swift

@@ -301,10 +301,10 @@ public extension AdaptorChannel {
    *   - qualifier: the qualifier used to select the rows to be locked
    *   - snapshot:  a set of keys/values specifying a row to be locked
    */
-  public func lockRowComparingAttributes(_ attrs     : [ Attribute ]?,
-                                         _ entity    : Entity,
-                                         _ qualifier : Qualifier?,
-                                         _ snapshot  : AdaptorRow?) throws
+  func lockRowComparingAttributes(_ attrs     : [ Attribute ]?,
+                                  _ entity    : Entity,
+                                  _ qualifier : Qualifier?,
+                                  _ snapshot  : AdaptorRow?) throws
               -> Bool
   {
     let q  = snapshot != nil ? qualifierToMatchAllValues(snapshot!) : nil
@@ -339,11 +339,11 @@ public extension AdaptorChannel {
    *   - lock:  whether the SELECT should include a HOLD LOCK
    *   - e:     the entity (usually the table) to be fetched
    */
-  public func selectAttributes(_ attrs : [ Attribute ]?,
-                               _ fs    : FetchSpecification?,
-                             lock    : Bool,
-                             _ e     : Entity?,
-                             result  : ( AdaptorRecord ) throws -> Void) throws
+  func selectAttributes(_ attrs : [ Attribute ]?,
+                        _ fs    : FetchSpecification?,
+                        lock    : Bool,
+                        _ e     : Entity?,
+                        result  : ( AdaptorRecord ) throws -> Void) throws
   {
     /* This is called by the DatabaseChannel
      *   selectObjectsWithFetchSpecification(fs)
@@ -444,7 +444,6 @@ public extension AdaptorChannel {
    *   - entity:    the entity which should be updated
    * - returns: number of affected rows or -1 on error
    */
-  public
   func updateValuesInRowsDescribedByQualifier(_ values    : [ String: Any? ],
                                               _ qualifier : Qualifier,
                                               _ entity    : Entity) throws
@@ -455,8 +454,8 @@ public extension AdaptorChannel {
     return try evaluateUpdateExpression(expr)
   }
 
-  public func deleteRowsDescribedByQualifier(_ q: Qualifier, _ e: Entity) throws
-              -> Int
+  func deleteRowsDescribedByQualifier(_ q: Qualifier, _ e: Entity) throws
+       -> Int
   {
     let expr = expressionFactory.deleteStatementWithQualifier(q, e)
     return try evaluateUpdateExpression(expr)
@@ -471,9 +470,8 @@ public extension AdaptorChannel {
    *   - entity:    the entity which contains the row
    * - returns:     true if exactly one row was deleted, false otherwise
    */
-  public func deleteRowDescribedByQualifier(_ qualifier : Qualifier,
-                                            _ entity    : Entity) throws
-              -> Bool
+  func deleteRowDescribedByQualifier(_ qualifier: Qualifier, _ entity: Entity)
+         throws -> Bool
   {
     return try deleteRowsDescribedByQualifier(qualifier, entity) == 1
   }
@@ -495,16 +493,14 @@ public extension AdaptorChannel {
    *                 entity are being refetched. Requires the entity!
    * - returns:  the record, potentially refetched and updated
    */
-  public func insertRow(_ row: AdaptorRow, _ entity: Entity?,
-                        refetchAll: Bool)
-                throws -> AdaptorRow
+  func insertRow(_ row: AdaptorRow, _ entity: Entity?, refetchAll: Bool)
+         throws -> AdaptorRow
   {
     return try defaultInsertRow(row, entity, refetchAll: refetchAll)
   }
 
-  public func defaultInsertRow(_ row: AdaptorRow, _ entity: Entity?,
-                               refetchAll: Bool)
-                throws -> AdaptorRow
+  func defaultInsertRow(_ row: AdaptorRow, _ entity: Entity?, refetchAll: Bool)
+         throws -> AdaptorRow
   {
     // So that we can reuse the default implementation ...
     if refetchAll && entity == nil {
@@ -545,8 +541,8 @@ public extension AdaptorChannel {
    *   - entity: optionally an entity representing the table
    * - returns:  the record, potentially refetched and updated
    */
-  public func insertRow(_ row: AdaptorRow, _ entity: Entity? = nil) throws
-              -> AdaptorRow
+  func insertRow(_ row: AdaptorRow, _ entity: Entity? = nil)
+         throws -> AdaptorRow
   {
     return try insertRow(row, entity, refetchAll: entity != nil)
   }

Sources/ZeeQL/Access/AdaptorModelFetch.swift

@@ -43,7 +43,7 @@ public extension AdaptorModelFetch { // default imp
 
   // MARK: - Model fetch
 
-  public func fetchModel() throws -> Model {
+  func fetchModel() throws -> Model {
     // simple version first. We may be able to do better :-)
     // TODO: include in Entity whether it was a view
     // Note: Looks like we cannot UNION PRAGMA table_info statements.
@@ -72,9 +72,7 @@ public extension AdaptorModelFetch { // default imp
    * Check whether the schema changed since the tag which is being passed in.
    * If it didn't change, return nil, if it did change, return the new tag.
    */
-  public func didChangeSinceModelTag(_ tag: ModelTag?) throws
-              -> ModelTag?
-  {
+  func didChangeSinceModelTag(_ tag: ModelTag?) throws -> ModelTag? {
     // the idea behind this is that sometimes there may be a faster way to
     // compare partial tags.
     guard let tag = tag else { return try fetchModelTag() }
@@ -89,8 +87,8 @@ public extension AdaptorModelFetch { // default imp
     return try describeModelWithTableNames(names, tagged: true)
   }
 
-  public func describeModelWithTableNames(_ names : [ String ],
-                                          tagged  : Bool = true) throws -> Model
+  func describeModelWithTableNames(_ names : [ String ],
+                                   tagged  : Bool = true) throws -> Model
   {
     let didOpenTX = !channel.isTransactionInProgress
     if didOpenTX { try channel.begin() }

Sources/ZeeQL/Access/AdaptorQueryType.swift

@@ -45,8 +45,8 @@ public extension AdaptorQueryType {
    *
    * TODO: document use of attributes.
    */
-  public func querySQL(_ sql: String, _ optAttrs: [ Attribute ]?) throws
-              -> [ AdaptorRecord ]
+  func querySQL(_ sql: String, _ optAttrs: [ Attribute ]?)
+         throws -> [ AdaptorRecord ]
   {
     var results = [ AdaptorRecord ]()
     try querySQL(sql, optAttrs) { results.append($0) }
@@ -56,7 +56,7 @@ public extension AdaptorQueryType {
   /**
    * Execute the raw SQL and return the results as an array of `AdaptorRecord`s.
    */
-  public func querySQL(_ sql: String) throws -> [ AdaptorRecord ] {
+  func querySQL(_ sql: String) throws -> [ AdaptorRecord ] {
     var results = [ AdaptorRecord ]()
     try querySQL(sql, nil) { results.append($0) }
     return results
@@ -65,9 +65,7 @@ public extension AdaptorQueryType {
   /**
    * Execute the raw SQL and call the result callback for every record returned.
    */
-  public func querySQL(_ sql: String, cb: ( AdaptorRecord ) throws -> Void)
-                throws
-  {
+  func querySQL(_ sql: String, cb: ( AdaptorRecord ) throws -> Void) throws {
     try querySQL(sql, nil, cb: cb)
   }
 }

Sources/ZeeQL/Access/AdaptorRecord.swift

@@ -20,7 +20,13 @@ open class AdaptorRecord : SwiftObject, SmartDescription {
   public var isEmpty : Bool { return values.isEmpty }
 
   public subscript(name: String) -> Any? {
-    guard let idx = schema.attributeNames.index(of: name) else { return nil }
+    #if swift(>=5)
+      guard let idx = schema.attributeNames.firstIndex(of: name) else {
+        return nil
+      }
+    #else
+      guard let idx = schema.attributeNames.index(of: name) else { return nil }
+    #endif
     guard idx < values.count else { return nil }
     return values[idx]
   }

Sources/ZeeQL/Access/AdaptorRecordSchema.swift

@@ -18,11 +18,9 @@ public protocol AdaptorRecordSchema : class, SmartDescription {
 
 public extension AdaptorRecordSchema {
 
-  public var descriptionPrefix : String {
-    return "pschema"
-  }
+  var descriptionPrefix : String { return "pschema" }
 
-  public func appendToDescription(_ ms: inout String) {
+  func appendToDescription(_ ms: inout String) {
     if let attrs = attributes {
       ms += " attrs="
       ms += attrs.map { $0.name }.joined(separator: ",")
@@ -82,7 +80,13 @@ public final class AdaptorRecordSchemaWithNames : AdaptorRecordSchema {
 
   @discardableResult
   public func switchKey(_ oldKey: String, to newKey: String) -> Bool {
-    guard let index = attributeNames.index(of: oldKey) else { return false }
+    #if swift(>=5)
+      guard let index = attributeNames.firstIndex(of: oldKey) else {
+        return false
+      }
+    #else
+      guard let index = attributeNames.index(of: oldKey) else { return false }
+    #endif
     attributeNames[index] = newKey
     return true
   }

Sources/ZeeQL/Access/Attribute.swift

@@ -72,25 +72,25 @@ public extension Attribute { // default imp
 
   // MARK: - Property
 
-  public var relationshipPath : String? { // for flattened properties
+  var relationshipPath : String? { // for flattened properties
     return nil
   }
 
   // MARK: - SQLValue
 
-  public func valueFor(SQLExpression context: SQLExpression) -> String {
+  func valueFor(SQLExpression context: SQLExpression) -> String {
     return context.sqlStringFor(schemaObjectName: columnName ?? name)
   }
 
   // MARK: - ExpressionEvaluation
 
-  public func valueFor(object: Any?) -> Any? {
+  func valueFor(object: Any?) -> Any? {
     return KeyValueCoding.value(forKeyPath: name, inObject: object)
   }
 
   // MARK: - Description
 
-  public func appendToDescription(_ ms: inout String) {
+  func appendToDescription(_ ms: inout String) {
     if isPattern { ms += " pattern" }
 
     ms += " \(name)"
@@ -374,7 +374,7 @@ public protocol AttributeValue {
 
 public extension AttributeValue {
   static var isOptional : Bool { return false }
-  public static func shouldUseBindVariable(for attribute: Attribute) -> Bool {
+  static func shouldUseBindVariable(for attribute: Attribute) -> Bool {
     return false
   }
 

Sources/ZeeQL/Access/Codable/CodableModel.swift

@@ -11,7 +11,7 @@ public extension Model {
   // This has all those dupes, because we want to capture the full static type.
   // It is a little stupid, but hey, type safety!
 
-  public typealias CodableOptions = CodableModelDecoder.Options
+  typealias CodableOptions = CodableModelDecoder.Options
 
   // MARK: - Decodable
 

Sources/ZeeQL/Access/Codable/EntityPropertyReflectionContainer.swift

@@ -540,8 +540,8 @@
      *     var addresses : [ Address ]
      *
      */
-    internal struct EntityCollectionPropertyReflectionContainer<EntityType: Decodable>
-                      : UnkeyedDecodingContainer
+    struct EntityCollectionPropertyReflectionContainer<EntityType: Decodable>
+           : UnkeyedDecodingContainer
     {
       // This has to live in a different file due to the Xcode 9 compile error
       let log          : ZeeQLLogger
@@ -640,14 +640,28 @@
         defer {
           // unregister if something failed
           if !didWorkOut, let rs = rsToRemove {
-            if let idx = sourceEntity.relationships.index(where: { $0 === rs } )
-            {
+            #if swift(>=5)
+              let optIdx = sourceEntity.relationships
+                           .firstIndex(where: { $0 === rs } )
+            #else
+              let optIdx = sourceEntity.relationships
+                           .index(where: { $0 === rs } )
+            #endif
+            if let idx = optIdx {
               sourceEntity.relationships.remove(at: idx)
-              if let cpn = sourceEntity.classPropertyNames,
-                 let idx = cpn.index(where: { $0 == name } )
-              {
-                sourceEntity.classPropertyNames?.remove(at: idx)
-              }
+              #if swift(>=5)
+                if let cpn = sourceEntity.classPropertyNames,
+                   let idx = cpn.firstIndex(where: { $0 == name } )
+                {
+                  sourceEntity.classPropertyNames?.remove(at: idx)
+                }
+              #else
+                if let cpn = sourceEntity.classPropertyNames,
+                   let idx = cpn.index(where: { $0 == name } )
+                {
+                  sourceEntity.classPropertyNames?.remove(at: idx)
+                }
+              #endif
             }
           }
         }