Merge branch 'apache:main' into dev/snowflakedriver

apache · Sep 28, 2023 · 3708aeb · 3708aeb
2 parents 0cb2127 + 608982d
commit 3708aeb
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 70 deletions.
diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml
@@ -958,22 +958,3 @@ jobs:
           ./ci/scripts/python_wheel_upload.sh upload-staging/adbc_*.tar.gz upload-staging/*.whl
         env:
           GEMFURY_PUSH_TOKEN: ${{ secrets.GEMFURY_PUSH_TOKEN }}
-
-  clean-gemfury:
-    name: "Clean old releases"
-    runs-on: ubuntu-latest
-    if: ${{ !startsWith(github.ref, 'refs/tags/') }}
-    needs:
-      - upload-gemfury
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-          persist-credentials: true
-
-      - name: Clean old releases
-        run: |
-          gem install --user-install gemfury
-          ruby ./ci/scripts/gemfury_clean.rb
-        env:
-          GEMFURY_API_TOKEN: ${{ secrets.GEMFURY_API_TOKEN }}
diff --git a/c/driver/postgresql/CMakeLists.txt b/c/driver/postgresql/CMakeLists.txt
@@ -51,14 +51,15 @@ add_arrow_lib(adbc_driver_postgresql
               adbc_driver_common
               nanoarrow
               ${LIBPQ_STATIC_LIBRARIES})
-include_directories(SYSTEM ${REPOSITORY_ROOT})
-include_directories(SYSTEM ${REPOSITORY_ROOT}/c/)
-include_directories(SYSTEM ${LIBPQ_INCLUDE_DIRS})
-include_directories(SYSTEM ${REPOSITORY_ROOT}/c/vendor)
-include_directories(SYSTEM ${REPOSITORY_ROOT}/c/driver)
 
 foreach(LIB_TARGET ${ADBC_LIBRARIES})
   target_compile_definitions(${LIB_TARGET} PRIVATE ADBC_EXPORTING)
+  target_include_directories(${LIB_TARGET} SYSTEM
+                             PRIVATE ${REPOSITORY_ROOT}
+                                     ${REPOSITORY_ROOT}/c/
+                                     ${LIBPQ_INCLUDE_DIRS}
+                                     ${REPOSITORY_ROOT}/c/vendor
+                                     ${REPOSITORY_ROOT}/c/driver)
 endforeach()
 
 if(ADBC_TEST_LINKAGE STREQUAL "shared")
@@ -83,5 +84,11 @@ if(ADBC_BUILD_TESTS)
                 nanoarrow
                 ${TEST_LINK_LIBS})
   target_compile_features(adbc-driver-postgresql-test PRIVATE cxx_std_17)
+  target_include_directories(adbc-driver-postgresql-test SYSTEM
+                             PRIVATE ${REPOSITORY_ROOT}
+                                     ${REPOSITORY_ROOT}/c/
+                                     ${LIBPQ_INCLUDE_DIRS}
+                                     ${REPOSITORY_ROOT}/c/vendor
+                                     ${REPOSITORY_ROOT}/c/driver)
   adbc_configure_target(adbc-driver-postgresql-test)
 endif()
diff --git a/ci/scripts/gemfury_clean.rb b/ci/scripts/gemfury_clean.rb
diff --git a/go/adbc/driver/snowflake/statement.go b/go/adbc/driver/snowflake/statement.go
@@ -144,8 +144,8 @@ func (st *statement) SetOption(key string, val string) error {
 		return st.SetOptionInt(key, int64(concurrency))
 	default:
 		return adbc.Error{
-			Msg:  fmt.Sprintf("invalid statement option %s=%s", key, val),
-			Code: adbc.StatusInvalidArgument,
+			Msg:  fmt.Sprintf("[Snowflake] Unknown statement option '%s'", key),
+			Code: adbc.StatusNotImplemented,
 		}
 	}
 	return nil

diff --git a/go/adbc/drivermgr/wrapper.go b/go/adbc/drivermgr/wrapper.go
@@ -21,7 +21,9 @@ package drivermgr
 // #cgo windows CFLAGS: -DADBC_EXPORTING
 // #cgo windows CPPFLAGS: -DADBC_EXPORTING
 // #cgo CXXFLAGS: -std=c++11
+// #if !defined(ADBC_EXPORTING)
 // #define ADBC_EXPORTING
+// #endif
 // #include "adbc.h"
 // #include <stdlib.h>
 //

diff --git a/go/adbc/pkg/Makefile b/go/adbc/pkg/Makefile
@@ -15,10 +15,12 @@
 # limitations under the License.
 
 GO_BUILD=go build
+RM=rm
 ifeq ($(shell go env GOOS),linux)
 	SUFFIX=so
 else ifeq ($(shell go env GOOS),windows)
 	SUFFIX=dll
+	RM=del
 else
 	SUFFIX=dylib
 endif
@@ -33,12 +35,12 @@ all: $(DRIVERS)
 
 libadbc_driver_%.$(SUFFIX): %
 	$(GO_BUILD) -tags driverlib -o $@ -buildmode=c-shared -ldflags "-s -w" ./$<
-	rm $(basename $@).h
+	$(RM) $(basename $@).h
 
 regenerate:
 	go run gen/main.go -prefix FlightSQL -o ./flightsql/ -driver ../driver/flightsql
 	go run gen/main.go -prefix PanicDummy -o ./panicdummy/ -driver ../driver/panicdummy
 	go run gen/main.go -prefix Snowflake -o ./snowflake/ -driver ../driver/snowflake
 
 clean:
-	rm $(DRIVERS)
+	$(RM) $(DRIVERS)