Merge pull request #16 from maciejtrybilo/fixBool

Fix reading boolean values.
vapor-community · Oct 18, 2016 · 35e1e00 · 35e1e00
2 parents 7b372ed + bd882ab
commit 35e1e00
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/.swift-version b/.swift-version
diff --git a/Sources/PostgreSQL/Node+Oid.swift b/Sources/PostgreSQL/Node+Oid.swift
@@ -33,7 +33,7 @@ extension Node {
 		case .float4, .float8, .numeric:
 			self = .number(.double(Double(value) ?? 0))
 		case .bool:
-			self = .bool((value == "true") ? true : false)
+			self = .bool((value == "t") ? true : false)
 		case .unknown:
 			self = .null
 		}

diff --git a/Tests/PostgreSQLTests/PostgreSQLTests.swift b/Tests/PostgreSQLTests/PostgreSQLTests.swift
@@ -36,28 +36,31 @@ class PostgreSQLTests: XCTestCase {
     func testTables() {
         do {
             try postgreSQL.execute("DROP TABLE IF EXISTS foo")
-            try postgreSQL.execute("CREATE TABLE foo (bar INT, baz VARCHAR(16))")
-            try postgreSQL.execute("INSERT INTO foo VALUES (42, 'Life')")
-            try postgreSQL.execute("INSERT INTO foo VALUES (1337, 'Elite')")
-            try postgreSQL.execute("INSERT INTO foo VALUES (9, NULL)")
+            try postgreSQL.execute("CREATE TABLE foo (bar INT, baz VARCHAR(16), bla BOOLEAN)")
+            try postgreSQL.execute("INSERT INTO foo VALUES (42, 'Life', true)")
+            try postgreSQL.execute("INSERT INTO foo VALUES (1337, 'Elite', false)")
+            try postgreSQL.execute("INSERT INTO foo VALUES (9, NULL, true)")
 
             if let resultBar = try postgreSQL.execute("SELECT * FROM foo WHERE bar = 42").first {
                 XCTAssertEqual(resultBar["bar"]?.int, 42)
                 XCTAssertEqual(resultBar["baz"]?.string, "Life")
+                XCTAssertEqual(resultBar["bla"]?.bool, true)
             } else {
                 XCTFail("Could not get bar result")
             }
 
             if let resultBaz = try postgreSQL.execute("SELECT * FROM foo where baz = 'Elite'").first {
                 XCTAssertEqual(resultBaz["bar"]?.int, 1337)
                 XCTAssertEqual(resultBaz["baz"]?.string, "Elite")
+                XCTAssertEqual(resultBaz["bla"]?.bool, false)
             } else {
                 XCTFail("Could not get baz result")
             }
 
             if let resultBaz = try postgreSQL.execute("SELECT * FROM foo where bar = 9").first {
                 XCTAssertEqual(resultBaz["bar"]?.int, 9)
                 XCTAssertEqual(resultBaz["baz"]?.string, nil)
+                XCTAssertEqual(resultBaz["bla"]?.bool, true)
             } else {
                 XCTFail("Could not get null result")
             }