Changeset 3 for branches/rsr.v5.1.dev/web/punbb/include/dblayer/mysqli.php

Timestamp:

Nov 14, 2011, 11:17:15 PM (13 years ago)

Author:

dj3c1t

Message:

passage a Fluxbb 1.4.7

File:

• branches/rsr.v5.1.dev/web/punbb/include/dblayer/mysqli.php (modified) (8 diffs)

branches/rsr.v5.1.dev/web/punbb/include/dblayer/mysqli.php

@@ -1 +1 @@
 <?php
-/***********************************************************************
-
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
-
-  This file is part of PunBB.
-
-  PunBB is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published
-  by the Free Software Foundation; either version 2 of the License,
-  or (at your option) any later version.
-
-  PunBB is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-  MA  02111-1307  USA
-
-************************************************************************/
-
+
+/**
+ * Copyright (C) 2008-2011 FluxBB
+ * based on code by Rickard Andersson copyright (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
 
 // Make sure we have built in support for MySQL
@@ -38 +21 @@
         var $num_queries = 0;
 
-
-        function DBLayer($db_host, $db_username, $db_password, $db_name, $db_prefix, $foo)
+        var $error_no = false;
+        var $error_msg = 'Unknown';
+
+        var $datatype_transformations = array(
+                '%^SERIAL$%'    =>      'INT(10) UNSIGNED AUTO_INCREMENT'
+        );
+
+
+        function DBLayer($db_host, $db_username, $db_password, $db_name, $db_prefix, $p_connect)
         {
                 $this->prefix = $db_prefix;
@@ -47 +37 @@
                         list($db_host, $db_port) = explode(':', $db_host);
 
+                // Persistent connection in MySQLi are only available in PHP 5.3 and later releases
+                $p_connect = $p_connect && version_compare(PHP_VERSION, '5.3.0', '>=') ? 'p:' : '';
+
                 if (isset($db_port))
-                        $this->link_id = @mysqli_connect($db_host, $db_username, $db_password, $db_name, $db_port);
+                        $this->link_id = @mysqli_connect($p_connect.$db_host, $db_username, $db_password, $db_name, $db_port);
                 else
-                        $this->link_id = @mysqli_connect($db_host, $db_username, $db_password, $db_name);
+                        $this->link_id = @mysqli_connect($p_connect.$db_host, $db_username, $db_password, $db_name);
 
                 if (!$this->link_id)
                         error('Unable to connect to MySQL and select database. MySQL reported: '.mysqli_connect_error(), __FILE__, __LINE__);
+
+                // Setup the client-server character set (UTF-8)
+                if (!defined('FORUM_NO_SET_NAMES'))
+                        $this->set_names('utf8');
+
+                return $this->link_id;
         }
 
@@ -90 +89 @@
                                 $this->saved_queries[] = array($sql, 0);
 
+                        $this->error_no = @mysqli_errno($this->link_id);
+                        $this->error_msg = @mysqli_error($this->link_id);
+
                         return false;
                 }
@@ -95 +97 @@
 
 
-        function result($query_id = 0, $row = 0)
+        function result($query_id = 0, $row = 0, $col = 0)
         {
                 if ($query_id)
                 {
-                        if ($row)
-                                @mysqli_data_seek($query_id, $row);
+                        if ($row !== 0 && @mysqli_data_seek($query_id, $row) === false)
+                                return false;
 
                         $cur_row = @mysqli_fetch_row($query_id);
-                        return $cur_row[0];
+                        if ($cur_row === false)
+                                return false;
+
+                        return $cur_row[$col];
                 }
                 else
@@ -160 +165 @@
         function escape($str)
         {
-                return mysqli_real_escape_string($this->link_id, $str);
+                return is_array($str) ? '' : mysqli_real_escape_string($this->link_id, $str);
         }
 
@@ -167 +172 @@
         {
                 $result['error_sql'] = @current(@end($this->saved_queries));
-                $result['error_no'] = @mysqli_errno($this->link_id);
-                $result['error_msg'] = @mysqli_error($this->link_id);
+                $result['error_no'] = $this->error_no;
+                $result['error_msg'] = $this->error_msg;
 
                 return $result;
@@ -186 +191 @@
                         return false;
         }
+
+
+        function get_names()
+        {
+                $result = $this->query('SHOW VARIABLES LIKE \'character_set_connection\'');
+                return $this->result($result, 0, 1);
+        }
+
+
+        function set_names($names)
+        {
+                return $this->query('SET NAMES \''.$this->escape($names).'\'');
+        }
+
+
+        function get_version()
+        {
+                $result = $this->query('SELECT VERSION()');
+
+                return array(
+                        'name'          => 'MySQL Improved',
+                        'version'       => preg_replace('%^([^-]+).*$%', '\\1', $this->result($result))
+                );
+        }
+
+
+        function table_exists($table_name, $no_prefix = false)
+        {
+                $result = $this->query('SHOW TABLES LIKE \''.($no_prefix ? '' : $this->prefix).$this->escape($table_name).'\'');
+                return $this->num_rows($result) > 0;
+        }
+
+
+        function field_exists($table_name, $field_name, $no_prefix = false)
+        {
+                $result = $this->query('SHOW COLUMNS FROM '.($no_prefix ? '' : $this->prefix).$table_name.' LIKE \''.$this->escape($field_name).'\'');
+                return $this->num_rows($result) > 0;
+        }
+
+
+        function index_exists($table_name, $index_name, $no_prefix = false)
+        {
+                $exists = false;
+
+                $result = $this->query('SHOW INDEX FROM '.($no_prefix ? '' : $this->prefix).$table_name);
+                while ($cur_index = $this->fetch_assoc($result))
+                {
+                        if (strtolower($cur_index['Key_name']) == strtolower(($no_prefix ? '' : $this->prefix).$table_name.'_'.$index_name))
+                        {
+                                $exists = true;
+                                break;
+                        }
+                }
+
+                return $exists;
+        }
+
+
+        function create_table($table_name, $schema, $no_prefix = false)
+        {
+                if ($this->table_exists($table_name, $no_prefix))
+                        return true;
+
+                $query = 'CREATE TABLE '.($no_prefix ? '' : $this->prefix).$table_name." (\n";
+
+                // Go through every schema element and add it to the query
+                foreach ($schema['FIELDS'] as $field_name => $field_data)
+                {
+                        $field_data['datatype'] = preg_replace(array_keys($this->datatype_transformations), array_values($this->datatype_transformations), $field_data['datatype']);
+
+                        $query .= $field_name.' '.$field_data['datatype'];
+
+                        if (isset($field_data['collation']))
+                                $query .= 'CHARACTER SET utf8 COLLATE utf8_'.$field_data['collation'];
+
+                        if (!$field_data['allow_null'])
+                                $query .= ' NOT NULL';
+
+                        if (isset($field_data['default']))
+                                $query .= ' DEFAULT '.$field_data['default'];
+
+                        $query .= ",\n";
+                }
+
+                // If we have a primary key, add it
+                if (isset($schema['PRIMARY KEY']))
+                        $query .= 'PRIMARY KEY ('.implode(',', $schema['PRIMARY KEY']).'),'."\n";
+
+                // Add unique keys
+                if (isset($schema['UNIQUE KEYS']))
+                {
+                        foreach ($schema['UNIQUE KEYS'] as $key_name => $key_fields)
+                                $query .= 'UNIQUE KEY '.($no_prefix ? '' : $this->prefix).$table_name.'_'.$key_name.'('.implode(',', $key_fields).'),'."\n";
+                }
+
+                // Add indexes
+                if (isset($schema['INDEXES']))
+                {
+                        foreach ($schema['INDEXES'] as $index_name => $index_fields)
+                                $query .= 'KEY '.($no_prefix ? '' : $this->prefix).$table_name.'_'.$index_name.'('.implode(',', $index_fields).'),'."\n";
+                }
+
+                // We remove the last two characters (a newline and a comma) and add on the ending
+                $query = substr($query, 0, strlen($query) - 2)."\n".') ENGINE = '.(isset($schema['ENGINE']) ? $schema['ENGINE'] : 'MyISAM').' CHARACTER SET utf8';
+
+                return $this->query($query) ? true : false;
+        }
+
+
+        function drop_table($table_name, $no_prefix = false)
+        {
+                if (!$this->table_exists($table_name, $no_prefix))
+                        return true;
+
+                return $this->query('DROP TABLE '.($no_prefix ? '' : $this->prefix).$table_name) ? true : false;
+        }
+
+
+        function rename_table($old_table, $new_table, $no_prefix = false)
+        {
+                // If there new table exists and the old one doesn't, then we're happy
+                if ($this->table_exists($new_table, $no_prefix) && !$this->table_exists($old_table, $no_prefix))
+                        return true;
+
+                return $this->query('ALTER TABLE '.($no_prefix ? '' : $this->prefix).$old_table.' RENAME TO '.($no_prefix ? '' : $this->prefix).$new_table) ? true : false;
+        }
+
+
+        function add_field($table_name, $field_name, $field_type, $allow_null, $default_value = null, $after_field = null, $no_prefix = false)
+        {
+                if ($this->field_exists($table_name, $field_name, $no_prefix))
+                        return true;
+
+                $field_type = preg_replace(array_keys($this->datatype_transformations), array_values($this->datatype_transformations), $field_type);
+
+                if ($default_value !== null && !is_int($default_value) && !is_float($default_value))
+                        $default_value = '\''.$this->escape($default_value).'\'';
+
+                return $this->query('ALTER TABLE '.($no_prefix ? '' : $this->prefix).$table_name.' ADD '.$field_name.' '.$field_type.($allow_null ? ' ' : ' NOT NULL').($default_value !== null ? ' DEFAULT '.$default_value : ' ').($after_field != null ? ' AFTER '.$after_field : '')) ? true : false;
+        }
+
+
+        function alter_field($table_name, $field_name, $field_type, $allow_null, $default_value = null, $after_field = null, $no_prefix = false)
+        {
+                if (!$this->field_exists($table_name, $field_name, $no_prefix))
+                        return true;
+
+                $field_type = preg_replace(array_keys($this->datatype_transformations), array_values($this->datatype_transformations), $field_type);
+
+                if ($default_value !== null && !is_int($default_value) && !is_float($default_value))
+                        $default_value = '\''.$this->escape($default_value).'\'';
+
+                return $this->query('ALTER TABLE '.($no_prefix ? '' : $this->prefix).$table_name.' MODIFY '.$field_name.' '.$field_type.($allow_null ? ' ' : ' NOT NULL').($default_value !== null ? ' DEFAULT '.$default_value : ' ').($after_field != null ? ' AFTER '.$after_field : '')) ? true : false;
+        }
+
+
+        function drop_field($table_name, $field_name, $no_prefix = false)
+        {
+                if (!$this->field_exists($table_name, $field_name, $no_prefix))
+                        return true;
+
+                return $this->query('ALTER TABLE '.($no_prefix ? '' : $this->prefix).$table_name.' DROP '.$field_name) ? true : false;
+        }
+
+
+        function add_index($table_name, $index_name, $index_fields, $unique = false, $no_prefix = false)
+        {
+                if ($this->index_exists($table_name, $index_name, $no_prefix))
+                        return true;
+
+                return $this->query('ALTER TABLE '.($no_prefix ? '' : $this->prefix).$table_name.' ADD '.($unique ? 'UNIQUE ' : '').'INDEX '.($no_prefix ? '' : $this->prefix).$table_name.'_'.$index_name.' ('.implode(',', $index_fields).')') ? true : false;
+        }
+
+
+        function drop_index($table_name, $index_name, $no_prefix = false)
+        {
+                if (!$this->index_exists($table_name, $index_name, $no_prefix))
+                        return true;
+
+                return $this->query('ALTER TABLE '.($no_prefix ? '' : $this->prefix).$table_name.' DROP INDEX '.($no_prefix ? '' : $this->prefix).$table_name.'_'.$index_name) ? true : false;
+        }
+
+        function truncate_table($table_name, $no_prefix = false)
+        {
+                return $this->query('TRUNCATE TABLE '.($no_prefix ? '' : $this->prefix).$table_name) ? true : false;
+        }
 }