Merge pull request #76 from green-energy-trading/fix-numeric-with-lea…

…ding-zero-fractional Fix numeric with leading zero fractional
vapor-community · May 22, 2018 · 1d23662 · 1d23662
2 parents 16f64dd + 536842e
commit 1d23662
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Sources/PostgreSQL/Bind/BinaryUtils.swift b/Sources/PostgreSQL/Bind/BinaryUtils.swift
@@ -175,7 +175,7 @@ struct BinaryUtils {
             digits = (0..<numberOfDigits).map { BinaryUtils.parseInt16(value: value.advanced(by: 8 + $0 * 2)) }
         }
 
-        private func getDigit(atIndex index: Int) -> String {
+        private func getDigit(atIndex index: Int, fractional: Bool = false) -> String {
             let int16: Int16
             if index >= 0 && index < numberOfDigits {
                 int16 = digits[index]
@@ -184,7 +184,7 @@ struct BinaryUtils {
             }
             let stringDigits = String(int16)
 
-            guard index != 0 else {
+            if (index == 0 && !fractional) {
                 return stringDigits
             }
 
@@ -302,7 +302,7 @@ struct BinaryUtils {
             let decimalIndex = string.endIndex
 
             for _ in stride(from: 0, to: dscale, by: Numeric.decDigits) {
-                string += getDigit(atIndex: digitIndex)
+                string += getDigit(atIndex: digitIndex, fractional: true)
                 digitIndex += 1
             }
 

diff --git a/Tests/PostgreSQLTests/PostgreSQLTests.swift b/Tests/PostgreSQLTests/PostgreSQLTests.swift
@@ -281,6 +281,7 @@ class PostgreSQLTests: XCTestCase {
         let rows: [String] = [
             "0",
             "0.1",
+            "10.08",
             "-0.123",
             "123",
             "456.7891412341",