From fc8efb96c27eaabd99854c59069499584578883d Mon Sep 17 00:00:00 2001 From: Jason Coward Date: Tue, 30 Sep 2025 15:43:07 -0600 Subject: [PATCH 1/2] Use ubuntu-latest in ci.yml --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6756719d..5659f54b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ on: jobs: sqllite-check: name: SQL Lite Check - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest strategy: matrix: @@ -48,7 +48,7 @@ jobs: mysql-check: name: MySQL Check - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest services: mysql: @@ -97,7 +97,7 @@ jobs: postgresql-check: name: PostgreSQL Check - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest services: postgres: From c36462eab33b016b7b0b17281c3b60873bf6b5a7 Mon Sep 17 00:00:00 2001 From: Jason Coward Date: Wed, 1 Oct 2025 11:52:53 -0600 Subject: [PATCH 2/2] Fix sqlite SetUpTest::testConnectionError() --- test/properties.ci.inc.php | 2 +- test/xPDO/Test/SetUpTest.php | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/test/properties.ci.inc.php b/test/properties.ci.inc.php index a19e4547..4bc23a7f 100644 --- a/test/properties.ci.inc.php +++ b/test/properties.ci.inc.php @@ -66,7 +66,7 @@ /* sqlite */ $properties['sqlite_string_dsn_test']= 'sqlite:' . $properties['xpdo_test_path'] . 'db/xpdotest'; $properties['sqlite_string_dsn_nodb']= 'sqlite::memory:'; -$properties['sqlite_string_dsn_error']= 'sqlite:db/'; +$properties['sqlite_string_dsn_error']= 'sqlite:db/folderdoesnotexist/'; $properties['sqlite_string_username']= ''; $properties['sqlite_string_password']= ''; $properties['sqlite_array_driverOptions']= [\PDO::ATTR_ERRMODE => \PDO::ERRMODE_SILENT]; diff --git a/test/xPDO/Test/SetUpTest.php b/test/xPDO/Test/SetUpTest.php index a13b9c85..4faba859 100644 --- a/test/xPDO/Test/SetUpTest.php +++ b/test/xPDO/Test/SetUpTest.php @@ -27,6 +27,10 @@ class SetUpTest extends TestCase */ public function testConnectionError() { + if (self::$properties['xpdo_driver'] == 'sqlite') { + $this->markTestSkipped(); + } + $string_dsn = self::$properties[self::$properties['xpdo_driver'] . '_string_dsn_error']; $mypdo = new xPDO($string_dsn, "nonesuchuser", "nonesuchpass"); $result = $mypdo->connect();