Merge branch 'main' into add-server-side-params-for-thrift

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.5.0a1
+current_version = 1.7.0a1
 parse = (?P<major>[\d]+) # major version number
 	\.(?P<minor>[\d]+) # minor version number
 	\.(?P<patch>[\d]+) # patch version number

.changes/0.0.0.md

@@ -1,5 +1,7 @@
 ## Previous Releases
 For information on prior major and minor releases, see their changelogs:
+- [1.6](https://github.com/dbt-labs/dbt-spark/blob/1.6.latest/CHANGELOG.md)
+- [1.5](https://github.com/dbt-labs/dbt-spark/blob/1.5.latest/CHANGELOG.md)
 - [1.4](https://github.com/dbt-labs/dbt-spark/blob/1.4.latest/CHANGELOG.md)
 - [1.3](https://github.com/dbt-labs/dbt-spark/blob/1.3.latest/CHANGELOG.md)
 - [1.2](https://github.com/dbt-labs/dbt-spark/blob/1.2.latest/CHANGELOG.md)

.changes/unreleased/Dependencies-20230424-230630.yaml

@@ -0,0 +1,6 @@
+kind: "Dependencies"
+body: "Update tox requirement from ~=3.0 to ~=4.5"
+time: 2023-04-24T23:06:30.00000Z
+custom:
+  Author: dependabot[bot]
+  PR: 741

.changes/unreleased/Dependencies-20230424-230645.yaml

@@ -0,0 +1,6 @@
+kind: "Dependencies"
+body: "Update pyodbc requirement from ~=4.0.30 to ~=4.0.39"
+time: 2023-04-24T23:06:45.00000Z
+custom:
+  Author: dependabot[bot]
+  PR: 742

.changes/unreleased/Dependencies-20230501-231003.yaml

@@ -0,0 +1,6 @@
+kind: "Dependencies"
+body: "Update pre-commit requirement from ~=2.21 to ~=3.3"
+time: 2023-05-01T23:10:03.00000Z
+custom:
+  Author: dependabot[bot]
+  PR: 748

.changes/unreleased/Dependencies-20230501-231035.yaml

@@ -0,0 +1,6 @@
+kind: "Dependencies"
+body: "Update types-requests requirement from ~=2.28 to ~=2.29"
+time: 2023-05-01T23:10:35.00000Z
+custom:
+  Author: dependabot[bot]
+  PR: 749

.changes/unreleased/Dependencies-20230510-230725.yaml

@@ -0,0 +1,6 @@
+kind: "Dependencies"
+body: "Bump mypy from 1.2.0 to 1.3.0"
+time: 2023-05-10T23:07:25.00000Z
+custom:
+  Author: dependabot[bot]
+  PR: 768

.changes/unreleased/Dependencies-20230803-224622.yaml

@@ -0,0 +1,6 @@
+kind: "Dependencies"
+body: "Update flake8 requirement from ~=6.0 to ~=6.1"
+time: 2023-08-03T22:46:22.00000Z
+custom:
+  Author: dependabot[bot]
+  PR: 849

.changes/unreleased/Dependencies-20230803-224626.yaml

@@ -0,0 +1,6 @@
+kind: "Dependencies"
+body: "Update pytest-xdist requirement from ~=3.2 to ~=3.3"
+time: 2023-08-03T22:46:26.00000Z
+custom:
+  Author: dependabot[bot]
+  PR: 851

.changes/unreleased/Dependencies-20230803-224629.yaml

@@ -0,0 +1,6 @@
+kind: "Dependencies"
+body: "Update pytest requirement from ~=7.3 to ~=7.4"
+time: 2023-08-03T22:46:29.00000Z
+custom:
+  Author: dependabot[bot]
+  PR: 852

.changes/unreleased/Dependencies-20230804-225232.yaml

@@ -0,0 +1,6 @@
+kind: "Dependencies"
+body: "Update pip-tools requirement from ~=6.13 to ~=7.2"
+time: 2023-08-04T22:52:32.00000Z
+custom:
+  Author: dependabot[bot]
+  PR: 856

.changes/unreleased/Dependencies-20230804-225243.yaml

@@ -0,0 +1,6 @@
+kind: "Dependencies"
+body: "Update wheel requirement from ~=0.40 to ~=0.41"
+time: 2023-08-04T22:52:43.00000Z
+custom:
+  Author: dependabot[bot]
+  PR: 858

.changes/unreleased/Dependencies-20230807-221033.yaml

@@ -0,0 +1,6 @@
+kind: "Dependencies"
+body: "Bump mypy from 1.3.0 to 1.4.1"
+time: 2023-08-07T22:10:33.00000Z
+custom:
+  Author: dependabot[bot]
+  PR: 860

.changes/unreleased/Dependencies-20230807-221037.yaml

@@ -0,0 +1,6 @@
+kind: "Dependencies"
+body: "Update tox requirement from ~=4.5 to ~=4.6"
+time: 2023-08-07T22:10:37.00000Z
+custom:
+  Author: dependabot[bot]
+  PR: 861

.changes/unreleased/Dependencies-20230809-043913.yaml

@@ -0,0 +1,6 @@
+kind: "Dependencies"
+body: "Update pip-tools requirement from ~=7.2 to ~=7.3"
+time: 2023-08-09T04:39:13.00000Z
+custom:
+  Author: dependabot[bot]
+  PR: 863

.changes/unreleased/Dependencies-20230811-221135.yaml

@@ -0,0 +1,6 @@
+kind: "Dependencies"
+body: "Update tox requirement from ~=4.6 to ~=4.7"
+time: 2023-08-11T22:11:35.00000Z
+custom:
+  Author: dependabot[bot]
+  PR: 867

.changes/unreleased/Dependencies-20230814-224754.yaml

@@ -0,0 +1,6 @@
+kind: "Dependencies"
+body: "Update tox requirement from ~=4.7 to ~=4.8"
+time: 2023-08-14T22:47:54.00000Z
+custom:
+  Author: dependabot[bot]
+  PR: 871

.changes/unreleased/Dependencies-20230814-224757.yaml

@@ -0,0 +1,6 @@
+kind: "Dependencies"
+body: "Bump mypy from 1.4.1 to 1.5.0"
+time: 2023-08-14T22:47:57.00000Z
+custom:
+  Author: dependabot[bot]
+  PR: 872

.changes/unreleased/Features-20230707-104150.yaml

@@ -0,0 +1,6 @@
+kind: Features
+body: Support server_side_parameters for Spark session connection method
+time: 2023-07-07T10:41:50.01541+02:00
+custom:
+  Author: alarocca-apixio
+  Issue: "690"

.changes/unreleased/Features-20230707-113337.yaml

@@ -0,0 +1,6 @@
+kind: Features
+body: Add server_side_parameters to HTTP connection method
+time: 2023-07-07T11:33:37.794112+02:00
+custom:
+  Author: Fokko,JCZuurmond
+  Issue: "824"

.changes/unreleased/Features-20230707-114650.yaml

@@ -0,0 +1,6 @@
+kind: Features
+body: Enforce server side parameters keys and values to be strings
+time: 2023-07-07T11:46:50.390918+02:00
+custom:
+  Author: Fokko,JCZuurmond
+  Issue: "826"

.changes/unreleased/Features-20230707-135442.yaml

@@ -0,0 +1,6 @@
+kind: Features
+body: Add SessionConnectionWrapper
+time: 2023-07-07T13:54:42.41341+02:00
+custom:
+  Author: Fokko
+  Issue: "829"

.changes/unreleased/Fixes-20230517-142331.yaml

@@ -0,0 +1,6 @@
+kind: Fixes
+body: Wrap AnalysisException into DbtRuntimeError
+time: 2023-05-17T14:23:31.263799+02:00
+custom:
+  Author: Fokko
+  Issue: "782"

.changes/unreleased/Fixes-20230810-014122.yaml

@@ -0,0 +1,6 @@
+kind: Fixes
+body: include tblproperties macro in adapters.sql create table
+time: 2023-08-10T01:41:22.782982+08:00
+custom:
+  Author: etheleon
+  Issue: "865"

.changes/unreleased/Under the Hood-20230724-165508.yaml

@@ -0,0 +1,6 @@
+kind: Under the Hood
+body: Update stale workflow to use centralized version
+time: 2023-07-24T16:55:08.096947-04:00
+custom:
+  Author: mikealfare
+  Issue: "842"

.circleci/config.yml

@@ -10,23 +10,25 @@ jobs:
       - checkout
       - run: tox -e flake8,unit
 
+# Turning off for now due to flaky runs of tests will turn back on at later date.
   integration-spark-session:
-    environment:
-      DBT_INVOCATION_ENV: circle
-    docker:
-      - image: godatadriven/pyspark:3.1
-    steps:
-      - checkout
-      - run: apt-get update
-      - run: python3 -m pip install --upgrade pip
-      - run: apt-get install -y git gcc g++ unixodbc-dev libsasl2-dev
-      - run: python3 -m pip install tox
-      - run:
-          name: Run integration tests
-          command: tox -e integration-spark-session
-          no_output_timeout: 1h
-      - store_artifacts:
-          path: ./logs
+     environment:
+       DBT_INVOCATION_ENV: circle
+     docker:
+       - image: godatadriven/pyspark:3.1
+     steps:
+       - checkout
+       - run: apt-get update
+       - run: conda install python=3.10
+       - run: python3 -m pip install --upgrade pip
+       - run: apt-get install -y git gcc g++ unixodbc-dev libsasl2-dev libxml2-dev libxslt-dev
+       - run: python3 -m pip install tox
+       - run:
+           name: Run integration tests
+           command: tox -e integration-spark-session
+           no_output_timeout: 1h
+       - store_artifacts:
+           path: ./logs
 
   integration-spark-thrift:
     environment:

.flake8

@@ -4,9 +4,11 @@ select =
     W
     F
 ignore =
-    W503 # makes Flake8 work like black
-    W504
-    E203 # makes Flake8 work like black
-    E741
-    E501
+    # makes Flake8 work like black
+    W503,
+    W504,
+    # makes Flake8 work like black
+    E203,
+    E741,
+    E501,
 exclude = test

.github/CODEOWNERS

@@ -0,0 +1,3 @@
+# This codeowners file is used to ensure all PRs require reviews from the adapters team
+
+* @dbt-labs/core-adapters

.github/pull_request_template.md

@@ -1,26 +1,35 @@
 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-spark/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 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-spark/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

.github/scripts/update_dependencies.sh

@@ -0,0 +1,15 @@
+#!/bin/bash -e
+set -e
+
+git_branch=$1
+target_req_file="dev-requirements.txt"
+core_req_sed_pattern="s|dbt-core.git.*#egg=dbt-core|dbt-core.git@${git_branch}#egg=dbt-core|g"
+tests_req_sed_pattern="s|dbt-core.git.*#egg=dbt-tests|dbt-core.git@${git_branch}#egg=dbt-tests|g"
+if [[ "$OSTYPE" == darwin* ]]; then
+ # mac ships with a different version of sed that requires a delimiter arg
+ sed -i "" "$core_req_sed_pattern" $target_req_file
+ sed -i "" "$tests_req_sed_pattern" $target_req_file
+else
+ sed -i "$core_req_sed_pattern" $target_req_file
+ sed -i "$tests_req_sed_pattern" $target_req_file
+fi

.github/workflows/backport.yml

@@ -37,6 +37,6 @@ jobs:
       github.event.pull_request.merged
       && contains(github.event.label.name, 'backport')
     steps:
-      - uses: tibdex/backport@v2.0.2
+      - uses: tibdex/backport@v2
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/bot-changelog.yml

@@ -49,7 +49,7 @@ jobs:
     - name: Create and commit changelog on bot PR
       if: ${{ contains(github.event.pull_request.labels.*.name, matrix.label) }}
       id: bot_changelog
-      uses: emmyoop/changie_bot@v1.0.1
+      uses: emmyoop/changie_bot@v1
       with:
         GITHUB_TOKEN: ${{ secrets.FISHTOWN_BOT_PAT }}
         commit_author_name: "Github Build Bot"

.github/workflows/cut-release-branch.yml

@@ -0,0 +1,42 @@
+# **what?**
+# Calls a centralize3d workflow that will:
+# 1. Cut a new branch (generally `*.latest`)
+# 2. Also cleans up all files in `.changes/unreleased` and `.changes/previous version on
+# `main` and bumps `main` to the input version.
+
+# **why?**
+# Generally reduces the workload of engineers and reduces error.  Allow automation.
+
+# **when?**
+# This will run when called manually.
+
+name: Cut new release branch
+
+on:
+  workflow_dispatch:
+    inputs:
+      version_to_bump_main:
+        description: 'The alpha version main should bump to (ex. 1.6.0a1)'
+        required: true
+      new_branch_name:
+        description: 'The full name of the new branch (ex. 1.5.latest)'
+        required: true
+
+defaults:
+  run:
+    shell: bash
+
+permissions:
+  contents: write
+
+jobs:
+  cut_branch:
+    name: "Cut branch and clean up main for dbt-spark"
+    uses: dbt-labs/actions/.github/workflows/cut-release-branch.yml@main
+    with:
+      version_to_bump_main: ${{ inputs.version_to_bump_main }}
+      new_branch_name: ${{ inputs.new_branch_name }}
+      PR_title: "Cleanup main after cutting new ${{ inputs.new_branch_name }} branch"
+      PR_body: "This PR will fail CI until the dbt-core PR has been merged due to release version conflicts."
+    secrets:
+      FISHTOWN_BOT_PAT: ${{ secrets.FISHTOWN_BOT_PAT }}

.github/workflows/jira-creation.yml

@@ -19,7 +19,9 @@ permissions:
 
 jobs:
   call-label-action:
-    uses: dbt-labs/jira-actions/.github/workflows/jira-creation.yml@main
+    uses: dbt-labs/actions/.github/workflows/jira-creation.yml@main
+    with:
+      project_key: ADAP
     secrets:
       JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
       JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}