remove table name cache

Author: tanner0101

Package.swift

@@ -8,16 +8,16 @@ let package = Package(
     ],
     dependencies: [
         // 🌎 Utility package containing tools for byte manipulation, Codable, OS APIs, and debugging.
-        .package(url: "https://github.com/vapor/core.git", .branch("nio")),
+        .package(url: "https://github.com/vapor/core.git", .branch("master")),
 
         // 🔑 Hashing (BCrypt, SHA, HMAC, etc), encryption, and randomness.
-        .package(url: "https://github.com/vapor/crypto.git", .branch("nio")),
+        .package(url: "https://github.com/vapor/crypto.git", .branch("master")),
 
         // 🗄 Core services for creating database integrations.
-        .package(url: "https://github.com/vapor/database-kit.git", .branch("nio")),
+        .package(url: "https://github.com/vapor/database-kit.git", .branch("master")),
 
         // 📦 Dependency injection / inversion of control framework.
-        .package(url: "https://github.com/vapor/service.git", .branch("nio")),
+        .package(url: "https://github.com/vapor/service.git", .branch("master")),
 
         // Event-driven network application framework for high performance protocol servers & clients, non-blocking.
         .package(url: "https://github.com/apple/swift-nio.git", from: "1.0.0"),

Sources/PostgreSQL/Connection/PostgreSQLConnection+Query.swift

@@ -58,13 +58,7 @@ extension PostgreSQLConnection {
                 guard let row = currentRow else {
                     throw PostgreSQLError(identifier: "query", reason: "Unexpected PostgreSQLDataRow without preceding PostgreSQLRowDescription.", source: .capture())
                 }
-                print("before parse")
-                let parsed = try row.parse(
-                    data: data,
-                    formatCodes: resultFormat.formatCodes,
-                    tableNameCache: self.tableNameCache
-                )
-                print("after parse")
+                let parsed = try row.parse(data: data, formatCodes: resultFormat.formatCodes)
                 try onRow(parsed)
             case .close: break
             default: throw PostgreSQLError(identifier: "query", reason: "Unexpected message during PostgreSQLParseRequest: \(message)", source: .capture())

Sources/PostgreSQL/Connection/PostgreSQLConnection+SimpleQuery.swift

@@ -25,11 +25,7 @@ extension PostgreSQLConnection {
                 guard let row = currentRow else {
                     throw PostgreSQLError(identifier: "simpleQuery", reason: "Unexpected PostgreSQLDataRow without preceding PostgreSQLRowDescription.", source: .capture())
                 }
-                let parsed = try row.parse(
-                    data: data,
-                    formatCodes: row.fields.map { $0.formatCode },
-                    tableNameCache: self.tableNameCache
-                )
+                let parsed = try row.parse(data: data, formatCodes: row.fields.map { $0.formatCode })
                 onRow(parsed)
             case .close: break // query over, waiting for `readyForQuery`
             default: throw PostgreSQLError(identifier: "simpleQuery", reason: "Unexpected message during PostgreSQLQuery: \(message)", source: .capture())

Sources/PostgreSQL/Connection/PostgreSQLConnection.swift

@@ -17,9 +17,6 @@ public final class PostgreSQLConnection {
     /// If non-nil, will log queries.
     public var logger: PostgreSQLLogger?
 
-    /// Caches oid -> table name data.
-    internal var tableNameCache: PostgreSQLTableNameCache?
-
     /// Returns a new unique portal name.
     internal var nextPortalName: String {
         defer { uniqueNameCounter = uniqueNameCounter &+ 1 }

Sources/PostgreSQL/Data/PostgreSQLColumn.swift

@@ -1,24 +1,15 @@
 /// Represents a PostgreSQL column.
-public struct PostgreSQLColumn: Hashable {
-    /// See `Hashable.hashValue`
-    public var hashValue: Int {
-        return ((table ?? "_") + "." + name).hashValue
-    }
-    
+public struct PostgreSQLColumn: Hashable, Equatable {
     /// The table this column belongs to.
-    public var table: String?
+    public var tableOID: Int32
 
     /// The column's name.
     public var name: String
 }
 
 extension PostgreSQLColumn: CustomStringConvertible {
     public var description: String {
-        if let table = table {
-            return "\(table)(\(name))"
-        } else {
-            return "\(name)"
-        }
+        return "<\(tableOID)>.(\(name))"
     }
 }
 
@@ -35,50 +26,7 @@ extension Dictionary where Key == PostgreSQLColumn {
 
     /// Access a `Value` from this dictionary keyed by `PostgreSQLColumn`s
     /// using a field (column) name and entity (table) name.
-    public func value(forTable table: String, atColumn column: String) -> Value? {
-        return self[PostgreSQLColumn(table: table, name: column)]
-    }
-}
-
-import Async
-
-final class PostgreSQLTableNameCache {
-    var connection: Future<PostgreSQLConnection>
-    var cache: [Int32: String?]
-    var working: Bool
-
-    init(connection: Future<PostgreSQLConnection>) {
-        self.connection = connection
-        self.cache = [:]
-        self.working = false
-    }
-
-    func tableName(oid: Int32) throws -> String? {
-        if oid == 0 {
-            return nil
-        }
-
-        if working {
-            cache[oid] = "pg_class"
-            return "pg_class"
-        }
-        working = true
-        defer { working = false }
-        if let existing = cache[oid] {
-            return existing
-        } else {
-            let res = try connection
-                .wait()
-                .simpleQuery("select relname from pg_class where oid = \(oid)")
-                .wait()
-            let new: String?
-            if res.count > 0 {
-                new = try res[0].firstValue(forColumn: "relname")!.decode(String.self)
-            } else {
-                new = nil
-            }
-            cache[oid] = new
-            return new
-        }
+    public func value(forTableOID tableOID: Int32, atColumn column: String) -> Value? {
+        return self[PostgreSQLColumn(tableOID: tableOID, name: column)]
     }
 }

Sources/PostgreSQL/Database/PostgreSQLDatabase.swift

@@ -8,13 +8,9 @@ public final class PostgreSQLDatabase: Database {
     /// If non-nil, will log queries.
     public var logger: PostgreSQLLogger?
 
-    /// Caches oid -> table name data.
-    internal var tableNameCache: PostgreSQLTableNameCache?
-
     /// Creates a new `PostgreSQLDatabase`.
     public init(config: PostgreSQLDatabaseConfig, on worker: Worker) {
         self.config = config
-        self.tableNameCache = PostgreSQLTableNameCache(connection: makeConnection(on: worker))
     }
 
     /// See `Database.makeConnection()`
@@ -25,7 +21,6 @@ public final class PostgreSQLDatabase: Database {
                 print("[PostgreSQL] \(error)")
             }.flatMap(to: PostgreSQLConnection.self) { client in
                 client.logger = self.logger
-                client.tableNameCache = self.tableNameCache
                 return client.authenticate(
                     username: config.username,
                     database: config.database,

Sources/PostgreSQL/Message/PostgreSQLRowDescription.swift

@@ -22,22 +22,15 @@ struct PostgreSQLRowDescription: Decodable {
 extension PostgreSQLRowDescription {
     /// Parses a `PostgreSQLDataRow` using the metadata from this row description.
     /// Important to pass formatCodes in since the format codes in the field are likely not correct (if from a describe request)
-    public func parse(
-        data: PostgreSQLDataRow,
-        formatCodes: [PostgreSQLFormatCode],
-        tableNameCache: PostgreSQLTableNameCache?
-    ) throws -> [PostgreSQLColumn: PostgreSQLData] {
+    public func parse(data: PostgreSQLDataRow, formatCodes: [PostgreSQLFormatCode]) throws -> [PostgreSQLColumn: PostgreSQLData] {
         return try .init(uniqueKeysWithValues: fields.enumerated().map { (i, field) in
             let formatCode: PostgreSQLFormatCode
             switch formatCodes.count {
             case 0: formatCode = .text
             case 1: formatCode = formatCodes[0]
             default: formatCode = formatCodes[i]
             }
-            let key = try PostgreSQLColumn(
-                table: tableNameCache?.tableName(oid: field.tableObjectID),
-                name: field.name
-            )
+            let key = PostgreSQLColumn(tableOID: field.tableObjectID, name: field.name)
             let value = try data.columns[i].parse(dataType: field.dataType, format: formatCode)
             return (key, value)
         })

Sources/PostgreSQL/PostgreSQLProvider.swift

@@ -1,3 +1,4 @@
+import Async
 import Service
 
 /// Provides base `PostgreSQL` services such as database and connection.
@@ -19,7 +20,9 @@ public final class PostgreSQLProvider: Provider {
     }
 
     /// See `Provider.boot`
-    public func boot(_ worker: Container) throws { }
+    public func didBoot(_ worker: Container) throws -> Future<Void> {
+        return .done(on: worker)
+    }
 }
 
 /// MARK: Services
@@ -33,6 +36,6 @@ extension PostgreSQLDatabaseConfig: ServiceType {
 extension PostgreSQLDatabase: ServiceType {
     /// See `ServiceType.makeService(for:)`
     public static func makeService(for worker: Container) throws -> PostgreSQLDatabase {
-        return try .init(config: worker.make(for: PostgreSQLDatabase.self), on: worker)
+        return try .init(config: worker.make(), on: worker)
     }
 }

Tests/PostgreSQLTests/PostgreSQLConnectionTests.swift

@@ -342,34 +342,6 @@ class PostgreSQLConnectionTests: XCTestCase {
         _ = try categories.wait()
     }
 
-    func testTableNameCache() throws {
-        let hostname: String
-        #if Xcode
-        hostname = try Process.execute("docker-machine", "ip")
-        #else
-        hostname = "localhost"
-        #endif
-        let config = PostgreSQLDatabaseConfig.init(
-            hostname: hostname,
-            port: 5432,
-            username: "vapor_username",
-            database: "vapor_database",
-            password: nil
-        )
-        let main = MultiThreadedEventLoopGroup(numThreads: 1)
-        defer { try! main.syncShutdownGracefully() }
-        let sub = MultiThreadedEventLoopGroup(numThreads: 1)
-        defer { try! sub.syncShutdownGracefully() }
-
-        let database = PostgreSQLDatabase(config: config, on: main)
-        let client = try database.makeConnection(on: sub).wait()
-        let query = """
-        select * from "pg_type" where "typlen" = $1 or "typlen" = $2
-        """
-        let rows = try client.query(query, [1, 2]).wait()
-        XCTAssertEqual(rows[0].keys.first?.table, "pg_type")
-    }
-
     static var allTests = [
         ("testVersion", testVersion),
         ("testSelectTypes", testSelectTypes),
@@ -379,7 +351,6 @@ class PostgreSQLConnectionTests: XCTestCase {
         ("testStruct", testStruct),
         ("testNull", testNull),
         ("testGH24", testGH24),
-        ("testTableNameCache", testTableNameCache),
     ]
 }
 
@@ -388,7 +359,7 @@ extension PostgreSQLConnection {
     static func makeTest() throws -> PostgreSQLConnection {
         let hostname: String
         #if Xcode
-        hostname = try Process.execute("docker-machine", "ip")
+        hostname = (try? Process.execute("docker-machine", "ip")) ?? "192.168.99.100"
         #else
         hostname = "localhost"
         #endif