Changeset 1743:a659700da036 for inc/core

Timestamp:

09/06/13 21:36:57 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Add mysqli support, step 1, addresses #1450

Location:

inc/core

Files:

• class.dc.blog.php (modified) (7 diffs)
• class.dc.core.php (modified) (1 diff)

inc/core/class.dc.blog.php

@@ -658 +658 @@
           if (!$rs->isEmpty())
           {
-               if ($this->con->driver() == 'mysql') {
+               if ($this->con->driver() == 'mysql' || $this->con->driver() == 'mysqli') {
                     $clause = "REGEXP '^".$this->con->escape($url)."[0-9]+$'";
                } elseif ($this->con->driver() == 'pgsql') {
@@ -1828 +1828 @@
           if (!$rs->isEmpty())
           {
-               if ($this->con->driver() == 'mysql') {
+               if ($this->con->driver() == 'mysql' || $this->con->driver() == 'mysqli') {
                     $clause = "REGEXP '^".$this->con->escape($url)."[0-9]+$'";
                } elseif ($this->con->driver() == 'pgsql') {
@@ -2187 +2187 @@
           
           # mySQL uses "JOIN" synthax
-          if ($this->con->driver() == 'mysql') {
+          if ($this->con->driver() == 'mysql' || $this->con->driver() == 'mysqli') {
                $strReq .= 
                     'JOIN '.$this->prefix.'post tp ON tc.post_id = tp.post_id ';
@@ -2196 +2196 @@
           
           # pgSQL uses "FROM" synthax
-          if ($this->con->driver() != 'mysql') {
+          if ($this->con->driver() != 'mysql' || $this->con->driver() == 'mysqli') {
                $strReq .= 
                     'FROM '.$this->prefix.'post tp ';
@@ -2206 +2206 @@
           
           # add pgSQL "WHERE" clause
-          if ($this->con->driver() != 'mysql') {
+          if ($this->con->driver() != 'mysql' || $this->con->driver() == 'mysqli') {
                $strReq .= 
                     'AND tc.post_id = tp.post_id ';
@@ -2265 +2265 @@
           
           # mySQL uses "INNER JOIN" synthax
-          if ($this->con->driver() == 'mysql') {
+          if ($this->con->driver() == 'mysql' || $this->con->driver() == 'mysqli') {
                $strReq = 
                     'DELETE FROM tc '.
@@ -2302 +2302 @@
           
           # mySQL uses "INNER JOIN" synthax
-          if ($this->con->driver() == 'mysql') {
+          if ($this->con->driver() == 'mysql' || $this->con->driver() == 'mysqli') {
                $strReq = 
                     'DELETE FROM tc '.

inc/core/class.dc.core.php

@@ -64 +64 @@
           if ($this->con instanceof mysqlConnection) {
                mysqlConnection::$weak_locks = true;
+          } elseif ($this->con instanceof mysqliConnection) {
+               mysqliConnection::$weak_locks = true;
           }