From 940defd0024816f48180c3b8ffa6202470085798 Mon Sep 17 00:00:00 2001
From: Matthew McKnight <91097623+McKnight-42@users.noreply.github.com>
Date: Fri, 25 Mar 2022 14:26:14 -0500
Subject: [PATCH] Mcknight/backport 58 (#89)

* backporting #80 to unstick releases for adapters

* updating dev_requirements and commenting out lines in main.yaml

* adding backport of pr#58 to get rid of testing error based on pr #4512 in dbt-core

* uncommenting to see if we can make pointers of local install and tox install the same

* testing if tox change is all thats needed

* tests failed proving the addition is needed as backport #58

* trying out removal of dbt-core-ref install

* remove white-space

* remove whitespace

* remove trailing whitespace on main.yml
---
 .github/workflows/integration.yml | 10 +---------
 .github/workflows/main.yml        |  8 --------
 CHANGELOG.md                      |  8 ++++++++
 dev_requirements.txt              |  4 ++--
 tests/unit/utils.py               |  2 +-
 5 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 32df2d3ee..9ec57ae6b 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -159,14 +159,6 @@ jobs:
           pip --version
           tox --version
 
-      - name: Install dbt-core latest
-        run: |
-          pip install "git+https://github.com/dbt-labs/dbt-core.git#egg=dbt-core&subdirectory=core"
-
-      - name: Install dbt-postgres latest
-        run: |
-          pip install "git+https://github.com/dbt-labs/dbt-core.git#egg=dbt-postgres&subdirectory=plugins/postgres"
-
       - name: Run tox (redshift)
         if: matrix.adapter == 'redshift'
         env:
@@ -219,7 +211,7 @@ jobs:
 
   slack-results:
     runs-on: ubuntu-latest
-    needs: test 
+    needs: test
     if: always()
 
     steps:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8026befda..598df6397 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -101,14 +101,6 @@ jobs:
           pip --version
           tox --version
 
-      - name: Install dbt-core latest
-        run: |
-          pip install "git+https://github.com/dbt-labs/dbt-core.git#egg=dbt-core&subdirectory=core"
-
-      - name: Install dbt-postgres latest
-        run: |
-          pip install "git+https://github.com/dbt-labs/dbt-core.git#egg=dbt-postgres&subdirectory=plugins/postgres"
-
       - name: Run tox
         run: tox
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79c89375a..c7980050f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## dbt-redshift 1.0.1 (TBD)
+
+### Fixes
+
+### Under the hood
+- install compatible branch of dbt-core in unit/integration tests based on merge target ([#80](https://github.com/dbt-labs/dbt-redshift/pull/80))
+- Fix test related to preventing coercion of boolean values (True,False) to numeric values (0,1) in query results ([#58](https://github.com/dbt-labs/dbt-redshift/blob/1.0.latest/CHANGELOG.md))
+
 ## dbt-redshift 1.0.0 (December 3, 2021)
 
 ## dbt-redshift 1.0.0rc2 (November 24, 2021)
diff --git a/dev_requirements.txt b/dev_requirements.txt
index 8bc97c2ce..1211ad993 100644
--- a/dev_requirements.txt
+++ b/dev_requirements.txt
@@ -1,7 +1,7 @@
 # install latest changes in dbt-core + dbt-postgres
 # TODO: how to switch from HEAD to x.y.latest branches after minor releases?
-git+https://github.com/dbt-labs/dbt-core.git#egg=dbt-core&subdirectory=core
-git+https://github.com/dbt-labs/dbt-core.git#egg=dbt-postgres&subdirectory=plugins/postgres
+git+https://github.com/dbt-labs/dbt-core.git@1.0.latest#egg=dbt-core&subdirectory=core
+git+https://github.com/dbt-labs/dbt-core.git@1.0.latest#egg=dbt-postgres&subdirectory=plugins/postgres
 
 bumpversion
 flake8
diff --git a/tests/unit/utils.py b/tests/unit/utils.py
index 68d0fc33f..a7ab7c565 100644
--- a/tests/unit/utils.py
+++ b/tests/unit/utils.py
@@ -253,7 +253,7 @@ def _get_tester_for(self, column_type):
             return agate.TimeDelta()
 
         for instance in agate_helper.DEFAULT_TYPE_TESTER._possible_types:
-            if type(instance) is column_type:
+            if isinstance(instance, column_type):
                 return instance
 
         raise ValueError(f'no tester for {column_type}')