From 7bc071dd72f946cd49823f07be3415cddecee71c Mon Sep 17 00:00:00 2001 From: Gerda Shank Date: Wed, 30 Aug 2023 18:02:44 -0400 Subject: [PATCH] Remove import of FieldEncoder from hologram (#592) * Remove import of FieldEncoder from hologram * Update Fixes-20230830-164611.yaml --------- Co-authored-by: colin-rogers-dbt <111200756+colin-rogers-dbt@users.noreply.github.com> (cherry picked from commit e95685fc78f3af5f6c27c672ead473d90f2a3a29) --- .changes/unreleased/Fixes-20230830-164611.yaml | 6 ++++++ dbt/adapters/redshift/connections.py | 16 ++-------------- 2 files changed, 8 insertions(+), 14 deletions(-) create mode 100644 .changes/unreleased/Fixes-20230830-164611.yaml diff --git a/.changes/unreleased/Fixes-20230830-164611.yaml b/.changes/unreleased/Fixes-20230830-164611.yaml new file mode 100644 index 000000000..ba8d47c01 --- /dev/null +++ b/.changes/unreleased/Fixes-20230830-164611.yaml @@ -0,0 +1,6 @@ +kind: Fixes +body: Fix to support removal of hologram, remove unused IAMDuration encoder +time: 2023-08-30T16:46:11.83975-04:00 +custom: + Author: gshank + Issue: "591" diff --git a/dbt/adapters/redshift/connections.py b/dbt/adapters/redshift/connections.py index 500de430f..83d05b587 100644 --- a/dbt/adapters/redshift/connections.py +++ b/dbt/adapters/redshift/connections.py @@ -1,7 +1,7 @@ import re from multiprocessing import Lock from contextlib import contextmanager -from typing import NewType, Tuple, Union, Optional, List +from typing import Tuple, Union, Optional, List from dataclasses import dataclass, field import agate @@ -12,7 +12,7 @@ from dbt.adapters.sql import SQLConnectionManager from dbt.contracts.connection import AdapterResponse, Connection, Credentials from dbt.contracts.util import Replaceable -from dbt.dataclass_schema import FieldEncoder, dbtClassMixin, StrEnum, ValidationError +from dbt.dataclass_schema import dbtClassMixin, StrEnum, ValidationError from dbt.events import AdapterLogger from dbt.exceptions import DbtRuntimeError, CompilationError import dbt.flags @@ -36,18 +36,6 @@ def get_message(self) -> str: drop_lock: Lock = dbt.flags.MP_CONTEXT.Lock() # type: ignore -IAMDuration = NewType("IAMDuration", int) - - -class IAMDurationEncoder(FieldEncoder): - @property - def json_schema(self): - return {"type": "integer", "minimum": 0, "maximum": 65535} - - -dbtClassMixin.register_field_encoders({IAMDuration: IAMDurationEncoder()}) - - class RedshiftConnectionMethod(StrEnum): DATABASE = "database" IAM = "iam"