Merge branch '3.0' into 3

Author: emteknetnz

.github/workflows/ci.yml

@@ -4,15 +4,11 @@ on:
   push:
   pull_request:
   workflow_dispatch:
-  # Every Thursday at 12:20pm UTC
-  schedule:
-    - cron: '20 12 * * 4'
+
 jobs:
   ci:
     name: CI
-    # Only run cron on the silverstripe account
-    if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
-    uses: "silverstripe/gha-ci/.github/workflows/ci.yml@v1"
+    uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1
     with:
       # set phpunit to false to prevent automatic generation of mysql phpunit jobs
       phpunit: false
@@ -32,4 +28,3 @@ jobs:
           phpunit: true
           phpunit_suite: all
 
-

.github/workflows/dispatch-ci.yml

@@ -0,0 +1,16 @@
+name: Dispatch CI
+
+on:
+  # At 12:20 PM UTC, only on Thursday and Friday
+  schedule:
+    - cron: '20 12 * * 4,5'
+
+jobs:
+  dispatch-ci:
+    name: Dispatch CI
+    # Only run cron on the silverstripe account
+    if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Dispatch CI
+        uses: silverstripe/gha-dispatch-ci@v1

_config/connectors.yml

@@ -2,12 +2,6 @@
 name: postgresqlconnectors
 ---
 SilverStripe\Core\Injector\Injector:
-  PostgrePDODatabase:
-    class: 'SilverStripe\PostgreSQL\PostgreSQLDatabase'
-    properties:
-      connector: '%$PDOConnector'
-      schemaManager: '%$PostgreSQLSchemaManager'
-      queryBuilder: '%$PostgreSQLQueryBuilder'
   PostgreSQLDatabase:
     class: 'SilverStripe\PostgreSQL\PostgreSQLDatabase'
     properties:

_register_database.php

@@ -3,23 +3,6 @@
 use SilverStripe\Dev\Install\DatabaseAdapterRegistry;
 use SilverStripe\PostgreSQL\PostgreSQLDatabaseConfigurationHelper;
 
-// PDO Postgre database
-DatabaseAdapterRegistry::register(array(
-    /** @skipUpgrade */
-    'class' => 'PostgrePDODatabase',
-    'module' => 'postgresql',
-    'title' => 'PostgreSQL 8.3+ (using PDO)',
-    'helperPath' => __DIR__.'/code/PostgreSQLDatabaseConfigurationHelper.php',
-    'helperClass' => PostgreSQLDatabaseConfigurationHelper::class,
-    'supported' => (class_exists('PDO') && in_array('postgresql', PDO::getAvailableDrivers())),
-    'missingExtensionText' =>
-        'Either the <a href="http://www.php.net/manual/en/book.pdo.php">PDO Extension</a> or 
-		the <a href="http://www.php.net/manual/en/ref.pdo-sqlsrv.php">SQL Server PDO Driver</a> 
-		are unavailable. Please install or enable these and refresh this page.'
-));
-
-
-// PDO Postgre database
 DatabaseAdapterRegistry::register(array(
     /** @skipUpgrade */
     'class' => 'PostgreSQLDatabase',

code/PostgreSQLConnector.php

@@ -72,7 +72,7 @@ public function connect($parameters, $selectDB = false)
 
         // Note: Postgres always behaves as though $selectDB = true, ignoring
         // any value actually passed in. The controller passes in true for other
-        // connectors such as PDOConnector.
+        // connectors
 
         // Escape parameters
         $arguments = array(
@@ -218,7 +218,6 @@ public function preparedQuery($sql, $parameters, $errorLevel = E_USER_ERROR)
 
         // Execute query
         // Unfortunately error-suppression is required in order to handle sql errors elegantly.
-        // Please use PDO if you can help it
         if (!empty($parameters)) {
             $result = @pg_query_params($this->dbConn, $sql, $parameters);
         } else {

code/PostgreSQLDatabase.php

@@ -214,7 +214,7 @@ public function connect($parameters)
         }
         $this->schemaOriginal = $parameters['schema'];
 
-        // Ensure that driver is available (required by PDO)
+        // Ensure that driver is available
         if (empty($parameters['driver'])) {
             $parameters['driver'] = $this->getDatabaseServer();
         }

code/PostgreSQLDatabaseConfigurationHelper.php

@@ -5,7 +5,6 @@
 use SilverStripe\Dev\Install\DatabaseAdapterRegistry;
 use SilverStripe\Dev\Install\DatabaseConfigurationHelper;
 use Exception;
-use PDO;
 
 /**
  * This is a helper class for the SS installer.
@@ -40,10 +39,6 @@ protected function createConnection($databaseConfig, &$error)
                     $connstring = "host=$server port=5432 dbname=postgres{$userPart}{$passwordPart}";
                     $conn = pg_connect($connstring);
                     break;
-                case 'PostgrePDODatabase':
-                    // May throw a PDOException if fails
-                    $conn = @new PDO('postgresql:host='.$server.';dbname=postgres;port=5432', $username, $password);
-                    break;
                 default:
                     $error = 'Invalid connection type: ' . $databaseConfig['type'];
                     return null;
@@ -92,8 +87,6 @@ public function getDatabaseVersion($databaseConfig)
         $conn = $this->createConnection($databaseConfig, $error);
         if (!$conn) {
             return false;
-        } elseif ($conn instanceof PDO) {
-            return $conn->getAttribute(PDO::ATTR_SERVER_VERSION);
         } elseif (is_resource($conn)) {
             $info = pg_version($conn);
             return $info['server'];
@@ -139,11 +132,7 @@ public function requireDatabaseVersion($databaseConfig)
     protected function query($conn, $sql)
     {
         $items = array();
-        if ($conn instanceof PDO) {
-            foreach ($conn->query($sql) as $row) {
-                $items[] = $row[0];
-            }
-        } elseif (is_resource($conn)) {
+        if (is_resource($conn)) {
             $result =  pg_query($conn, $sql);
             while ($row = pg_fetch_row($result)) {
                 $items[] = $row[0];

code/PostgreSQLSchemaManager.php

@@ -849,23 +849,18 @@ protected function extractTriggerColumns($triggerName, $table)
             $trigger['tgargs'] = stream_get_contents($trigger['tgargs']);
         }
 
-        if (strpos($trigger['tgargs'], "\000") !== false) {
-            // Option 1: output as a string (PDO)
-            $argList = array_filter(explode("\000", $trigger['tgargs']));
-        } else {
-            // Option 2: hex-encoded (pg_sql non-pdo)
-            $bytes = str_split($trigger['tgargs'], 2);
-            $argList = array();
-            $nextArg = "";
-            foreach ($bytes as $byte) {
-                if ($byte == '\x') {
-                    continue;
-                } elseif ($byte == "00") {
-                    $argList[] = $nextArg;
-                    $nextArg = "";
-                } else {
-                    $nextArg .= chr(hexdec($byte));
-                }
+        // hex-encoded (pg_sql non-pdo)
+        $bytes = str_split($trigger['tgargs'], 2);
+        $argList = array();
+        $nextArg = "";
+        foreach ($bytes as $byte) {
+            if ($byte == '\x') {
+                continue;
+            } elseif ($byte == "00") {
+                $argList[] = $nextArg;
+                $nextArg = "";
+            } else {
+                $nextArg .= chr(hexdec($byte));
             }
         }