Skip to content

Commit

Permalink
Support new agate Integer data_type in adapter code (#9004)
Browse files Browse the repository at this point in the history
Add test for empty seed file with only headers
  • Loading branch information
gshank committed Nov 7, 2023
1 parent 839c720 commit 46b9a1d
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 0 deletions.
6 changes: 6 additions & 0 deletions .changes/unreleased/Fixes-20231031-144837.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
kind: Fixes
body: Fix compilation exception running empty seed file and support new Integer agate data_type
time: 2023-10-31T14:48:37.774871-04:00
custom:
Author: gshank
Issue: "8895"
13 changes: 13 additions & 0 deletions core/dbt/adapters/base/impl.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
get_column_value_uncased,
merge_tables,
table_from_rows,
Integer,
)
from dbt.clients.jinja import MacroGenerator
from dbt.contracts.graph.manifest import Manifest, MacroManifest
Expand Down Expand Up @@ -962,6 +963,17 @@ def convert_number_type(cls, agate_table: agate.Table, col_idx: int) -> str:
"""
raise NotImplementedError("`convert_number_type` is not implemented for this adapter!")

@classmethod
def convert_integer_type(cls, agate_table: agate.Table, col_idx: int) -> str:
"""Return the type in the database that best maps to the agate.Number
type for the given agate table and column index.
:param agate_table: The table
:param col_idx: The index into the agate table for the column.
:return: The name of the type in the database
"""
return "integer"

@classmethod
@abc.abstractmethod
def convert_boolean_type(cls, agate_table: agate.Table, col_idx: int) -> str:
Expand Down Expand Up @@ -1019,6 +1031,7 @@ def convert_type(cls, agate_table: agate.Table, col_idx: int) -> Optional[str]:
def convert_agate_type(cls, agate_table: agate.Table, col_idx: int) -> Optional[str]:
agate_type: Type = agate_table.column_types[col_idx]
conversions: List[Tuple[Type, Callable[..., str]]] = [
(Integer, cls.convert_integer_type),
(agate.Text, cls.convert_text_type),
(agate.Number, cls.convert_number_type),
(agate.Boolean, cls.convert_boolean_type),
Expand Down
4 changes: 4 additions & 0 deletions core/dbt/adapters/sql/impl.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@ def convert_number_type(cls, agate_table: agate.Table, col_idx: int) -> str:
decimals = agate_table.aggregate(agate.MaxPrecision(col_idx)) # type: ignore[attr-defined]
return "float8" if decimals else "integer"

@classmethod
def convert_integer_type(cls, agate_table: agate.Table, col_idx: int) -> str:
return "integer"

@classmethod
def convert_boolean_type(cls, agate_table: agate.Table, col_idx: int) -> str:
return "boolean"
Expand Down
23 changes: 23 additions & 0 deletions tests/adapter/dbt/tests/adapter/simple_seed/test_seed.py
Original file line number Diff line number Diff line change
Expand Up @@ -365,3 +365,26 @@ def seeds(self, test_data_dir):
def test_simple_seed(self, project):
results = run_dbt(["seed"])
assert len(results) == 3


class BaseTestEmptySeed:
@pytest.fixture(scope="class")
def project_config_update(self):
return {
"seeds": {
"quote_columns": False,
},
}

@pytest.fixture(scope="class")
def seeds(self):
return {"empty_with_header.csv": "a,b,c"}

def test_empty_seeds(self, project):
# Should create an empty table and not fail
results = run_dbt(["seed"])
assert len(results) == 1


class TestEmptySeed(BaseTestEmptySeed):
pass
3 changes: 3 additions & 0 deletions tests/unit/mock_adapter.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ def convert_text_type(self, *args, **kwargs):
def convert_number_type(self, *args, **kwargs):
return self.responder.convert_number_type(*args, **kwargs)

def convert_integer_type(self, *args, **kwargs):
return self.responder.convert_integer_type(*args, **kwargs)

def convert_boolean_type(self, *args, **kwargs):
return self.responder.convert_boolean_type(*args, **kwargs)

Expand Down

0 comments on commit 46b9a1d

Please sign in to comment.