Changeset 3756:66ea0528142b

Timestamp:

05/30/18 11:52:24 (5 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Missed these one (see [3754])

Files:

• admin/install/check.php (modified) (1 diff)
• plugins/importExport/inc/flat/class.flat.import.php (modified) (3 diffs)

admin/install/check.php

@@ -47 +47 @@
     }
 
-    if ($con->driver() == 'mysql' || $con->driver() == 'mysqli' || $con->driver() == 'mysqlimb4') {
+    if ($con->syntax() == 'mysql') {
         if (version_compare($con->version(), '4.1', '<')) {
             $err[] = sprintf(__('MySQL version is %s (4.1 or earlier needed).'), $con->version());

plugins/importExport/inc/flat/class.flat.import.php

@@ -168 +168 @@
                     if (in_array($last_line_name, $constrained)) {
                         # UNDEFER
-                        if ($this->con->driver() == 'mysql' || $this->con->driver() == 'mysqli' || $this->con->driver() == 'mysqlimb4') {
+                        if ($this->con->syntax() == 'mysql') {
                             $this->con->execute('SET foreign_key_checks = 1');
                         }
 
-                        if ($this->con->driver() == 'pgsql') {
+                        if ($this->con->syntax() == 'postgresql') {
                             $this->con->execute('SET CONSTRAINTS ALL DEFERRED');
                         }
@@ -180 +180 @@
                     if (in_array($line->__name, $constrained)) {
                         # DEFER
-                        if ($this->con->driver() == 'mysql' || $this->con->driver() == 'mysqli' || $this->con->driver() == 'mysqlimb4') {
+                        if ($this->con->syntax() == 'mysql') {
                             $this->con->execute('SET foreign_key_checks = 0');
                         }
 
-                        if ($this->con->driver() == 'pgsql') {
+                        if ($this->con->syntax() == 'postgresql') {
                             $this->con->execute('SET CONSTRAINTS ALL IMMEDIATE');
                         }
@@ -224 +224 @@
             }
 
-            if ($this->con->driver() == 'mysql' || $this->con->driver() == 'mysqli' || $this->con->driver() == 'mysqlimb4') {
+            if ($this->con->syntax() == 'mysql') {
                 $this->con->execute('SET foreign_key_checks = 1');
             }
 
-            if ($this->con->driver() == 'pgsql') {
+            if ($this->con->syntax() == 'postgresql') {
                 $this->con->execute('SET CONSTRAINTS ALL DEFERRED');
             }