From 3ba215c35c6ae27689fd1cdb47c93049a13ddd81 Mon Sep 17 00:00:00 2001
From: tricker <yoramdelangen@gmail.com>
Date: Sun, 23 Mar 2025 16:26:36 +0100
Subject: [PATCH] enable PDO_ODBC and ODBC extension statically (#661)

* enable PDO_ODBC and ODBC extension statically

* fix sorting of ext.json

* add odbc and pdo_odbc extension to tests

* Add full tests, remove pdo_odbc from bulk

* Remove windows support for docs

* Add ODBC and PDO_ODBC extension

* Revert curl static lib

* Add full tests

* Add iconv for macOS

* Add tests

* Fix linux pdo_odbc patch

* Sort config

---------

Co-authored-by: crazywhalecc <jesse2061@outlook.com>
---
 config/ext.json                        | 25 ++++++++++++++++++++++
 src/SPC/builder/extension/odbc.php     | 17 +++++++++++++++
 src/SPC/builder/extension/pdo_odbc.php | 29 ++++++++++++++++++++++++++
 src/globals/test-extensions.php        |  8 +++----
 4 files changed, 75 insertions(+), 4 deletions(-)
 create mode 100644 src/SPC/builder/extension/odbc.php
 create mode 100644 src/SPC/builder/extension/pdo_odbc.php

diff --git a/config/ext.json b/config/ext.json
index 4d6044b3..5650b9d8 100644
--- a/config/ext.json
+++ b/config/ext.json
@@ -426,6 +426,17 @@
         },
         "notes": true
     },
+    "odbc": {
+        "support": {
+            "BSD": "wip",
+            "Windows": "wip"
+        },
+        "type": "builtin",
+        "arg-type-unix": "custom",
+        "lib-depends-unix": [
+            "unixodbc"
+        ]
+    },
     "opcache": {
         "type": "builtin",
         "arg-type-unix": "custom"
@@ -492,6 +503,20 @@
             "mysqlnd"
         ]
     },
+    "pdo_odbc": {
+        "support": {
+            "BSD": "wip"
+        },
+        "type": "builtin",
+        "arg-type": "custom",
+        "lib-depends-unix": [
+            "unixodbc"
+        ],
+        "ext-depends": [
+            "pdo",
+            "odbc"
+        ]
+    },
     "pdo_pgsql": {
         "support": {
             "Windows": "wip",
diff --git a/src/SPC/builder/extension/odbc.php b/src/SPC/builder/extension/odbc.php
new file mode 100644
index 00000000..6234f4e8
--- /dev/null
+++ b/src/SPC/builder/extension/odbc.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\extension;
+
+use SPC\builder\Extension;
+use SPC\util\CustomExt;
+
+#[CustomExt('odbc')]
+class odbc extends Extension
+{
+    public function getUnixConfigureArg(): string
+    {
+        return '--with-unixODBC=' . BUILD_ROOT_PATH;
+    }
+}
diff --git a/src/SPC/builder/extension/pdo_odbc.php b/src/SPC/builder/extension/pdo_odbc.php
new file mode 100644
index 00000000..4ab45904
--- /dev/null
+++ b/src/SPC/builder/extension/pdo_odbc.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\extension;
+
+use SPC\builder\Extension;
+use SPC\store\FileSystem;
+use SPC\util\CustomExt;
+
+#[CustomExt('pdo_odbc')]
+class pdo_odbc extends Extension
+{
+    public function patchBeforeBuildconf(): bool
+    {
+        FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/ext/pdo_odbc/config.m4', 'PDO_ODBC_LDFLAGS="$pdo_odbc_def_ldflags', 'PDO_ODBC_LDFLAGS="-liconv $pdo_odbc_def_ldflags');
+        return true;
+    }
+
+    public function getUnixConfigureArg(): string
+    {
+        return '--with-pdo-odbc=unixODBC,' . BUILD_ROOT_PATH;
+    }
+
+    public function getWindowsConfigureArg(): string
+    {
+        return '--with-pdo-odbc';
+    }
+}
diff --git a/src/globals/test-extensions.php b/src/globals/test-extensions.php
index 9322cee1..5b376e94 100644
--- a/src/globals/test-extensions.php
+++ b/src/globals/test-extensions.php
@@ -21,8 +21,8 @@ $test_php_version = [
 
 // test os (macos-13, macos-14, ubuntu-latest, windows-latest are available)
 $test_os = [
-    // 'macos-13',
-    // 'macos-14',
+    'macos-13',
+    'macos-14',
     'ubuntu-latest',
     'windows-latest',
 ];
@@ -40,8 +40,8 @@ $prefer_pre_built = false;
 
 // If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`).
 $extensions = match (PHP_OS_FAMILY) {
-    'Linux', 'Darwin' => '',
-    'Windows' => 'mbstring,tokenizer,phar,curl,openssl',
+    'Linux', 'Darwin' => 'odbc,pdo_odbc',
+    'Windows' => 'odbc,pdo_odbc',
 };
 
 // If you want to test lib-suggests feature with extension, add them below (comma separated, example `libwebp,libavif`).