Merge pull request #102 from laughingman7743/fix_decimal_type_format

Fix parameter format of Decimal type

Author: laughingman7743

pyathenajdbc/formatter.py

@@ -72,6 +72,10 @@ def _format_seq(formatter, escaper, val):
     return "({0})".format(", ".join(results))
 
 
+def _format_decimal(formatter, escaper, val):
+    return "DECIMAL {0}".format(escaper("{0:f}".format(val)))
+
+
 class ParameterFormatter(object):
     def __init__(self):
         self.mappings = _DEFAULT_FORMATTERS
@@ -119,7 +123,7 @@ def register_formatter(self, type_, formatter):
     int: _format_default,
     float: _format_default,
     long: _format_default,
-    Decimal: _format_default,
+    Decimal: _format_decimal,
     bool: _format_bool,
     str: _format_str,
     unicode: _format_str,

pyathenajdbc/util.py

@@ -6,11 +6,13 @@
 from datetime import datetime
 
 
-def as_pandas(cursor):
+def as_pandas(cursor, coerce_float=False):
     from pandas import DataFrame
 
     names = [metadata[0] for metadata in cursor.description]
-    return DataFrame.from_records(cursor.fetchall(), columns=names)
+    return DataFrame.from_records(
+        cursor.fetchall(), columns=names, coerce_float=coerce_float
+    )
 
 
 def synchronized(wrapped):

tests/test_cursor.py

@@ -216,6 +216,11 @@ def test_unicode(self, cursor):
         cursor.execute("SELECT %(param)s FROM one_row", {"param": unicode_str})
         self.assertEqual(cursor.fetchall(), [(unicode_str,)])
 
+    @with_cursor
+    def test_decimal(self, cursor):
+        cursor.execute("SELECT %(decimal)s", {"decimal": Decimal("0.00000000001")})
+        self.assertEqual(cursor.fetchall(), [(Decimal("0.00000000001"),)])
+
     @with_cursor
     def test_null(self, cursor):
         cursor.execute("SELECT null FROM many_rows")

tests/test_formatter.py

@@ -172,7 +172,7 @@ def test_format_decimal(self):
             """
             SELECT *
             FROM test_table
-            WHERE col_decimal <= 0.0000000001
+            WHERE col_decimal <= DECIMAL '0.0000000001'
             """
         ).strip()
 
@@ -181,7 +181,7 @@ def test_format_decimal(self):
                 """
                 SELECT *
                 FROM test_table
-                WHERE col_decimal <= %(param).10f
+                WHERE col_decimal <= %(param)s
                 """
             ).strip(),
             {"param": Decimal("0.0000000001")},
@@ -364,7 +364,7 @@ def test_format_decimal_list(self):
             """
             SELECT *
             FROM test_table
-            WHERE col_decimal IN (0.0000000001, 99.9999999999)
+            WHERE col_decimal IN (DECIMAL '0.0000000001', DECIMAL '99.9999999999')
             """
         ).strip()