Merge branch 'main' into bump-license-to-2025

duckdb · Jan 7, 2025 · fb3bf18 · fb3bf18
2 parents ed9c687 + 4fdaad1
commit fb3bf18
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml
@@ -19,8 +19,8 @@ jobs:
         with:
           python-version: "3.11"
 
-      - name: Install clang-format (11.0.1) and ruff
-        run: python3 -m pip install "clang-format==11.0.1" ruff
+      - name: Install clang-format and ruff
+        run: python3 -m pip install -r dev_requirements.txt
       - name: Run clang-format
         run: git clang-format refs/remotes/origin/main --diff
       - name: Run ruff check

diff --git a/src/pgduckdb_types.cpp b/src/pgduckdb_types.cpp
@@ -205,7 +205,7 @@ ConvertBinaryDatum(const duckdb::Value &value) {
 	auto str = value.GetValueUnsafe<duckdb::string_t>();
 	auto blob_len = str.GetSize();
 	auto blob = str.GetDataUnsafe();
-	bytea* result = (bytea *)palloc0(blob_len + VARHDRSZ);
+	bytea *result = (bytea *)palloc0(blob_len + VARHDRSZ);
 	SET_VARSIZE(result, blob_len + VARHDRSZ);
 	memcpy(VARDATA(result), blob, blob_len);
 	return PointerGetDatum(result);