Merge branch 'main' into override_list_relations_without_caching

.changes/unreleased/Dependencies-20230703-190419.yaml

@@ -0,0 +1,6 @@
+kind: "Dependencies"
+body: "Update pip-tools requirement from ~=6.13 to ~=6.14"
+time: 2023-07-03T19:04:19.00000Z
+custom:
+  Author: dependabot[bot]
+  PR: 517

.changes/unreleased/Fixes-20230706-001056.yaml

@@ -0,0 +1,6 @@
+kind: Fixes
+body: Fix regression in redshift-connector==2.0.912
+time: 2023-07-06T00:10:56.337407-04:00
+custom:
+  Author: mikealfare
+  Issue: "518"

.changes/unreleased/Fixes-20230706-012233.yaml

@@ -0,0 +1,6 @@
+kind: Fixes
+body: Fixed unit test that broke following dbt clone work
+time: 2023-07-06T01:22:33.840137-04:00
+custom:
+  Author: mikealfare
+  Issue: "518"

.changes/unreleased/Fixes-20230706-123329.yaml

@@ -0,0 +1,6 @@
+kind: Fixes
+body: cast the port as an int
+time: 2023-07-06T12:33:29.799921-07:00
+custom:
+  Author: jiezhen-chen
+  Issue: "518"

dbt/adapters/redshift/connections.py

@@ -184,7 +184,7 @@ def get_connect_method(self):
         kwargs = {
             "host": self.credentials.host,
             "database": self.credentials.database,
-            "port": self.credentials.port if self.credentials.port else 5439,
+            "port": int(self.credentials.port) if self.credentials.port else int(5439),
             "auto_create": self.credentials.autocreate,
             "db_groups": self.credentials.db_groups,
             "region": self.credentials.region,

dev-requirements.txt

@@ -14,7 +14,7 @@ flaky~=3.7
 freezegun~=1.2
 ipdb~=0.13.13
 mypy==1.4.1  # patch updates have historically introduced breaking changes
-pip-tools~=6.13
+pip-tools~=6.14
 pre-commit~=3.3
 pre-commit-hooks~=4.4
 pytest~=7.4

tests/unit/test_context.py

@@ -147,6 +147,7 @@ def mock_model():
         raw_sql="",
         description="",
         columns={},
+        defer_relation=None,
     )