update Number class to handle integer values

core/dbt/clients/agate_helper.py

@@ -19,9 +19,21 @@ class Number(agate.data_types.Number):
     def cast(self, d):
         if type(d) == bool:
             raise agate.exceptions.CastError("Do not cast True to 1 or False to 0.")
+        # preserve integers as native Python int
+        elif type(d) == int:
+            return d
         else:
             return super().cast(d)
 
+    def jsonify(self, d):
+        if d is None:
+            return d
+        # do not cast integers to floats
+        elif type(d) == int:
+            return d
+
+        return float(d)
+
 
 class ISODateTime(agate.data_types.DateTime):
     def cast(self, d):

tests/functional/show/fixtures.py

@@ -2,6 +2,14 @@
 select * from {{ ref('sample_seed') }}
 """
 
+models__sample_number_model = """
+select
+  cast(1.0 as int) as float_to_int_field,
+  3.0 as float_field,
+  4.3 as float_with_dec_field,
+  5 as int_field
+"""
+
 models__second_model = """
 select
     sample_num as col_one,
@@ -75,10 +83,10 @@
 
 seeds__sample_seed = """sample_num,sample_bool
 1,true
-2,false
+2.0,false
 3,true
-4,false
+4.3,false
 5,true
-6,false
+6.5,false
 7,true
 """

tests/functional/show/test_show.py

@@ -6,6 +6,7 @@
     models__second_ephemeral_model,
     seeds__sample_seed,
     models__sample_model,
+    models__sample_number_model,
     models__second_model,
     models__ephemeral_model,
     schema_yml,
@@ -19,6 +20,7 @@ class TestShow:
     def models(self):
         return {
             "sample_model.sql": models__sample_model,
+            "sample_number_model.sql": models__sample_number_model,
             "second_model.sql": models__second_model,
             "ephemeral_model.sql": models__ephemeral_model,
             "sql_header.sql": models__sql_header,
@@ -62,6 +64,19 @@ def test_select_single_model_json(self, project):
         assert "sample_num" in log_output
         assert "sample_bool" in log_output
 
+    def test_numeric_values(self, project):
+        run_dbt(["build"])
+        (results, log_output) = run_dbt_and_capture(
+            ["show", "--select", "sample_number_model", "--output", "json"]
+        )
+        assert "Previewing node 'sample_number_model'" not in log_output
+        assert "1.0" not in log_output
+        assert "1" in log_output
+        assert "3.0" in log_output
+        assert "4.3" in log_output
+        assert "5" in log_output
+        assert "5.0" not in log_output
+
     def test_inline_pass(self, project):
         run_dbt(["build"])
         (results, log_output) = run_dbt_and_capture(