diff --git a/.github/workflows/Linux.yml b/.github/workflows/Linux.yml index 4889db75..bf60dfe5 100644 --- a/.github/workflows/Linux.yml +++ b/.github/workflows/Linux.yml @@ -8,26 +8,21 @@ defaults: shell: bash jobs: - linux: - name: Linux Release + linux-tests-postgres: + name: Run tests on Linux runs-on: ubuntu-latest container: ${{ matrix.container }} strategy: matrix: # Add commits/tags to build against other DuckDB versions duckdb_version: [ '' ] - arch: ['linux_amd64', 'linux_arm64', 'linux_amd64_gcc4'] + arch: ['linux_amd64_gcc4'] vcpkg_version: [ '2023.04.15' ] include: - arch: 'linux_amd64_gcc4' container: 'quay.io/pypa/manylinux2014_x86_64' vcpkg_triplet: 'x64-linux' - - arch: 'linux_amd64' - container: 'ubuntu:18.04' - vcpkg_triplet: 'x64-linux' - - arch: 'linux_arm64' - container: 'ubuntu:18.04' - vcpkg_triplet: 'arm64-linux' + env: VCPKG_TARGET_TRIPLET: ${{ matrix.vcpkg_triplet }} GEN: Ninja @@ -110,6 +105,8 @@ jobs: - name: Test extension if: ${{ matrix.arch == 'linux_amd64_gcc4' }} + env: + POSTGRES_TEST_DATABASE_AVAILABLE: 1 run: | psql -c "SELECT 43" source ./create-postgres-tables.sh diff --git a/.github/workflows/MacOS.yml b/.github/workflows/MacOS.yml deleted file mode 100644 index 2e689063..00000000 --- a/.github/workflows/MacOS.yml +++ /dev/null @@ -1,73 +0,0 @@ -name: MacOS -on: [push, pull_request,repository_dispatch] -concurrency: - group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref || '' }}-${{ github.base_ref || '' }}-${{ github.ref != 'refs/heads/main' || github.sha }} - cancel-in-progress: true -defaults: - run: - shell: bash - -jobs: - macos: - name: MacOS Release (${{ matrix.osx_build_arch }}) - runs-on: macos-latest - strategy: - matrix: - # Add commits/tags to build against other DuckDB versions - duckdb_version: [ '' ] - vcpkg_version: [ '2023.04.15' ] - vcpkg_triplet: [ 'x64-osx', 'arm64-osx' ] - include: - - vcpkg_triplet: 'x64-osx' - osx_build_arch: 'x86_64' - duckdb_arch: 'osx_amd64' - - vcpkg_triplet: 'arm64-osx' - osx_build_arch: 'arm64' - duckdb_arch: 'osx_arm64' - - env: - VCPKG_TARGET_TRIPLET: ${{ matrix.vcpkg_triplet }} - OSX_BUILD_ARCH: ${{ matrix.osx_build_arch }} - GEN: Ninja - VCPKG_TOOLCHAIN_PATH: ${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake - - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - submodules: 'true' - - - name: Install Ninja - run: brew install ninja - - - name: Setup Ccache - uses: hendrikmuhs/ccache-action@main - with: - key: ${{ github.job }}-${{ matrix.duckdb_version }} - save: ${{ github.ref == 'refs/heads/main' || github.repository != 'duckdb/duckdb' }} - - - uses: actions/setup-python@v2 - with: - python-version: '3.7' - - - name: Setup vcpkg - uses: lukka/run-vcpkg@v11 - with: - vcpkgGitCommitId: 501db0f17ef6df184fcdbfbe0f87cde2313b6ab1 - - - name: Build extension - shell: bash - run: | - make release - - - name: Test Extension - if: ${{ matrix.osx_build_arch == 'x86_64'}} - shell: bash - run: | - ./build/release/test/unittest "*test/postgres_scanner/aws-rds.test" - - - uses: actions/upload-artifact@v2 - with: - name: osx-${{ matrix.osx_build_arch }}-extension - path: | - build/release/extension/postgres_scanner/postgres_scanner.duckdb_extension \ No newline at end of file diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml new file mode 100644 index 00000000..e1a269cd --- /dev/null +++ b/.github/workflows/MainDistributionPipeline.yml @@ -0,0 +1,31 @@ +# +# This workflow calls the main distribution pipeline from DuckDB to build, test and (optionally) release the extension +# +name: Main Extension Distribution Pipeline +on: + push: + pull_request: + workflow_dispatch: + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref || '' }}-${{ github.base_ref || '' }}-${{ github.ref != 'refs/heads/main' || github.sha }} + cancel-in-progress: true + +jobs: + duckdb-stable-build: + name: Build extension binaries +# if: startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' + uses: duckdb/duckdb/.github/workflows/_extension_distribution.yml@v0.9.2 + with: + duckdb_version: v0.9.2 + extension_name: postgres_scanner + + duckdb-stable-deploy: + name: Deploy extension binaries + needs: duckdb-stable-build + uses: ./.github/workflows/_extension_deploy.yml + secrets: inherit + with: + duckdb_version: v0.9.2 + extension_name: postgres_scanner + deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }} \ No newline at end of file diff --git a/.github/workflows/Windows.yml b/.github/workflows/Windows.yml deleted file mode 100644 index cd8c92b0..00000000 --- a/.github/workflows/Windows.yml +++ /dev/null @@ -1,61 +0,0 @@ -name: Windows -on: [push, pull_request,repository_dispatch] -concurrency: - group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref || '' }}-${{ github.base_ref || '' }}-${{ github.ref != 'refs/heads/main' || github.sha }} - cancel-in-progress: true -defaults: - run: - shell: bash - -jobs: - windows: - name: Release - runs-on: windows-latest - strategy: - matrix: - # Add commits/tags to build against other DuckDB versions - duckdb_version: [ '' ] - vcpkg_version: [ '2023.04.15' ] - vcpkg_triplet: ['x64-windows-static-md'] - env: - VCPKG_TARGET_TRIPLET: ${{ matrix.vcpkg_triplet }} - GEN: Ninja - VCPKG_ROOT: ${{ github.workspace }}\vcpkg - VCPKG_TOOLCHAIN_PATH: ${{ github.workspace }}\vcpkg\scripts\buildsystems\vcpkg.cmake - - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - submodules: 'true' - - - name: Setup vcpkg - uses: lukka/run-vcpkg@v11 - with: - vcpkgGitCommitId: 501db0f17ef6df184fcdbfbe0f87cde2313b6ab1 - - - uses: actions/setup-python@v2 - with: - python-version: '3.7' - - - name: Checkout DuckDB to version - # Add commits/tags to build against other DuckDB versions - if: ${{ matrix.duckdb_version != ''}} - run: | - cd duckdb - git checkout ${{ matrix.duckdb_version }} - - - name: Build extension - run: | - make release - - - name: Test Extension - shell: bash - run: | - ./build/release/test/Release/unittest "*test/postgres_scanner/aws-rds.test" - - - uses: actions/upload-artifact@v2 - with: - name: windows-extension - path: | - build/release/extension/postgres_scanner/postgres_scanner.duckdb_extension \ No newline at end of file diff --git a/.github/workflows/_extension_deploy.yml b/.github/workflows/_extension_deploy.yml new file mode 100644 index 00000000..5d6b020a --- /dev/null +++ b/.github/workflows/_extension_deploy.yml @@ -0,0 +1,121 @@ +# +# Reusable workflow that deploys the artifacts produced by github.com/duckdb/duckdb/.github/workflows/_extension_distribution.yml +# +# note: this workflow needs to be located in the extension repository, as it requires secrets to be passed to the +# deploy script. However, it should generally not be necessary to modify this workflow in your extension repository, as +# this workflow can be configured to use a custom deploy script. + + +name: Extension Deployment +on: + workflow_call: + inputs: + # The name of the extension + extension_name: + required: true + type: string + # DuckDB version to build against + duckdb_version: + required: true + type: string + # ';' separated list of architectures to exclude, for example: 'linux_amd64;osx_arm64' + exclude_archs: + required: false + type: string + default: "" + # Whether to upload this deployment as the latest. This may overwrite a previous deployment. + deploy_latest: + required: false + type: boolean + default: false + # Whether to upload this deployment under a versioned path. These will not be deleted automatically + deploy_versioned: + required: false + type: boolean + default: false + # Postfix added to artifact names. Can be used to guarantee unique names when this workflow is called multiple times + artifact_postfix: + required: false + type: string + default: "" + # Override the default deploy script with a custom script + deploy_script: + required: false + type: string + default: "./scripts/extension-upload.sh" + # Override the default matrix parse script with a custom script + matrix_parse_script: + required: false + type: string + default: "./duckdb/scripts/modify_distribution_matrix.py" + +jobs: + generate_matrix: + name: Generate matrix + runs-on: ubuntu-latest + outputs: + deploy_matrix: ${{ steps.parse-matrices.outputs.deploy_matrix }} + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + submodules: 'true' + + - name: Checkout DuckDB to version + run: | + cd duckdb + git checkout ${{ inputs.duckdb_version }} + + - id: parse-matrices + run: | + python3 ${{ inputs.matrix_parse_script }} --input ./duckdb/.github/config/distribution_matrix.json --deploy_matrix --output deploy_matrix.json --exclude "${{ inputs.exclude_archs }}" --pretty + deploy_matrix="`cat deploy_matrix.json`" + echo deploy_matrix=$deploy_matrix >> $GITHUB_OUTPUT + echo `cat $GITHUB_OUTPUT` + + deploy: + name: Deploy + runs-on: ubuntu-latest + needs: generate_matrix + if: ${{ needs.generate_matrix.outputs.deploy_matrix != '{}' && needs.generate_matrix.outputs.deploy_matrix != '' }} + strategy: + matrix: ${{fromJson(needs.generate_matrix.outputs.deploy_matrix)}} + + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + submodules: 'true' + + - name: Checkout DuckDB to version + run: | + cd duckdb + git checkout ${{ inputs.duckdb_version }} + + - uses: actions/download-artifact@v2 + with: + name: ${{ inputs.extension_name }}-${{ inputs.duckdb_version }}-extension-${{matrix.duckdb_arch}}${{inputs.artifact_postfix}} + path: | + /tmp/extension + + - name: Deploy + shell: bash + env: + AWS_ACCESS_KEY_ID: ${{ secrets.S3_DUCKDB_ORG_DEPLOY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.S3_DUCKDB_ORG_DEPLOY_KEY }} + AWS_DEFAULT_REGION: ${{ secrets.S3_DUCKDB_ORG_REGION }} + BUCKET_NAME: ${{ secrets.S3_DUCKDB_ORG_BUCKET }} + DUCKDB_EXTENSION_SIGNING_PK: ${{ secrets.S3_DUCKDB_ORG_EXTENSION_SIGNING_PK }} + run: | + pwd + python3 -m pip install pip awscli + git config --global --add safe.directory '*' + cd duckdb + git fetch --tags + export DUCKDB_VERSION=`git tag --points-at HEAD` + export DUCKDB_VERSION=${DUCKDB_VERSION:=`git log -1 --format=%h`} + cd .. + git fetch --tags + export EXT_VERSION=`git tag --points-at HEAD` + export EXT_VERSION=${EXT_VERSION:=`git log -1 --format=%h`} + ${{ inputs.deploy_script }} ${{ inputs.extension_name }} $EXT_VERSION $DUCKDB_VERSION ${{ matrix.duckdb_arch }} $BUCKET_NAME ${{inputs.deploy_latest || 'true' && 'false'}} ${{inputs.deploy_versioned || 'true' && 'false'}} \ No newline at end of file diff --git a/Makefile b/Makefile index eff797c6..83b42721 100644 --- a/Makefile +++ b/Makefile @@ -5,10 +5,19 @@ all: release MKFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST))) PROJ_DIR := $(dir $(MKFILE_PATH)) -OSX_BUILD_UNIVERSAL_FLAG= +ifeq ($(OS),Windows_NT) + TEST_PATH="/test/Release/unittest.exe" +else + TEST_PATH="/test/unittest" +endif + +#### OSX config +OSX_BUILD_FLAG= ifneq (${OSX_BUILD_ARCH}, "") - OSX_BUILD_UNIVERSAL_FLAG=-DOSX_BUILD_ARCH=${OSX_BUILD_ARCH} + OSX_BUILD_FLAG=-DOSX_BUILD_ARCH=${OSX_BUILD_ARCH} endif + +#### VCPKG config VCPKG_TOOLCHAIN_PATH?= ifneq ("${VCPKG_TOOLCHAIN_PATH}", "") TOOLCHAIN_FLAGS:=${TOOLCHAIN_FLAGS} -DVCPKG_MANIFEST_DIR='${PROJ_DIR}' -DVCPKG_BUILD=1 -DCMAKE_TOOLCHAIN_FILE='${VCPKG_TOOLCHAIN_PATH}' @@ -17,22 +26,24 @@ ifneq ("${VCPKG_TARGET_TRIPLET}", "") TOOLCHAIN_FLAGS:=${TOOLCHAIN_FLAGS} -DVCPKG_TARGET_TRIPLET='${VCPKG_TARGET_TRIPLET}' endif +#### Enable Ninja as generator ifeq ($(GEN),ninja) - GENERATOR=-G "Ninja" - FORCE_COLOR=-DFORCE_COLORED_OUTPUT=1 + GENERATOR=-G "Ninja" -DFORCE_COLORED_OUTPUT=1 endif -BUILD_FLAGS=-DEXTENSION_STATIC_BUILD=1 -DBUILD_EXTENSIONS="tpch;tpcds" ${OSX_BUILD_UNIVERSAL_FLAG} ${STATIC_LIBCPP} ${TOOLCHAIN_FLAGS} - -CLIENT_FLAGS := - -# These flags will make DuckDB build the extension +#### Configuration for this extension +EXTENSION_NAME=POSTGRES_SCANNER EXTENSION_FLAGS=\ -DDUCKDB_EXTENSION_NAMES="postgres_scanner" \ --DDUCKDB_EXTENSION_POSTGRES_SCANNER_PATH="$(PROJ_DIR)" \ --DDUCKDB_EXTENSION_POSTGRES_SCANNER_SHOULD_LINK=0 \ --DDUCKDB_EXTENSION_POSTGRES_SCANNER_LOAD_TESTS=1 \ --DDUCKDB_EXTENSION_POSTGRES_SCANNER_TEST_PATH="$(PROJ_DIR)test" +-DDUCKDB_EXTENSION_${EXTENSION_NAME}_PATH="$(PROJ_DIR)" \ +-DDUCKDB_EXTENSION_${EXTENSION_NAME}_SHOULD_LINK=0 \ +-DDUCKDB_EXTENSION_${EXTENSION_NAME}_LOAD_TESTS=1 \ +-DDUCKDB_EXTENSION_${EXTENSION_NAME}_TEST_PATH="$(PROJ_DIR)test/sql" + +EXTRA_EXTENSIONS_FLAG=-DBUILD_EXTENSIONS="tpch;tpcds" + +BUILD_FLAGS=-DEXTENSION_STATIC_BUILD=1 $(EXTENSION_FLAGS) ${EXTRA_EXTENSIONS_FLAG} $(OSX_BUILD_FLAG) $(TOOLCHAIN_FLAGS) + pull: git submodule init @@ -46,27 +57,24 @@ clean: # Main build debug: mkdir -p build/debug && \ - cmake $(GENERATOR) $(FORCE_COLOR) $(EXTENSION_FLAGS) ${BUILD_FLAGS} ${CLIENT_FLAGS} -DCMAKE_BUILD_TYPE=Debug -S ./duckdb/ -B build/debug && \ + cmake $(GENERATOR) $(BUILD_FLAGS) -DCMAKE_BUILD_TYPE=Debug -S ./duckdb/ -B build/debug && \ cmake --build build/debug --config Debug reldebug: mkdir -p build/reldebug && \ - cmake $(GENERATOR) $(FORCE_COLOR) $(EXTENSION_FLAGS) ${BUILD_FLAGS} ${CLIENT_FLAGS} -DCMAKE_BUILD_TYPE=RelWithDebInfo -S ./duckdb/ -B build/reldebug && \ + cmake $(GENERATOR) $(BUILD_FLAGS) -DCMAKE_BUILD_TYPE=RelWithDebInfo -S ./duckdb/ -B build/reldebug && \ cmake --build build/reldebug --config RelWithDebInfo release: mkdir -p build/release && \ - cmake $(GENERATOR) $(FORCE_COLOR) $(EXTENSION_FLAGS) ${BUILD_FLAGS} ${CLIENT_FLAGS} -DCMAKE_BUILD_TYPE=Release -S ./duckdb/ -B build/release && \ + cmake $(GENERATOR) $(BUILD_FLAGS) -DCMAKE_BUILD_TYPE=Release -S ./duckdb/ -B build/release && \ cmake --build build/release --config Release -# Main tests test: test_release - test_release: release - ./build/release/test/unittest "$(PROJ_DIR)test/*" - + ./build/release/$(TEST_PATH) "$(PROJ_DIR)test/*" test_debug: debug - ./build/debug/test/unittest "$(PROJ_DIR)test/*" + ./build/debug/$(TEST_PATH) "$(PROJ_DIR)test/*" format: cp duckdb/.clang-format . diff --git a/duckdb b/duckdb index 401c8061..3c695d7b 160000 --- a/duckdb +++ b/duckdb @@ -1 +1 @@ -Subproject commit 401c8061c6ece35949cac58c7770cc755710ca86 +Subproject commit 3c695d7ba94d95d9facee48d395f46ed0bd72b46 diff --git a/scripts/extension-upload.sh b/scripts/extension-upload.sh new file mode 100755 index 00000000..3eb3b674 --- /dev/null +++ b/scripts/extension-upload.sh @@ -0,0 +1,51 @@ +#!/bin/bash + +# Extension upload script + +# Usage: ./extension-upload-oote.sh +# : Name of the extension +# : Version (commit / version tag) of the extension +# : Version (commit / version tag) of DuckDB +# : Architecture target of the extension binary +# : S3 bucket to upload to +# : Set this as the latest version ("true" / "false", default: "false") +# : Set this as a versioned version that will prevent its deletion + +set -e + +ext="/tmp/extension/$1.duckdb_extension" + +script_dir="$(dirname "$(readlink -f "$0")")" + +# Abort if AWS key is not set +if [ -z "$AWS_ACCESS_KEY_ID" ]; then + echo "No AWS key found, skipping.." + exit 0 +fi + +# (Optionally) Sign binary +if [ "$DUCKDB_EXTENSION_SIGNING_PK" != "" ]; then + echo "$DUCKDB_EXTENSION_SIGNING_PK" > private.pem + $script_dir/../duckdb/scripts/compute-extension-hash.sh $ext > $ext.hash + openssl pkeyutl -sign -in $ext.hash -inkey private.pem -pkeyopt digest:sha256 -out $ext.sign + cat $ext.sign >> $ext +fi + +set -e + +# compress extension binary +gzip < "${ext}" > "$ext.gz" + +# upload versioned version +if [[ $7 = 'true' ]]; then + aws s3 cp $ext.gz s3://$5/$1/$2/$3/$4/$1.duckdb_extension.gz --acl public-read +fi + +# upload to latest version +if [[ $6 = 'true' ]]; then + aws s3 cp $ext.gz s3://$5/$3/$4/$1.duckdb_extension.gz --acl public-read +fi + +if [ "$DUCKDB_EXTENSION_SIGNING_PK" != "" ]; then + rm private.pem +fi \ No newline at end of file diff --git a/test/sql/scanner/arrays.test b/test/sql/scanner/arrays.test index 261515f2..45621bfb 100644 --- a/test/sql/scanner/arrays.test +++ b/test/sql/scanner/arrays.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok CALL postgres_attach('dbname=postgresscanner'); diff --git a/test/sql/scanner/aws-rds.test b/test/sql/scanner/aws-rds.test index 827ada0c..e1a044c7 100644 --- a/test/sql/scanner/aws-rds.test +++ b/test/sql/scanner/aws-rds.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok CALL postgres_attach('postgres://readonly:asdf@test-1.cqbaqbiayfd2.us-east-1.rds.amazonaws.com/postgres'); diff --git a/test/sql/scanner/bug63.test b/test/sql/scanner/bug63.test index ba50a364..28d275e4 100644 --- a/test/sql/scanner/bug63.test +++ b/test/sql/scanner/bug63.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok CALL postgres_attach('dbname=postgresscanner', source_schema='some_schema'); diff --git a/test/sql/scanner/bug69.test b/test/sql/scanner/bug69.test index ca8c128f..40104ba7 100644 --- a/test/sql/scanner/bug69.test +++ b/test/sql/scanner/bug69.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok CALL postgres_attach('dbname=postgresscanner'); diff --git a/test/sql/scanner/bug71.test b/test/sql/scanner/bug71.test index 000c4f0f..a2d61291 100644 --- a/test/sql/scanner/bug71.test +++ b/test/sql/scanner/bug71.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok CALL postgres_attach('dbname=postgresscanner'); diff --git a/test/sql/scanner/bug74.test b/test/sql/scanner/bug74.test index adbb2bd3..26385162 100644 --- a/test/sql/scanner/bug74.test +++ b/test/sql/scanner/bug74.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok CALL postgres_attach('dbname=postgresscanner'); diff --git a/test/sql/scanner/bug76.test b/test/sql/scanner/bug76.test index 79869793..3f053d62 100644 --- a/test/sql/scanner/bug76.test +++ b/test/sql/scanner/bug76.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok CALL postgres_attach('dbname=postgresscanner'); diff --git a/test/sql/scanner/bug77.test b/test/sql/scanner/bug77.test index 54f301b8..146765f6 100644 --- a/test/sql/scanner/bug77.test +++ b/test/sql/scanner/bug77.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok CALL postgres_attach('dbname=postgresscanner'); diff --git a/test/sql/scanner/count_star.test b/test/sql/scanner/count_star.test index e5bd5442..65119b7c 100644 --- a/test/sql/scanner/count_star.test +++ b/test/sql/scanner/count_star.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok pragma enable_verification diff --git a/test/sql/scanner/daterange_array.test b/test/sql/scanner/daterange_array.test index b00328d1..bddb4271 100644 --- a/test/sql/scanner/daterange_array.test +++ b/test/sql/scanner/daterange_array.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok CALL postgres_attach('dbname=postgresscanner'); diff --git a/test/sql/scanner/decimals.test b/test/sql/scanner/decimals.test index 4849b5ca..3463b89b 100644 --- a/test/sql/scanner/decimals.test +++ b/test/sql/scanner/decimals.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok CALL postgres_attach('dbname=postgresscanner'); diff --git a/test/sql/scanner/interval.test b/test/sql/scanner/interval.test index 1ccfdf04..de071794 100644 --- a/test/sql/scanner/interval.test +++ b/test/sql/scanner/interval.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok pragma enable_verification diff --git a/test/sql/scanner/missing_table.test b/test/sql/scanner/missing_table.test index ff674907..182b5701 100644 --- a/test/sql/scanner/missing_table.test +++ b/test/sql/scanner/missing_table.test @@ -4,5 +4,7 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement error select * from postgres_scan('dbname=postgresscanner', 'public', 'does_not_exist') \ No newline at end of file diff --git a/test/sql/scanner/nulls.test b/test/sql/scanner/nulls.test index dfc08027..c951df86 100644 --- a/test/sql/scanner/nulls.test +++ b/test/sql/scanner/nulls.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok CALL postgres_attach('dbname=postgresscanner'); diff --git a/test/sql/scanner/ssl.test b/test/sql/scanner/ssl.test index 9cb44b46..92216dcb 100644 --- a/test/sql/scanner/ssl.test +++ b/test/sql/scanner/ssl.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok CALL postgres_attach('dbname=postgresscanner sslmode=require'); diff --git a/test/sql/scanner/tpcds.test b/test/sql/scanner/tpcds.test index 02c7cf69..e56b2eb9 100644 --- a/test/sql/scanner/tpcds.test +++ b/test/sql/scanner/tpcds.test @@ -6,6 +6,8 @@ require tpcds require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + # TODO: currently fails with out of storage on CI? mode skip diff --git a/test/sql/scanner/tpch.test b/test/sql/scanner/tpch.test index 081a9957..4bcb6e72 100644 --- a/test/sql/scanner/tpch.test +++ b/test/sql/scanner/tpch.test @@ -6,6 +6,8 @@ require tpch require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok CALL postgres_attach('dbname=postgresscanner', source_schema='tpch', filter_pushdown=true); diff --git a/test/sql/scanner/types.test b/test/sql/scanner/types.test index e4f8f4ef..df8aac10 100644 --- a/test/sql/scanner/types.test +++ b/test/sql/scanner/types.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok CALL postgres_attach('dbname=postgresscanner'); diff --git a/test/sql/storage/attach_alter.test b/test/sql/storage/attach_alter.test index 84609f03..5a504305 100644 --- a/test/sql/storage/attach_alter.test +++ b/test/sql/storage/attach_alter.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s1 (TYPE POSTGRES) diff --git a/test/sql/storage/attach_alter_rollback.test b/test/sql/storage/attach_alter_rollback.test index 574459c7..860ec7d9 100644 --- a/test/sql/storage/attach_alter_rollback.test +++ b/test/sql/storage/attach_alter_rollback.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s1 (TYPE POSTGRES) diff --git a/test/sql/storage/attach_case_sensitive_columns.test b/test/sql/storage/attach_case_sensitive_columns.test index 0732f336..36c8f345 100644 --- a/test/sql/storage/attach_case_sensitive_columns.test +++ b/test/sql/storage/attach_case_sensitive_columns.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES) diff --git a/test/sql/storage/attach_case_sensitive_tables.test b/test/sql/storage/attach_case_sensitive_tables.test index 49631983..d799c975 100644 --- a/test/sql/storage/attach_case_sensitive_tables.test +++ b/test/sql/storage/attach_case_sensitive_tables.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES) diff --git a/test/sql/storage/attach_checkpoint.test b/test/sql/storage/attach_checkpoint.test index e9cd0c02..e885cb18 100644 --- a/test/sql/storage/attach_checkpoint.test +++ b/test/sql/storage/attach_checkpoint.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES) diff --git a/test/sql/storage/attach_concurrent_queries.test b/test/sql/storage/attach_concurrent_queries.test index 802d77d3..74652f5a 100644 --- a/test/sql/storage/attach_concurrent_queries.test +++ b/test/sql/storage/attach_concurrent_queries.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES) diff --git a/test/sql/storage/attach_connection_pool.test b/test/sql/storage/attach_connection_pool.test index 06d48495..e09946ad 100644 --- a/test/sql/storage/attach_connection_pool.test +++ b/test/sql/storage/attach_connection_pool.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok SET pg_connection_limit=1000 diff --git a/test/sql/storage/attach_constraints.test b/test/sql/storage/attach_constraints.test index ee4e6a87..01922065 100644 --- a/test/sql/storage/attach_constraints.test +++ b/test/sql/storage/attach_constraints.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s1 (TYPE POSTGRES) diff --git a/test/sql/storage/attach_create_if_exists.test b/test/sql/storage/attach_create_if_exists.test index eb7d007e..63959362 100644 --- a/test/sql/storage/attach_create_if_exists.test +++ b/test/sql/storage/attach_create_if_exists.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s1 (TYPE POSTGRES) diff --git a/test/sql/storage/attach_create_index.test b/test/sql/storage/attach_create_index.test index f9fd28a7..db9b73e1 100644 --- a/test/sql/storage/attach_create_index.test +++ b/test/sql/storage/attach_create_index.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES) diff --git a/test/sql/storage/attach_database_list.test b/test/sql/storage/attach_database_list.test index c8859a66..15a2842e 100644 --- a/test/sql/storage/attach_database_list.test +++ b/test/sql/storage/attach_database_list.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s1 (TYPE POSTGRES) diff --git a/test/sql/storage/attach_database_size.test b/test/sql/storage/attach_database_size.test index 1e59e07e..5b316c3d 100644 --- a/test/sql/storage/attach_database_size.test +++ b/test/sql/storage/attach_database_size.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s1 (TYPE POSTGRES) diff --git a/test/sql/storage/attach_defaults.test b/test/sql/storage/attach_defaults.test index c4a5b6e9..ff0cc245 100644 --- a/test/sql/storage/attach_defaults.test +++ b/test/sql/storage/attach_defaults.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s1 (TYPE POSTGRES) diff --git a/test/sql/storage/attach_delete.test b/test/sql/storage/attach_delete.test index 57c6da11..584d77d0 100644 --- a/test/sql/storage/attach_delete.test +++ b/test/sql/storage/attach_delete.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s1 (TYPE POSTGRES) diff --git a/test/sql/storage/attach_describe.test b/test/sql/storage/attach_describe.test index ca57af87..eeb304b6 100644 --- a/test/sql/storage/attach_describe.test +++ b/test/sql/storage/attach_describe.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s1 (TYPE POSTGRES) diff --git a/test/sql/storage/attach_detach.test b/test/sql/storage/attach_detach.test index 7b7d19f2..a6c354ee 100644 --- a/test/sql/storage/attach_detach.test +++ b/test/sql/storage/attach_detach.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s1 (TYPE POSTGRES) diff --git a/test/sql/storage/attach_drop.test b/test/sql/storage/attach_drop.test index 8f1090cb..af5ef13b 100644 --- a/test/sql/storage/attach_drop.test +++ b/test/sql/storage/attach_drop.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS simple (TYPE POSTGRES) diff --git a/test/sql/storage/attach_existing_enum.test b/test/sql/storage/attach_existing_enum.test index 651ce60e..267c5356 100644 --- a/test/sql/storage/attach_existing_enum.test +++ b/test/sql/storage/attach_existing_enum.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES) diff --git a/test/sql/storage/attach_existing_multidimensional_array.test b/test/sql/storage/attach_existing_multidimensional_array.test index bd79fd1a..5fc34f77 100644 --- a/test/sql/storage/attach_existing_multidimensional_array.test +++ b/test/sql/storage/attach_existing_multidimensional_array.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES) diff --git a/test/sql/storage/attach_filter_pushdown.test b/test/sql/storage/attach_filter_pushdown.test index 17b92e25..0a56dbb4 100644 --- a/test/sql/storage/attach_filter_pushdown.test +++ b/test/sql/storage/attach_filter_pushdown.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s1 (TYPE POSTGRES) diff --git a/test/sql/storage/attach_giant_numeric.test b/test/sql/storage/attach_giant_numeric.test index 39fb7d7f..1f85debf 100644 --- a/test/sql/storage/attach_giant_numeric.test +++ b/test/sql/storage/attach_giant_numeric.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES) diff --git a/test/sql/storage/attach_if_not_exists.test b/test/sql/storage/attach_if_not_exists.test index f01a699b..1626080d 100644 --- a/test/sql/storage/attach_if_not_exists.test +++ b/test/sql/storage/attach_if_not_exists.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES) diff --git a/test/sql/storage/attach_insert_from_scan_large.test b/test/sql/storage/attach_insert_from_scan_large.test index 61881cdd..a3d61e8a 100644 --- a/test/sql/storage/attach_insert_from_scan_large.test +++ b/test/sql/storage/attach_insert_from_scan_large.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES) diff --git a/test/sql/storage/attach_keywords.test b/test/sql/storage/attach_keywords.test index 5003cc33..f8f7813f 100644 --- a/test/sql/storage/attach_keywords.test +++ b/test/sql/storage/attach_keywords.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES) diff --git a/test/sql/storage/attach_large_delete.test b/test/sql/storage/attach_large_delete.test index 599929ca..c0be7147 100644 --- a/test/sql/storage/attach_large_delete.test +++ b/test/sql/storage/attach_large_delete.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES); diff --git a/test/sql/storage/attach_list_tables.test b/test/sql/storage/attach_list_tables.test index af004a0f..3faa5cc4 100644 --- a/test/sql/storage/attach_list_tables.test +++ b/test/sql/storage/attach_list_tables.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s1 (TYPE POSTGRES) diff --git a/test/sql/storage/attach_non_existent.test b/test/sql/storage/attach_non_existent.test index 763a760c..0f34ba4b 100644 --- a/test/sql/storage/attach_non_existent.test +++ b/test/sql/storage/attach_non_existent.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement error ATTACH 'dbname=dbdoesnotexistx' AS s1 (TYPE POSTGRES) ---- diff --git a/test/sql/storage/attach_pages_per_task.test b/test/sql/storage/attach_pages_per_task.test index 13184feb..34b61c4c 100644 --- a/test/sql/storage/attach_pages_per_task.test +++ b/test/sql/storage/attach_pages_per_task.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES); diff --git a/test/sql/storage/attach_prefix.test b/test/sql/storage/attach_prefix.test index 3ade66fd..2ec22065 100644 --- a/test/sql/storage/attach_prefix.test +++ b/test/sql/storage/attach_prefix.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'postgres:dbname=postgresscanner' AS s diff --git a/test/sql/storage/attach_read_only.test b/test/sql/storage/attach_read_only.test index 7784469f..a5b16a00 100644 --- a/test/sql/storage/attach_read_only.test +++ b/test/sql/storage/attach_read_only.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES, READ_ONLY) diff --git a/test/sql/storage/attach_schemas.test b/test/sql/storage/attach_schemas.test index fc64f2e7..94d9bbfd 100644 --- a/test/sql/storage/attach_schemas.test +++ b/test/sql/storage/attach_schemas.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES) diff --git a/test/sql/storage/attach_simple.test b/test/sql/storage/attach_simple.test index daa32344..2ff5b4a0 100644 --- a/test/sql/storage/attach_simple.test +++ b/test/sql/storage/attach_simple.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS simple (TYPE POSTGRES) diff --git a/test/sql/storage/attach_transactions.test b/test/sql/storage/attach_transactions.test index b649ac31..49502864 100644 --- a/test/sql/storage/attach_transactions.test +++ b/test/sql/storage/attach_transactions.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES) diff --git a/test/sql/storage/attach_types.test b/test/sql/storage/attach_types.test index 20881fb9..92a22d3c 100644 --- a/test/sql/storage/attach_types.test +++ b/test/sql/storage/attach_types.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES) diff --git a/test/sql/storage/attach_types_blob.test b/test/sql/storage/attach_types_blob.test index 96b883fc..faad3450 100644 --- a/test/sql/storage/attach_types_blob.test +++ b/test/sql/storage/attach_types_blob.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES) diff --git a/test/sql/storage/attach_types_char.test b/test/sql/storage/attach_types_char.test index 18c167d4..9160b6b9 100644 --- a/test/sql/storage/attach_types_char.test +++ b/test/sql/storage/attach_types_char.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES) diff --git a/test/sql/storage/attach_types_complex_composite.test b/test/sql/storage/attach_types_complex_composite.test index e9fdf887..fe68cb75 100644 --- a/test/sql/storage/attach_types_complex_composite.test +++ b/test/sql/storage/attach_types_complex_composite.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES) diff --git a/test/sql/storage/attach_types_date.test b/test/sql/storage/attach_types_date.test index 92c952db..62994053 100644 --- a/test/sql/storage/attach_types_date.test +++ b/test/sql/storage/attach_types_date.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES) diff --git a/test/sql/storage/attach_types_decimal.test b/test/sql/storage/attach_types_decimal.test index d0ec9c72..1d8844f1 100644 --- a/test/sql/storage/attach_types_decimal.test +++ b/test/sql/storage/attach_types_decimal.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES) diff --git a/test/sql/storage/attach_types_enum.test b/test/sql/storage/attach_types_enum.test index 41f2d6cf..fdae4a70 100644 --- a/test/sql/storage/attach_types_enum.test +++ b/test/sql/storage/attach_types_enum.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES) diff --git a/test/sql/storage/attach_types_interval.test b/test/sql/storage/attach_types_interval.test index f08271c1..e9fd7722 100644 --- a/test/sql/storage/attach_types_interval.test +++ b/test/sql/storage/attach_types_interval.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES) diff --git a/test/sql/storage/attach_types_json.test b/test/sql/storage/attach_types_json.test index 91aa0126..9652ae4c 100644 --- a/test/sql/storage/attach_types_json.test +++ b/test/sql/storage/attach_types_json.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES) diff --git a/test/sql/storage/attach_types_lists.test b/test/sql/storage/attach_types_lists.test index a7b77c63..644fb441 100644 --- a/test/sql/storage/attach_types_lists.test +++ b/test/sql/storage/attach_types_lists.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES) diff --git a/test/sql/storage/attach_types_macaddr.test b/test/sql/storage/attach_types_macaddr.test index 822c2ed3..a7b05e10 100644 --- a/test/sql/storage/attach_types_macaddr.test +++ b/test/sql/storage/attach_types_macaddr.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES) diff --git a/test/sql/storage/attach_types_multidimensional_array.test b/test/sql/storage/attach_types_multidimensional_array.test index 18d41a6e..79c4f0c6 100644 --- a/test/sql/storage/attach_types_multidimensional_array.test +++ b/test/sql/storage/attach_types_multidimensional_array.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES) diff --git a/test/sql/storage/attach_types_numerics.test b/test/sql/storage/attach_types_numerics.test index 219b8344..20fa651e 100644 --- a/test/sql/storage/attach_types_numerics.test +++ b/test/sql/storage/attach_types_numerics.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES) diff --git a/test/sql/storage/attach_types_struct.test b/test/sql/storage/attach_types_struct.test index 14efb2f3..bb0f0197 100644 --- a/test/sql/storage/attach_types_struct.test +++ b/test/sql/storage/attach_types_struct.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES) diff --git a/test/sql/storage/attach_types_time.test b/test/sql/storage/attach_types_time.test index 0c66b03f..470d1625 100644 --- a/test/sql/storage/attach_types_time.test +++ b/test/sql/storage/attach_types_time.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES) diff --git a/test/sql/storage/attach_types_timestamp.test b/test/sql/storage/attach_types_timestamp.test index 95f78cfd..a6b2d13e 100644 --- a/test/sql/storage/attach_types_timestamp.test +++ b/test/sql/storage/attach_types_timestamp.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES) diff --git a/test/sql/storage/attach_types_uuid.test b/test/sql/storage/attach_types_uuid.test index f1362fbd..b92094e9 100644 --- a/test/sql/storage/attach_types_uuid.test +++ b/test/sql/storage/attach_types_uuid.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES) diff --git a/test/sql/storage/attach_types_varchar.test b/test/sql/storage/attach_types_varchar.test index 6f1720c9..c6ba6ee5 100644 --- a/test/sql/storage/attach_types_varchar.test +++ b/test/sql/storage/attach_types_varchar.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES) diff --git a/test/sql/storage/attach_update.test b/test/sql/storage/attach_update.test index df7cd80e..70df6098 100644 --- a/test/sql/storage/attach_update.test +++ b/test/sql/storage/attach_update.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s1 (TYPE POSTGRES) diff --git a/test/sql/storage/attach_use_binary_copy.test b/test/sql/storage/attach_use_binary_copy.test index 7068c98f..b689c2b3 100644 --- a/test/sql/storage/attach_use_binary_copy.test +++ b/test/sql/storage/attach_use_binary_copy.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES) diff --git a/test/sql/storage/attach_views.test b/test/sql/storage/attach_views.test index e57b45d0..92b7be4f 100644 --- a/test/sql/storage/attach_views.test +++ b/test/sql/storage/attach_views.test @@ -4,6 +4,8 @@ require postgres_scanner +require-env POSTGRES_TEST_DATABASE_AVAILABLE + statement ok ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)