Merge branch 'main' into feature/materialized-views/ADAP-608

.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"

.github/pull_request_template.md

@@ -1,26 +1,35 @@
-resolves #
+resolves #  
+[docs](https://github.com/dbt-labs/docs.getdbt.com/issues/new/choose) dbt-labs/docs.getdbt.com/#  
 
 <!---
   Include the number of the issue addressed by this PR above if applicable.
   PRs for code changes without an associated issue *will not be merged*.
   See CONTRIBUTING.md for more information.
 
-  Example:
-    resolves #1234
+  Include the number of the docs issue that was opened for this PR. If
+  this change has no user-facing implications, "N/A" suffices instead. New
+  docs tickets can be created by clicking the link above or by going to
+  https://github.com/dbt-labs/docs.getdbt.com/issues/new/choose.
 -->
 
-### Description
+### Problem
 
 <!---
-  Describe the Pull Request here. Add any references and info to help reviewers
-  understand your changes. Include any tradeoffs you considered.
+  Describe the problem this PR is solving. What is the application state
+  before this PR is merged?
+-->
+
+### Solution
+
+<!---
+  Describe the way this PR solves the above problem. Add as much detail as you
+  can to help reviewers understand your changes. Include any alternatives and
+  tradeoffs you considered.
 -->
 
 ### Checklist
 
-- [ ] I have read [the contributing guide](https://github.com/dbt-labs/dbt-redshift/blob/main/CONTRIBUTING.md) and understand what's expected of me
-- [ ] I have signed the [CLA](https://docs.getdbt.com/docs/contributor-license-agreements)
-- [ ] I have run this code in development and it appears to resolve the stated issue
+- [ ] I have read [the contributing guide](https://github.com/dbt-labs/dbt-core/blob/main/CONTRIBUTING.md) and understand what's expected of me  
+- [ ] I have run this code in development and it appears to resolve the stated issue  
 - [ ] This PR includes tests, or tests are not required/relevant for this PR
-- [ ] I have [opened an issue to add/update docs](https://github.com/dbt-labs/docs.getdbt.com/issues/new/choose), or docs changes are not required/relevant for this PR
-- [ ] I have run `changie new` to [create a changelog entry](https://github.com/dbt-labs/dbt-redshift/blob/main/CONTRIBUTING.md#Adding-CHANGELOG-Entry)
+- [ ] This PR has no interface changes (e.g. macros, cli, logs, json artifacts, config files, adapter interface, etc) or this PR has already received feedback and approval from Product or DX

dbt/adapters/redshift/connections.py

@@ -180,7 +180,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,
     )