Thread: [xoops-svn] SF.net SVN: xoops-svn:[10656] ThirdParty

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 10656
          http://sourceforge.net/p/xoops/svn/10656
Author:   redheadedrod
Date:     2013-01-04 05:58:56 +0000 (Fri, 04 Jan 2013)
Log Message:
-----------
Created rhr_database_connectors directory and incorporated the mysqli and mysqlpdo connectors. Deleted the original mysqli folder I created to put them together.

Added Paths:
-----------
    ThirdParty/rhr_database_connectors/
    ThirdParty/rhr_database_connectors/README.TXT
    ThirdParty/rhr_database_connectors/mysqlidatabase.php
    ThirdParty/rhr_database_connectors/mysqlpdodatabase.php
    ThirdParty/rhr_database_connectors/pdodatabase.php

Removed Paths:
-------------
    ThirdParty/mysqli/

Added: ThirdParty/rhr_database_connectors/README.TXT
===================================================================

--- ThirdParty/rhr_database_connectors/README.TXT	                        (rev 0)
+++ ThirdParty/rhr_database_connectors/README.TXT	2013-01-04 05:58:56 UTC (rev 10656)
@@ -0,0 +1,60 @@
+January 3, 2013
+
+
+
+This directory contains 2 basic connectors to connect to a MySQL database
+tested against xoops 2.5.5 core.
+
+
+To install these just copy the files into your class/database folder. 
+
+To use them you must change the "define('XOOPS_DB_TYPE', 'mysql');" 
+in your xoops_data/data/secure.php file. 
+
+Use "define('XOOPS_DB_TYPE', 'mysqli');" to use the MySQLi connector.
+
+Use "define('XOOPS_DB_TYPE', 'mysqlpdo');" to use the PDO_MySQL connector.
+
+
+
+The MySQLi connector is included as a drop in option for Xoops 2.5.5 for when the old MySQL
+connector
+is removed from PHP. This version has no additional features that were added with 
+MySQL 4 or 5 because
+xoops intends to move to PDO. 
+
+
+
+The PDO_MySQL connector is based off the original MySQL connector but was broken into two
+files. 
+The pdodatabase class in the pdodatabase.php file extends the Database object to add
+ the generic PDO
+routines for use by all databases. The mysqlpdodatabase class inside the 
+mysqlpdodatabase.php file 
+contains all of the MySQL specific items. Really the only item
+that is specific to MySQL is the connect string.
+The other classes were added because they
+ extend the finished database class. To add other databases one
+should only need to copy 
+the mysqlpdodatabase.php file and make the appropriate changes. This version should
+be a
+ drop in replacement for your system. It tested 100% the same as MySQL and MySQLi connectors. 
+Although I
+feel confident that this should work, it should be considered ALPHA because I 
+have not yet added 
+MySQL 4 or 5 features. Once the extra features have been added It 
+will be released as a BETA version so this 
+will be the only ALPHA released version.
+
+
+
+These database connectors are NOT supported by the core team at this time so use them at your own risk. 
+They work fine on my system with no modules installed but 
+modules that don't use the xoops API to access
+the database and access it directly instead 
+will not likely work properly until rewritten to take advantage
+of the API. 
+
+
+
+Rodney (red...@ho...)
\ No newline at end of file

Added: ThirdParty/rhr_database_connectors/mysqlidatabase.php
===================================================================
--- ThirdParty/rhr_database_connectors/mysqlidatabase.php	                        (rev 0)
+++ ThirdParty/rhr_database_connectors/mysqlidatabase.php	2013-01-04 05:58:56 UTC (rev 10656)
@@ -0,0 +1,406 @@
+<?php
+/**
+ * MySQL access
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program 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.
+ *
+ * @copyright       The XOOPS project http://sourceforge.net/projects/xoops/
+ * @license         GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package         kernel
+ * @subpackage      database
+ * @since           1.0.0
+ * @author          Kazumi Ono <on...@xo...>
+ * @author			Rodney Fulk <red...@ho...>
+ * @version         $Id: mysqlidatabase.php 8066 2012-06-22 05:09:33Z redheadedrod $
+ */
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+/**
+ *
+ * @package kernel
+ * @subpackage database
+ * @author Kazumi Ono <on...@xo...>
+ * @copyright copyright (c) 2000-2003 XOOPS.org
+ * @updated via MySQLConverterTool from http://forge.mysql.com/wiki/Converting_to_MySQLi
+ */
+
+/**
+ * base class
+ */
+include_once XOOPS_ROOT_PATH . '/class/database/database.php';
+// xoops_load( 'xoopsdatabase' );
+/**
+ * connection to a mysql database
+ *
+ * @abstract
+ * @author Kazumi Ono <on...@xo...>
+ * @copyright copyright (c) 2000-2003 XOOPS.org
+ * @package kernel
+ * @subpackage database
+ */
+class XoopsMySQLiDatabase extends XoopsDatabase
+{
+    /**
+     * Database connection
+     *
+     * @var resource
+     */
+    var $conn;
+
+    /**
+     * connect to the database
+     *
+     * @param bool $selectdb select the database now?
+     * @return bool successful?
+     */
+    function connect($selectdb = true)
+    {
+        static $db_charset_set;
+        if (!extension_loaded('mysqli')) {
+            trigger_error('notrace:mysqli extension not loaded', E_USER_ERROR);
+            return false;
+        }
+
+        $this->allowWebChanges = ($_SERVER['REQUEST_METHOD'] != 'GET');
+
+        if (XOOPS_DB_PCONNECT == 1) {
+            $this->conn = @($GLOBALS["___mysqli_ston"] = mysqli_connect("p:".XOOPS_DB_HOST,  XOOPS_DB_USER,  XOOPS_DB_PASS));
+        } else {
+            $this->conn = @($GLOBALS["___mysqli_ston"] = mysqli_connect(XOOPS_DB_HOST,  XOOPS_DB_USER,  XOOPS_DB_PASS));
+        }
+
+        if (!$this->conn) {
+            $this->logger->addQuery('', $this->error(), $this->errno());
+            return false;
+        }
+        if ($selectdb != false) {
+            if (!((bool)mysqli_query($GLOBALS["___mysqli_ston"], "USE " . constant('XOOPS_DB_NAME')))) {
+                $this->logger->addQuery('', $this->error(), $this->errno());
+                return false;
+            }
+        }
+        if (!isset($db_charset_set) && defined('XOOPS_DB_CHARSET') && XOOPS_DB_CHARSET) {
+            $this->queryF("SET NAMES '" . XOOPS_DB_CHARSET . "'");
+        }
+        $db_charset_set = 1;
+        $this->queryF("SET SQL_BIG_SELECTS = 1");
+        return true;
+    }
+
+    /**
+     * generate an ID for a new row
+     *
+     * This is for compatibility only. Will always return 0, because MySQL supports
+     * autoincrement for primary keys.
+     *
+     * @param string $sequence name of the sequence from which to get the next ID
+     * @return int always 0, because mysql has support for autoincrement
+     */
+    function genId($sequence)
+    {
+        return 0; // will use auto_increment
+    }
+
+    /**
+     * Get a result row as an enumerated array
+     *
+     * @param resource $result
+     * @return array
+     */
+    function fetchRow($result)
+    {
+        return @mysqli_fetch_row($result);
+    }
+
+    /**
+     * Fetch a result row as an associative array
+     *
+     * @return array
+     */
+    function fetchArray($result)
+    {
+        return @mysqli_fetch_assoc($result);
+    }
+
+    /**
+     * Fetch a result row as an associative array
+     *
+     * @return array
+     */
+    function fetchBoth($result)
+    {
+        return @mysqli_fetch_array($result,  MYSQLI_BOTH);
+    }
+
+    /**
+     * XoopsMySQLDatabase::fetchObjected()
+     *
+     * @param mixed $result
+     * @return
+     */
+    function fetchObject($result)
+    {
+        return @mysqli_fetch_object($result);
+    }
+
+    /**
+     * Get the ID generated from the previous INSERT operation
+     *
+     * @return int
+     */
+    function getInsertId()
+    {
+        return ((is_null($___mysqli_res = mysqli_insert_id($this->conn))) ? false : $___mysqli_res);
+    }
+
+    /**
+     * Get number of rows in result
+     *
+     * @param resource $ query result
+     * @return int
+     */
+    function getRowsNum($result)
+    {
+        return @mysqli_num_rows($result);
+    }
+
+    /**
+     * Get number of affected rows
+     *
+     * @return int
+     */
+    function getAffectedRows()
+    {
+        return mysqli_affected_rows($this->conn);
+    }
+
+    /**
+     * Close MySQL connection
+     */
+    function close()
+    {
+        ((is_null($___mysqli_res = mysqli_close($this->conn))) ? false : $___mysqli_res);
+    }
+
+    /**
+     * will free all memory associated with the result identifier result.
+     *
+     * @param resource $ query result
+     * @return bool TRUE on success or FALSE on failure.
+     */
+    function freeRecordSet($result)
+    {
+        return ((mysqli_free_result($result) || (is_object($result) && (get_class($result) == "mysqli_result"))) ? true : false);
+    }
+
+    /**
+     * Returns the text of the error message from previous MySQL operation
+     *
+     * @return bool Returns the error text from the last MySQL function, or '' (the empty string) if no error occurred.
+     */
+    function error()
+    {
+        return @((is_object($GLOBALS["___mysqli_ston"])) ? mysqli_error($GLOBALS["___mysqli_ston"]) : (($___mysqli_res = mysqli_connect_error()) ? $___mysqli_res : false));
+    }
+
+    /**
+     * Returns the numerical value of the error message from previous MySQL operation
+     *
+     * @return int Returns the error number from the last MySQL function, or 0 (zero) if no error occurred.
+     */
+    function errno()
+    {
+        return @((is_object($GLOBALS["___mysqli_ston"])) ? mysqli_errno($GLOBALS["___mysqli_ston"]) : (($___mysqli_res = mysqli_connect_errno()) ? $___mysqli_res : false));
+    }
+
+    /**
+     * Returns escaped string text with single quotes around it to be safely stored in database
+     *
+     * @param string $str unescaped string text
+     * @return string escaped string text with single quotes around
+     */
+    function quoteString($str)
+    {
+        return $this->quote($str);
+    }
+
+    /**
+     * Quotes a string for use in a query.
+     */
+    function quote($string)
+    {
+        return "'" . str_replace("\\\"", '"', str_replace("\\&quot;", '&quot;', mysqli_real_escape_string( $this->conn, $string))) . "'";
+    }
+
+    /**
+     * perform a query on the database
+     *
+     * @param string $sql a valid MySQL query
+     * @param int $limit number of records to return
+     * @param int $start offset of first record to return
+     * @return resource query result or FALSE if successful
+     * or TRUE if successful and no result
+     */
+    function queryF($sql, $limit = 0, $start = 0)
+    {
+        if (!empty($limit)) {
+            if (empty($start)) {
+                $start = 0;
+            }
+            $sql = $sql . ' LIMIT ' . (int) $start . ', ' . (int) $limit;
+        }
+        //$this->logger->startTime('query_time');
+        $result = mysqli_query( $this->conn, $sql);
+        //$this->logger->stopTime('query_time');
+       // $query_time = $this->logger->dumpTime('query_time', true);
+        if ($result) {
+            //$this->logger->addQuery($sql, null, null, $query_time);
+            return $result;
+        } else {
+           // $this->logger->addQuery($sql, $this->error(), $this->errno(), $query_time);
+            return false;
+        }
+    }
+
+    /**
+     * perform a query
+     *
+     * This method is empty and does nothing! It should therefore only be
+     * used if nothing is exactly what you want done! ;-)
+     *
+     * @param string $sql a valid MySQL query
+     * @param int $limit number of records to return
+     * @param int $start offset of first record to return
+     * @abstract
+     */
+    function query($sql, $limit = 0, $start = 0)
+    {
+    }
+
+    /**
+     * perform queries from SQL dump file in a batch
+     *
+     * @param string $file file path to an SQL dump file
+     * @return bool FALSE if failed reading SQL file or TRUE if the file has been read and queries executed
+     */
+    function queryFromFile($file)
+    {
+        if (false !== ($fp = fopen($file, 'r'))) {
+            include_once XOOPS_ROOT_PATH . '/class/database/sqlutility.php';
+            $sql_queries = trim(fread($fp, filesize($file)));
+            SqlUtility::splitMySqlFile($pieces, $sql_queries);
+            foreach ($pieces as $query) {
+                // [0] contains the prefixed query
+                // [4] contains unprefixed table name
+                $prefixed_query = SqlUtility::prefixQuery(trim($query), $this->prefix());
+                if ($prefixed_query != false) {
+                    $this->query($prefixed_query[0]);
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Get field name
+     *
+     * @param resource $result query result
+     * @param int $ numerical field index
+     * @return string
+     */
+    function getFieldName($result, $offset)
+    {
+		return ((($___mysqli_tmp = mysqli_fetch_field_direct($result, $offset)->name) && (!is_null($___mysqli_tmp))) ? $___mysqli_tmp : false);
+    }
+
+    /**
+     * Get field type
+     *
+     * @param resource $result query result
+     * @param int $offset numerical field index
+     * @return string
+     */
+    function getFieldType($result, $offset)
+    {
+		return ((is_object($___mysqli_tmp = mysqli_fetch_field_direct($result, $offset)) && !is_null($___mysqli_tmp = $___mysqli_tmp->type)) ? ((($___mysqli_tmp = (string)(substr(( (($___mysqli_tmp == MYSQLI_TYPE_STRING) || ($___mysqli_tmp == MYSQLI_TYPE_VAR_STRING) ) ? "string " : "" ) . ( (in_array($___mysqli_tmp, array(MYSQLI_TYPE_TINY, MYSQLI_TYPE_SHORT, MYSQLI_TYPE_LONG, MYSQLI_TYPE_LONGLONG, MYSQLI_TYPE_INT24))) ? "int " : "" ) . ( (in_array($___mysqli_tmp, array(MYSQLI_TYPE_FLOAT, MYSQLI_TYPE_DOUBLE, MYSQLI_TYPE_DECIMAL, ((defined("MYSQLI_TYPE_NEWDECIMAL")) ? constant("MYSQLI_TYPE_NEWDECIMAL") : -1)))) ? "real " : "" ) . ( ($___mysqli_tmp == MYSQLI_TYPE_TIMESTAMP) ? "timestamp " : "" ) . ( ($___mysqli_tmp == MYSQLI_TYPE_YEAR) ? "year " : "" ) . ( (($___mysqli_tmp == MYSQLI_TYPE_DATE) || ($___mysqli_tmp == MYSQLI_TYPE_NEWDATE) ) ? "date " : "" ) . ( ($___mysqli_tmp == MYSQLI_TYPE_TIME) ? "time " : "" ) . ( ($___mysqli_tmp == MYSQLI_TYPE_SET) ? "set " : "" ) . ( ($___mysqli_tmp == MYSQLI_TYPE_ENUM) ? "enum " : "" ) . ( ($___mysqli_tmp == MYSQLI_TYPE_GEOMETRY) ? "geometry " : "" ) . ( ($___mysqli_tmp == MYSQLI_TYPE_DATETIME) ? "datetime " : "" ) . ( (in_array($___mysqli_tmp, array(MYSQLI_TYPE_TINY_BLOB, MYSQLI_TYPE_BLOB, MYSQLI_TYPE_MEDIUM_BLOB, MYSQLI_TYPE_LONG_BLOB))) ? "blob " : "" ) . ( ($___mysqli_tmp == MYSQLI_TYPE_NULL) ? "null " : "" ), 0, -1))) == "") ? "unknown" : $___mysqli_tmp) : false);
+    }
+
+    /**
+     * Get number of fields in result
+     *
+     * @param resource $result query result
+     * @return int
+     */
+    function getFieldsNum($result)
+    {
+        return (($___mysqli_tmp = mysqli_num_fields($result)) ? $___mysqli_tmp : false);
+    }
+}
+
+/**
+ * Safe Connection to a MySQL database.
+ *
+ * @author Kazumi Ono <on...@xo...>
+ * @copyright copyright (c) 2000-2003 XOOPS.org
+ * @package kernel
+ * @subpackage database
+ */
+class XoopsMySQLiDatabaseSafe extends XoopsMySQLiDatabase
+{
+    /**
+     * perform a query on the database
+     *
+     * @param string $sql a valid MySQL query
+     * @param int $limit number of records to return
+     * @param int $start offset of first record to return
+     * @return resource query result or FALSE if successful
+     * or TRUE if successful and no result
+     */
+    function query($sql, $limit = 0, $start = 0)
+    {
+        return $this->queryF($sql, $limit, $start);
+    }
+}
+
+/**
+ * Read-Only connection to a MySQL database.
+ *
+ * This class allows only SELECT queries to be performed through its
+ * {@link query()} method for security reasons.
+ *
+ * @author Kazumi Ono <on...@xo...>
+ * @copyright copyright (c) 2000-2003 XOOPS.org
+ * @package kernel
+ * @subpackage database
+ */
+class XoopsMySQLiDatabaseProxy extends XoopsMySQLiDatabase
+{
+    /**
+     * perform a query on the database
+     *
+     * this method allows only SELECT queries for safety.
+     *
+     * @param string $sql a valid MySQL query
+     * @param int $limit number of records to return
+     * @param int $start offset of first record to return
+     * @return resource query result or FALSE if unsuccessful
+     */
+    function query($sql, $limit = 0, $start = 0)
+    {
+        $sql = ltrim($sql);
+        if (!$this->allowWebChanges && strtolower(substr($sql, 0, 6)) != 'select') {
+            trigger_error('Database updates are not allowed during processing of a GET request', E_USER_WARNING);
+            return false;
+        }
+
+        return $this->queryF($sql, $limit, $start);
+    }
+}
+
+?>
\ No newline at end of file

Added: ThirdParty/rhr_database_connectors/mysqlpdodatabase.php
===================================================================
--- ThirdParty/rhr_database_connectors/mysqlpdodatabase.php	                        (rev 0)
+++ ThirdParty/rhr_database_connectors/mysqlpdodatabase.php	2013-01-04 05:58:56 UTC (rev 10656)
@@ -0,0 +1,125 @@
+<?php
+/**
+ * MySQL access via PDO
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program 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.
+ *
+ * @copyright       The XOOPS project http://sourceforge.net/projects/xoops/
+ * @license         GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package         kernel
+ * @subpackage      database
+ * @since           2.5.5
+ * @author			Rodney Fulk <red...@ho...>
+ * @version         $Id: mysqlpdodatabase.php 8066 2012-07-02 00:00:00Z redheadedrod $
+ */
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+/**
+ *
+ * @package kernel
+ * @subpackage database
+ * @author Rodney Fulk	<red...@ho...>
+ * @copyright copyright (c) 2012-2013 XOOPS.org
+ */
+
+/**
+ * base class
+ */
+include_once XOOPS_ROOT_PATH . '/class/database/pdodatabase.php';
+
+/**
+ * connection to a mysql database via PDO
+ *
+ * @abstract
+ * @author Rodney Fulk <red...@ho...>
+ * @copyright copyright (c) 2012-2013 XOOPS.org
+ * @package kernel
+ * @subpackage database
+ */
+class XoopsMySQLPDODatabase extends XoopsPDODatabase
+{
+
+    /**
+     * connect to the database - MySQL extention for PDO
+     *
+     * @param bool $selectdb select the database now?
+     * @return bool successful?
+     */
+    function connect($selectdb = true)
+    {
+		$DNS = "mysql:host=".XOOPS_DB_HOST.";dbname=".XOOPS_DB_NAME;
+		$result = $this->connectPDO($selectdb, 'pdo_mysql', $DNS);
+		if ($result) {
+			$db_charset_set = 1;
+			$this->queryF("SET SQL_BIG_SELECTS = 1");
+		}
+        return $result;
+    }
+}
+
+
+/**
+ * Safe Connection to a MySQL database via PDO.
+ *
+ * @author Kazumi Ono <on...@xo...>
+ * @author Rodney Fulk <red...@ho...>
+ * @copyright copyright (c) 2000-2003 XOOPS.org
+ * @package kernel
+ * @subpackage database
+ */
+class XoopsMySQLPDODatabaseSafe extends XoopsMySQLPDODatabase
+{
+    /**
+     * perform a query on the database
+     *
+     * @param string $sql a valid MySQL query
+     * @param int $limit number of records to return
+     * @param int $start offset of first record to return
+     * @return resource query result or FALSE if successful
+     * or TRUE if successful and no result
+     */
+    function query($sql, $limit = 0, $start = 0)
+    {
+        return $this->queryF($sql, $limit, $start);
+    }
+}
+
+/**
+ * Read-Only connection to a MySQL database via PDO.
+ *
+ * This class allows only SELECT queries to be performed through its
+ * {@link query()} method for security reasons.
+ *
+ * @author Kazumi Ono <on...@xo...>
+ * @author Rodney Fulk	<red...@ho...>
+ * @copyright copyright (c) 2000-2003 XOOPS.org
+ * @package kernel
+ * @subpackage database
+ */
+class XoopsMySQLPDODatabaseProxy extends XoopsMySQLPDODatabase
+{
+    /**
+     * perform a query on the database
+     *
+     * this method allows only SELECT queries for safety.
+     *
+     * @param string $sql a valid MySQL query
+     * @param int $limit number of records to return
+     * @param int $start offset of first record to return
+     * @return resource query result or FALSE if unsuccessful
+     */
+    function query($sql, $limit = 0, $start = 0)
+    {
+        $sql = ltrim($sql);
+        if (!$this->allowWebChanges && strtolower(substr($sql, 0, 6)) != 'select') {
+            trigger_error('Database updates are not allowed during processing of a GET request', E_USER_WARNING);
+            return false;
+        }
+        return $this->queryF($sql, $limit, $start);
+    }
+}
\ No newline at end of file

Added: ThirdParty/rhr_database_connectors/pdodatabase.php
===================================================================
--- ThirdParty/rhr_database_connectors/pdodatabase.php	                        (rev 0)
+++ ThirdParty/rhr_database_connectors/pdodatabase.php	2013-01-04 05:58:56 UTC (rev 10656)
@@ -0,0 +1,548 @@
+<?php
+/**
+ * MySQL access
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program 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.
+ *
+ * @copyright       The XOOPS project http://sourceforge.net/projects/xoops/
+ * @license         GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package         kernel
+ * @subpackage      database
+ * @since           2.5.5
+ * @author          Kazumi Ono <on...@xo...>
+ * @author Rodney Fulk <red...@ho...>
+ * @version         $Id: mysqldatabase.php 8066 2011-11-06 05:09:33Z beckmi $
+ */
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+/**
+ *
+ * @package kernel
+ * @subpackage database
+ * @author Kazumi Ono <on...@xo...>
+ * @author Rodney Fulk <red...@ho...>
+ * @copyright copyright (c) 2000-2003 XOOPS.org
+ */
+
+/**
+ * base class
+ */
+include_once XOOPS_ROOT_PATH . '/class/database/database.php';
+
+/**
+ * connection to a mysql database
+ *
+ * @abstract
+ * @author Kazumi Ono <on...@xo...>
+ * @author Rodney Fulk <red...@ho...>
+ * @copyright copyright (c) 2000-2003 XOOPS.org
+ * @package kernel
+ * @subpackage database
+ */
+class XoopsPDODatabase extends XoopsDatabase
+{
+    /**
+     * Database connection
+     *
+     * @var resource
+     */
+    public $conn;
+	
+	/** 
+	 * See getRowsNum for details.
+	 */
+	private $rowsnum= null; 
+	
+	/**
+	 * to be used by logError system
+	 */
+	private $errorNum = 0;
+	/**
+	 * to be used by logError system
+	 */
+	private $errorMessage  = null;
+	
+	/**
+	 * Logs error to error system
+	 */
+	function logError($e)
+	{	
+		$this->errorNum = $e->getCode();
+		$this->errorMessage = $e->getMessage();
+		$this->logger->addQuery('', $this->errorMessage, $this->errorNum);
+	}
+	
+	/**
+     * connect to the database 
+     *
+     * @param bool $selectdb select the database now?
+	 * @param string $PDOExtension is the php extension of the database used
+	 * @param string $DSN is the PDO DSN string to connect to particular database
+     * @return bool successful?
+     */
+    function connectPDO($selectdb, $PDOExtension, $DSN )
+    {
+        static $db_charset_set;
+        if (!extension_loaded($PDOExtension)) {
+            trigger_error('notrace:' . $PDOExtension . ' extension not loaded', E_USER_ERROR);
+            return false;
+        } 
+        $this->allowWebChanges = ($_SERVER['REQUEST_METHOD'] != 'GET');
+    
+		try 
+		{
+			if (XOOPS_DB_PCONNECT == 1) 
+			{
+				$this->conn = new PDO ($DSN, XOOPS_DB_USER, XOOPS_DB_PASS, array(PDO::ATTR_PERSISTENT => TRUE));
+			} else {
+				$this->conn = new PDO ($DSN, XOOPS_DB_USER, XOOPS_DB_PASS, array(PDO::ATTR_PERSISTENT => FALSE));
+			}
+			$this->conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+ 
+		/**
+		 * Selection of database is not directly supported by PDO but we CAN use an SQL statement
+		 * to accomplish the same thing.
+		 */
+
+			if ($selectdb != false) {
+				$this->conn->exec('USE ' . XOOPS_DB_NAME);
+			}
+			//Setting up characterset in database
+			if (!isset($db_charset_set) && defined('XOOPS_DB_CHARSET') && XOOPS_DB_CHARSET) {
+				$this->queryF("SET NAMES '" . XOOPS_DB_CHARSET . "'");
+			}
+		}
+		catch (PDOException $e)
+		{
+			$this->logError($e);
+			return false;
+		}
+        return true;
+    }
+
+    /**
+     * generate an ID for a new row
+     *
+     * This is for compatibility only. Will always return 0, because MySQL supports
+     * autoincrement for primary keys.
+     *
+     * @param string $sequence name of the sequence from which to get the next ID
+     * @return int always 0, because mysql has support for autoincrement
+     */
+    function genId($sequence)
+    {
+        return 0; // will use auto_increment
+    }
+
+    /**
+     * Get a result row as an enumerated array
+     *
+     * @param resource $result
+     * @return array
+     */
+    function fetchRow($result)
+    {
+        //return @mysql_fetch_row($result);
+		try
+		{
+			return $result->fetch(PDO::FETCH_NUM);
+		}
+		catch (PDOException $e)
+		{
+			$this->logError($e);
+            return false;
+		}
+    }
+	
+
+
+    /**
+     * Fetch a result row as an associative array
+     *
+     * @return array
+     */
+    function fetchArray($result)
+    {
+        //return @mysql_fetch_assoc($result);
+		try
+		{
+			return $result->fetch(PDO::FETCH_ASSOC);
+		}
+		catch (PDOException $e)
+		{
+			$this->logError($e);
+            return false;
+		}
+	}
+
+    /**
+     * Fetch a result row as an associative array
+     * Array is switched from MySQL May have to change
+     *
+     * @return array
+     */
+    function fetchBoth($result)
+    {
+        //return @mysql_fetch_array($result, MYSQL_BOTH);
+		try
+		{
+			return $result->fetch(PDO::FETCH_BOTH);
+		}
+		catch (PDOException $e)
+		{
+			$this->logError($e);
+            return false;
+		}
+    }
+
+    /**
+     * XoopsMySQLDatabase::fetchObjected()
+     *
+     * @param mixed $result
+     * @return
+     */
+    function fetchObject($result)
+    {
+        //return @mysql_fetch_object($result);
+		try
+		{
+			return $result->fetch(PDO::FETCH_OBJ);
+		}
+		catch (PDOException $e)
+		{
+			$this->logError($e);
+            return false;
+		}
+    }
+
+    /**
+     * Get the ID generated from the previous INSERT operation
+     *
+     * @return int
+     */
+    function getInsertId()
+    {
+        //return mysql_insert_id($this->conn);
+		try
+		{
+			return $this->conn->lastInsertId();
+		}
+		catch (PDOException $e)
+		{
+			$this->logError($e);
+            return false;
+		}
+    }
+
+    /**
+     * Get number of rows in result
+     * Intended just for SELECT
+     * 
+     *	Calculated in queryF
+	 	 * rowsnum is not directly supported in PDO and should be depreciated.
+	 * It only works with MySQL as a short cut and should not be used. 
+	 * The PROPER method is to count the records as you read the file.
+	 * you may also call the fetchColumn() method that gets returned with the 
+	 * "result" object but this may not be accurate with some databases.
+     * For compatibility purposes this variable is used in a workaround that is
+	 * done in the queryF method but may not be fully accurate.
+	 *  
+	 *
+     * @param resource $ query result
+     * @return int
+     */
+    function getRowsNum($result)
+    {
+        //return @mysql_num_rows($result);
+		// This 
+			return $this->rowsnum;   
+    }
+
+    /**
+     * Get number of affected rows
+	 * Intended for UPDATE, INSERT or DELETE only
+	 * You should MANUALLY count records with select statements or use
+	 * SELECT COUNT(*) SQL statement. 
+     * 
+     * @return int
+     */
+	function getAffectedRows($result = null)
+    {
+        //return mysql_affected_rows($this->conn);
+		//return $this->affectedrows;
+		if (empty ($result)) {
+			return null;
+		} else {
+			return $result->rowCount();
+		}
+    }
+
+    /**
+     * Close MySQL connection
+     */
+    function close()
+    {
+        //mysql_close($this->conn);
+		$this->conn = null;
+    }
+
+    /**
+     * will free all memory associated with the result identifier result.
+	 *
+     * @param resource $ query result
+     * @return bool TRUE on success or FALSE on failure.
+     */
+    function freeRecordSet($result)
+    {
+		return $result = null;
+    }
+
+    /**
+     * Returns the text of the error message from previous MySQL operation
+     *
+     * @return bool Returns the error text from the last MySQL function, or '' (the empty string) if no error occurred.
+     */
+
+    function error()
+    {
+		/** 
+		 * Not used with exception system
+		 *
+		$err = @$this->conn->errorInfo();
+		return $err[2];
+		*/
+		$message = $this->errorMessage;
+		$this->errorMessage = null;
+		return $message;
+    } 
+
+    /**
+     * Returns the numerical value of the error message from previous MySQL operation
+     *
+     * @return int Returns the error number from the last MySQL function, or 0 (zero) if no error occurred.
+     */
+
+    function errno()
+    {
+		/** 
+		 * Not used with exception system
+		 *
+		return @$this->conn->errorCode();
+		*/
+		$num = $this...
 
[truncated message content]

Thread: [xoops-svn] SF.net SVN: xoops-svn:[10656] ThirdParty

The world's leading content management systems (CMS) written in PHP

xoops-svn