From 6cd00992a2c7de38e0ff7df152fba8ea89012dce Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 12 Sep 2008 12:48:23 -0400
Subject: [PATCH] - Fixed quota img height/width setting from template (#1484857)
---
program/lib/MDB2/Driver/Datatype/Common.php | 955 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 758 insertions(+), 197 deletions(-)
diff --git a/program/lib/MDB2/Driver/Datatype/Common.php b/program/lib/MDB2/Driver/Datatype/Common.php
old mode 100755
new mode 100644
index 808fd18..2134e64
--- a/program/lib/MDB2/Driver/Datatype/Common.php
+++ b/program/lib/MDB2/Driver/Datatype/Common.php
@@ -2,7 +2,7 @@
// +----------------------------------------------------------------------+
// | PHP versions 4 and 5 |
// +----------------------------------------------------------------------+
-// | Copyright (c) 1998-2004 Manuel Lemos, Tomas V.V.Cox, |
+// | Copyright (c) 1998-2007 Manuel Lemos, Tomas V.V.Cox, |
// | Stig. S. Bakken, Lukas Smith |
// | All rights reserved. |
// +----------------------------------------------------------------------+
@@ -42,7 +42,7 @@
// | Author: Lukas Smith <smith@pooteeweet.org> |
// +----------------------------------------------------------------------+
//
-// $Id$
+// $Id: Common.php,v 1.137 2008/02/17 18:53:40 afz Exp $
require_once 'MDB2/LOB.php';
@@ -55,34 +55,71 @@
/**
* MDB2_Driver_Common: Base class that is extended by each MDB2 driver
*
+ * To load this module in the MDB2 object:
+ * $mdb->loadModule('Datatype');
+ *
* @package MDB2
* @category Database
* @author Lukas Smith <smith@pooteeweet.org>
*/
class MDB2_Driver_Datatype_Common extends MDB2_Module_Common
{
- var $valid_types = array(
- 'text' => true,
+ var $valid_default_values = array(
+ 'text' => '',
'boolean' => true,
- 'integer' => true,
- 'decimal' => true,
- 'float' => true,
- 'date' => true,
- 'time' => true,
- 'timestamp' => true,
- 'clob' => true,
- 'blob' => true,
+ 'integer' => 0,
+ 'decimal' => 0.0,
+ 'float' => 0.0,
+ 'timestamp' => '1970-01-01 00:00:00',
+ 'time' => '00:00:00',
+ 'date' => '1970-01-01',
+ 'clob' => '',
+ 'blob' => '',
);
/**
* contains all LOB objects created with this MDB2 instance
- * @var array
- * @access protected
- */
+ * @var array
+ * @access protected
+ */
var $lobs = array();
// }}}
- // {{{ setResultTypes()
+ // {{{ getValidTypes()
+
+ /**
+ * Get the list of valid types
+ *
+ * This function returns an array of valid types as keys with the values
+ * being possible default values for all native datatypes and mapped types
+ * for custom datatypes.
+ *
+ * @return mixed array on success, a MDB2 error on failure
+ * @access public
+ */
+ function getValidTypes()
+ {
+ $types = $this->valid_default_values;
+ $db =& $this->getDBInstance();
+ if (PEAR::isError($db)) {
+ return $db;
+ }
+ if (!empty($db->options['datatype_map'])) {
+ foreach ($db->options['datatype_map'] as $type => $mapped_type) {
+ if (array_key_exists($mapped_type, $types)) {
+ $types[$type] = $types[$mapped_type];
+ } elseif (!empty($db->options['datatype_map_callback'][$type])) {
+ $parameter = array('type' => $type, 'mapped_type' => $mapped_type);
+ $default = call_user_func_array($db->options['datatype_map_callback'][$type], array(&$db, __FUNCTION__, $parameter));
+ $types[$type] = $default;
+ }
+ }
+ }
+ return $types;
+ }
+
+ // }}}
+ // {{{ checkResultTypes()
/**
* Define the list of types to be associated with the columns of a given
@@ -94,8 +131,7 @@
* function is not called, the type of all result set columns is assumed
* to be text, thus leading to not perform any conversions.
*
- * @param resource $result result identifier
- * @param string $types array variable that lists the
+ * @param array $types array variable that lists the
* data types to be expected in the result set columns. If this array
* contains less types than the number of columns that are returned
* in the result set, the remaining columns are assumed to be of the
@@ -104,44 +140,48 @@
* @return mixed MDB2_OK on success, a MDB2 error on failure
* @access public
*/
- function setResultTypes(&$result, $types)
+ function checkResultTypes($types)
{
- $types = is_array($types) ? array_values($types) : array($types);
+ $types = is_array($types) ? $types : array($types);
foreach ($types as $key => $type) {
- if (!isset($this->valid_types[$type])) {
+ if (!isset($this->valid_default_values[$type])) {
$db =& $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
-
- return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
- 'setResultTypes: ' . $type . ' for '. $key .' is not a supported column type');
+ if (empty($db->options['datatype_map'][$type])) {
+ return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+ $type.' for '.$key.' is not a supported column type', __FUNCTION__);
+ }
}
}
- $result->types = $types;
- return MDB2_OK;
+ return $types;
}
// }}}
// {{{ _baseConvertResult()
/**
- * general type conversion method
+ * General type conversion method
*
- * @param mixed $value refernce to a value to be converted
- * @param int $type constant that specifies which type to convert to
- * @return object a MDB2 error on failure
+ * @param mixed $value reference to a value to be converted
+ * @param string $type specifies which type to convert to
+ * @param boolean $rtrim [optional] when TRUE [default], apply rtrim() to text
+ * @return object an MDB2 error on failure
* @access protected
*/
- function _baseConvertResult($value, $type)
+ function _baseConvertResult($value, $type, $rtrim = true)
{
switch ($type) {
case 'text':
+ if ($rtrim) {
+ $value = rtrim($value);
+ }
return $value;
case 'integer':
return intval($value);
case 'boolean':
- return $value == 'Y';
+ return !empty($value);
case 'decimal':
return $value;
case 'float':
@@ -159,8 +199,9 @@
'position' => 0,
'lob_index' => null,
'endOfLOB' => false,
- 'ressource' => $value,
+ 'resource' => $value,
'value' => null,
+ 'loaded' => false,
);
end($this->lobs);
$lob_index = key($this->lobs);
@@ -174,56 +215,111 @@
}
return $db->raiseError(MDB2_ERROR_INVALID, null, null,
- 'attempt to convert result value to an unknown type ' . $type);
+ 'attempt to convert result value to an unknown type :' . $type, __FUNCTION__);
}
// }}}
// {{{ convertResult()
/**
- * convert a value to a RDBMS indepdenant MDB2 type
+ * Convert a value to a RDBMS indipendent MDB2 type
*
- * @param mixed $value value to be converted
- * @param int $type constant that specifies which type to convert to
- * @return mixed converted value or a MDB2 error on failure
+ * @param mixed $value value to be converted
+ * @param string $type specifies which type to convert to
+ * @param boolean $rtrim [optional] when TRUE [default], apply rtrim() to text
+ * @return mixed converted value
* @access public
*/
- function convertResult($value, $type)
+ function convertResult($value, $type, $rtrim = true)
{
if (is_null($value)) {
return null;
}
- return $this->_baseConvertResult($value, $type);
+ $db =& $this->getDBInstance();
+ if (PEAR::isError($db)) {
+ return $db;
+ }
+ if (!empty($db->options['datatype_map'][$type])) {
+ $type = $db->options['datatype_map'][$type];
+ if (!empty($db->options['datatype_map_callback'][$type])) {
+ $parameter = array('type' => $type, 'value' => $value, 'rtrim' => $rtrim);
+ return call_user_func_array($db->options['datatype_map_callback'][$type], array(&$db, __FUNCTION__, $parameter));
+ }
+ }
+ return $this->_baseConvertResult($value, $type, $rtrim);
}
// }}}
// {{{ convertResultRow()
/**
+ * Convert a result row
+ *
+ * @param array $types
+ * @param array $row specifies the types to convert to
+ * @param boolean $rtrim [optional] when TRUE [default], apply rtrim() to text
+ * @return mixed MDB2_OK on success, an MDB2 error on failure
+ * @access public
+ */
+ function convertResultRow($types, $row, $rtrim = true)
+ {
+ $types = $this->_sortResultFieldTypes(array_keys($row), $types);
+ foreach ($row as $key => $value) {
+ if (empty($types[$key])) {
+ continue;
+ }
+ $value = $this->convertResult($row[$key], $types[$key], $rtrim);
+ if (PEAR::isError($value)) {
+ return $value;
+ }
+ $row[$key] = $value;
+ }
+ return $row;
+ }
+
+ // }}}
+ // {{{ _sortResultFieldTypes()
+
+ /**
* convert a result row
*
- * @param resource $result result identifier
- * @param array $row array with data
+ * @param array $types
+ * @param array $row specifies the types to convert to
+ * @param bool $rtrim if to rtrim text values or not
* @return mixed MDB2_OK on success, a MDB2 error on failure
* @access public
*/
- function convertResultRow($types, $row)
+ function _sortResultFieldTypes($columns, $types)
{
- if (is_array($types)) {
- $current_column = -1;
- foreach ($row as $key => $column) {
- ++$current_column;
- if (!isset($column) || !isset($types[$current_column])) {
- continue;
- }
- $value = $this->convertResult($row[$key], $types[$current_column]);
- if (PEAR::isError($value)) {
- return $value;
- }
- $row[$key] = $value;
+ $n_cols = count($columns);
+ $n_types = count($types);
+ if ($n_cols > $n_types) {
+ for ($i= $n_cols - $n_types; $i >= 0; $i--) {
+ $types[] = null;
}
}
- return $row;
+ $sorted_types = array();
+ foreach ($columns as $col) {
+ $sorted_types[$col] = null;
+ }
+ foreach ($types as $name => $type) {
+ if (array_key_exists($name, $sorted_types)) {
+ $sorted_types[$name] = $type;
+ unset($types[$name]);
+ }
+ }
+ // if there are left types in the array, fill the null values of the
+ // sorted array with them, in order.
+ if (count($types)) {
+ reset($types);
+ foreach (array_keys($sorted_types) as $k) {
+ if (is_null($sorted_types[$k])) {
+ $sorted_types[$k] = current($types);
+ next($types);
+ }
+ }
+ }
+ return $sorted_types;
}
// }}}
@@ -242,15 +338,220 @@
*/
function getDeclaration($type, $name, $field)
{
- if (!method_exists($this, "_get{$type}Declaration")) {
- $db =& $this->getDBInstance();
- if (PEAR::isError($db)) {
- return $db;
- }
+ $db =& $this->getDBInstance();
+ if (PEAR::isError($db)) {
+ return $db;
+ }
- return $db->raiseError('type not defined: '.$type);
+ if (!empty($db->options['datatype_map'][$type])) {
+ $type = $db->options['datatype_map'][$type];
+ if (!empty($db->options['datatype_map_callback'][$type])) {
+ $parameter = array('type' => $type, 'name' => $name, 'field' => $field);
+ return call_user_func_array($db->options['datatype_map_callback'][$type], array(&$db, __FUNCTION__, $parameter));
+ }
+ $field['type'] = $type;
+ }
+
+ if (!method_exists($this, "_get{$type}Declaration")) {
+ return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+ 'type not defined: '.$type, __FUNCTION__);
}
return $this->{"_get{$type}Declaration"}($name, $field);
+ }
+
+ // }}}
+ // {{{ getTypeDeclaration()
+
+ /**
+ * Obtain DBMS specific SQL code portion needed to declare an text type
+ * field to be used in statements like CREATE TABLE.
+ *
+ * @param array $field associative array with the name of the properties
+ * of the field being declared as array indexes. Currently, the types
+ * of supported field properties are as follows:
+ *
+ * length
+ * Integer value that determines the maximum length of the text
+ * field. If this argument is missing the field should be
+ * declared to have the longest length allowed by the DBMS.
+ *
+ * default
+ * Text value to be used as default for this field.
+ *
+ * notnull
+ * Boolean flag that indicates whether this field is constrained
+ * to not be set to null.
+ * @return string DBMS specific SQL code portion that should be used to
+ * declare the specified field.
+ * @access public
+ */
+ function getTypeDeclaration($field)
+ {
+ $db =& $this->getDBInstance();
+ if (PEAR::isError($db)) {
+ return $db;
+ }
+
+ switch ($field['type']) {
+ case 'text':
+ $length = !empty($field['length']) ? $field['length'] : $db->options['default_text_field_length'];
+ $fixed = !empty($field['fixed']) ? $field['fixed'] : false;
+ return $fixed ? ($length ? 'CHAR('.$length.')' : 'CHAR('.$db->options['default_text_field_length'].')')
+ : ($length ? 'VARCHAR('.$length.')' : 'TEXT');
+ case 'clob':
+ return 'TEXT';
+ case 'blob':
+ return 'TEXT';
+ case 'integer':
+ return 'INT';
+ case 'boolean':
+ return 'INT';
+ case 'date':
+ return 'CHAR ('.strlen('YYYY-MM-DD').')';
+ case 'time':
+ return 'CHAR ('.strlen('HH:MM:SS').')';
+ case 'timestamp':
+ return 'CHAR ('.strlen('YYYY-MM-DD HH:MM:SS').')';
+ case 'float':
+ return 'TEXT';
+ case 'decimal':
+ return 'TEXT';
+ }
+ return '';
+ }
+
+ // }}}
+ // {{{ _getDeclaration()
+
+ /**
+ * Obtain DBMS specific SQL code portion needed to declare a generic type
+ * field to be used in statements like CREATE TABLE.
+ *
+ * @param string $name name the field to be declared.
+ * @param array $field associative array with the name of the properties
+ * of the field being declared as array indexes. Currently, the types
+ * of supported field properties are as follows:
+ *
+ * length
+ * Integer value that determines the maximum length of the text
+ * field. If this argument is missing the field should be
+ * declared to have the longest length allowed by the DBMS.
+ *
+ * default
+ * Text value to be used as default for this field.
+ *
+ * notnull
+ * Boolean flag that indicates whether this field is constrained
+ * to not be set to null.
+ * charset
+ * Text value with the default CHARACTER SET for this field.
+ * collation
+ * Text value with the default COLLATION for this field.
+ * @return string DBMS specific SQL code portion that should be used to
+ * declare the specified field, or a MDB2_Error on failure
+ * @access protected
+ */
+ function _getDeclaration($name, $field)
+ {
+ $db =& $this->getDBInstance();
+ if (PEAR::isError($db)) {
+ return $db;
+ }
+
+ $name = $db->quoteIdentifier($name, true);
+ $declaration_options = $db->datatype->_getDeclarationOptions($field);
+ if (PEAR::isError($declaration_options)) {
+ return $declaration_options;
+ }
+ return $name.' '.$this->getTypeDeclaration($field).$declaration_options;
+ }
+
+ // }}}
+ // {{{ _getDeclarationOptions()
+
+ /**
+ * Obtain DBMS specific SQL code portion needed to declare a generic type
+ * field to be used in statement like CREATE TABLE, without the field name
+ * and type values (ie. just the character set, default value, if the
+ * field is permitted to be NULL or not, and the collation options).
+ *
+ * @param array $field associative array with the name of the properties
+ * of the field being declared as array indexes. Currently, the types
+ * of supported field properties are as follows:
+ *
+ * default
+ * Text value to be used as default for this field.
+ * notnull
+ * Boolean flag that indicates whether this field is constrained
+ * to not be set to null.
+ * charset
+ * Text value with the default CHARACTER SET for this field.
+ * collation
+ * Text value with the default COLLATION for this field.
+ * @return string DBMS specific SQL code portion that should be used to
+ * declare the specified field's options.
+ * @access protected
+ */
+ function _getDeclarationOptions($field)
+ {
+ $charset = empty($field['charset']) ? '' :
+ ' '.$this->_getCharsetFieldDeclaration($field['charset']);
+
+ $notnull = empty($field['notnull']) ? '' : ' NOT NULL';
+ $default = '';
+ if (array_key_exists('default', $field)) {
+ if ($field['default'] === '') {
+ $db =& $this->getDBInstance();
+ if (PEAR::isError($db)) {
+ return $db;
+ }
+ $valid_default_values = $this->getValidTypes();
+ $field['default'] = $valid_default_values[$field['type']];
+ if ($field['default'] === ''&& ($db->options['portability'] & MDB2_PORTABILITY_EMPTY_TO_NULL)) {
+ $field['default'] = ' ';
+ }
+ }
+ if (!is_null($field['default'])) {
+ $default = ' DEFAULT ' . $this->quote($field['default'], $field['type']);
+ }
+ }
+
+ $collation = empty($field['collation']) ? '' :
+ ' '.$this->_getCollationFieldDeclaration($field['collation']);
+
+ return $charset.$default.$notnull.$collation;
+ }
+
+ // }}}
+ // {{{ _getCharsetFieldDeclaration()
+
+ /**
+ * Obtain DBMS specific SQL code portion needed to set the CHARACTER SET
+ * of a field declaration to be used in statements like CREATE TABLE.
+ *
+ * @param string $charset name of the charset
+ * @return string DBMS specific SQL code portion needed to set the CHARACTER SET
+ * of a field declaration.
+ */
+ function _getCharsetFieldDeclaration($charset)
+ {
+ return '';
+ }
+
+ // }}}
+ // {{{ _getCollationFieldDeclaration()
+
+ /**
+ * Obtain DBMS specific SQL code portion needed to set the COLLATION
+ * of a field declaration to be used in statements like CREATE TABLE.
+ *
+ * @param string $collation name of the collation
+ * @return string DBMS specific SQL code portion needed to set the COLLATION
+ * of a field declaration.
+ */
+ function _getCollationFieldDeclaration($collation)
+ {
+ return '';
}
// }}}
@@ -281,7 +582,7 @@
*/
function _getIntegerDeclaration($name, $field)
{
- if (array_key_exists('unsigned', $field) && $field['unsigned']) {
+ if (!empty($field['unsigned'])) {
$db =& $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
@@ -289,10 +590,7 @@
$db->warnings[] = "unsigned integer field \"$name\" is being declared as signed integer";
}
- $default = array_key_exists('default', $field) ? ' DEFAULT '.
- $this->quote($field['default'], 'integer') : '';
- $notnull = (array_key_exists('notnull', $field) && $field['notnull']) ? ' NOT NULL' : '';
- return $name.' INT'.$default.$notnull;
+ return $this->_getDeclaration($name, $field);
}
// }}}
@@ -324,11 +622,7 @@
*/
function _getTextDeclaration($name, $field)
{
- $default = array_key_exists('default', $field) ? ' DEFAULT '.
- $this->quote($field['default'], 'text') : '';
- $notnull = (array_key_exists('notnull', $field) && $field['notnull']) ? ' NOT NULL' : '';
- $type = array_key_exists('length', $field) ? 'CHAR ('.$field['length'].')' : 'TEXT';
- return $name.' '.$type.$default.$notnull;
+ return $this->_getDeclaration($name, $field);
}
// }}}
@@ -340,26 +634,31 @@
*
* @param string $name name the field to be declared.
* @param array $field associative array with the name of the properties
- * of the field being declared as array indexes. Currently, the types
- * of supported field properties are as follows:
+ * of the field being declared as array indexes. Currently, the types
+ * of supported field properties are as follows:
*
- * length
- * Integer value that determines the maximum length of the large
- * object field. If this argument is missing the field should be
- * declared to have the longest length allowed by the DBMS.
+ * length
+ * Integer value that determines the maximum length of the large
+ * object field. If this argument is missing the field should be
+ * declared to have the longest length allowed by the DBMS.
*
- * notnull
- * Boolean flag that indicates whether this field is constrained
- * to not be set to null.
+ * notnull
+ * Boolean flag that indicates whether this field is constrained
+ * to not be set to null.
* @return string DBMS specific SQL code portion that should be used to
- * declare the specified field.
- * @access protected
+ * declare the specified field.
+ * @access public
*/
function _getCLOBDeclaration($name, $field)
{
- $notnull = (array_key_exists('notnull', $field) && $field['notnull']) ? ' NOT NULL' : '';
- $type = array_key_exists('length', $field) ? 'CHAR ('.$field['length'].')' : 'TEXT';
- return $name.' '.$type.$notnull;
+ $db =& $this->getDBInstance();
+ if (PEAR::isError($db)) {
+ return $db;
+ }
+
+ $notnull = empty($field['notnull']) ? '' : ' NOT NULL';
+ $name = $db->quoteIdentifier($name, true);
+ return $name.' '.$this->getTypeDeclaration($field).$notnull;
}
// }}}
@@ -371,26 +670,31 @@
*
* @param string $name name the field to be declared.
* @param array $field associative array with the name of the properties
- * of the field being declared as array indexes. Currently, the types
- * of supported field properties are as follows:
+ * of the field being declared as array indexes. Currently, the types
+ * of supported field properties are as follows:
*
- * length
- * Integer value that determines the maximum length of the large
- * object field. If this argument is missing the field should be
- * declared to have the longest length allowed by the DBMS.
+ * length
+ * Integer value that determines the maximum length of the large
+ * object field. If this argument is missing the field should be
+ * declared to have the longest length allowed by the DBMS.
*
- * notnull
- * Boolean flag that indicates whether this field is constrained
- * to not be set to null.
+ * notnull
+ * Boolean flag that indicates whether this field is constrained
+ * to not be set to null.
* @return string DBMS specific SQL code portion that should be used to
- * declare the specified field.
+ * declare the specified field.
* @access protected
*/
function _getBLOBDeclaration($name, $field)
{
- $notnull = (array_key_exists('notnull', $field) && $field['notnull']) ? ' NOT NULL' : '';
- $type = array_key_exists('length', $field) ? 'CHAR ('.$field['length'].')' : 'TEXT';
- return $name.' '.$type.$notnull;
+ $db =& $this->getDBInstance();
+ if (PEAR::isError($db)) {
+ return $db;
+ }
+
+ $notnull = empty($field['notnull']) ? '' : ' NOT NULL';
+ $name = $db->quoteIdentifier($name, true);
+ return $name.' '.$this->getTypeDeclaration($field).$notnull;
}
// }}}
@@ -417,10 +721,7 @@
*/
function _getBooleanDeclaration($name, $field)
{
- $default = array_key_exists('default', $field) ? ' DEFAULT '.
- $this->quote($field['default'], 'boolean') : '';
- $notnull = (array_key_exists('notnull', $field) && $field['notnull']) ? ' NOT NULL' : '';
- return $name.' CHAR (1)'.$default.$notnull;
+ return $this->_getDeclaration($name, $field);
}
// }}}
@@ -447,10 +748,7 @@
*/
function _getDateDeclaration($name, $field)
{
- $default = array_key_exists('default', $field) ? ' DEFAULT '.
- $this->quote($field['default'], 'date') : '';
- $notnull = (array_key_exists('notnull', $field) && $field['notnull']) ? ' NOT NULL' : '';
- return $name.' CHAR ('.strlen('YYYY-MM-DD').')'.$default.$notnull;
+ return $this->_getDeclaration($name, $field);
}
// }}}
@@ -477,10 +775,7 @@
*/
function _getTimestampDeclaration($name, $field)
{
- $default = array_key_exists('default', $field) ? ' DEFAULT '.
- $this->quote($field['default'], 'timestamp') : '';
- $notnull = (array_key_exists('notnull', $field) && $field['notnull']) ? ' NOT NULL' : '';
- return $name.' CHAR ('.strlen('YYYY-MM-DD HH:MM:SS').')'.$default.$notnull;
+ return $this->_getDeclaration($name, $field);
}
// }}}
@@ -507,10 +802,7 @@
*/
function _getTimeDeclaration($name, $field)
{
- $default = array_key_exists('default', $field) ? ' DEFAULT '.
- $this->quote($field['default'], 'time') : '';
- $notnull = (array_key_exists('notnull', $field) && $field['notnull']) ? ' NOT NULL' : '';
- return $name.' CHAR ('.strlen('HH:MM:SS').')'.$default.$notnull;
+ return $this->_getDeclaration($name, $field);
}
// }}}
@@ -537,10 +829,7 @@
*/
function _getFloatDeclaration($name, $field)
{
- $default = array_key_exists('default', $field) ? ' DEFAULT '.
- $this->quote($field['default'], 'float') : '';
- $notnull = (array_key_exists('notnull', $field) && $field['notnull']) ? ' NOT NULL' : '';
- return $name.' TEXT'.$default.$notnull;
+ return $this->_getDeclaration($name, $field);
}
// }}}
@@ -567,10 +856,7 @@
*/
function _getDecimalDeclaration($name, $field)
{
- $default = array_key_exists('default', $field) ? ' DEFAULT '.
- $this->quote($field['default'], 'decimal') : '';
- $notnull = (array_key_exists('notnull', $field) && $field['notnull']) ? ' NOT NULL' : '';
- return $name.' TEXT'.$default.$notnull;
+ return $this->_getDeclaration($name, $field);
}
// }}}
@@ -581,31 +867,39 @@
*
* @param array $current new definition
* @param array $previous old definition
- * @return array containg all changes that will need to be applied
+ * @return array containing all changes that will need to be applied
* @access public
*/
function compareDefinition($current, $previous)
{
- $type = array_key_exists('type', $current) ? $current['type'] : null;
+ $type = !empty($current['type']) ? $current['type'] : null;
if (!method_exists($this, "_compare{$type}Definition")) {
$db =& $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
-
+ if (!empty($db->options['datatype_map_callback'][$type])) {
+ $parameter = array('current' => $current, 'previous' => $previous);
+ $change = call_user_func_array($db->options['datatype_map_callback'][$type], array(&$db, __FUNCTION__, $parameter));
+ return $change;
+ }
return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
- 'type "'.$current['type'].'" is not yet supported');
+ 'type "'.$current['type'].'" is not yet supported', __FUNCTION__);
}
- if (!array_key_exists('type', $previous) || $previous['type'] != $type) {
+ if (empty($previous['type']) || $previous['type'] != $type) {
return $current;
}
$change = $this->{"_compare{$type}Definition"}($current, $previous);
- $previous_notnull = array_key_exists('notnull', $previous) ? $previous['notnull'] : false;
- $notnull = array_key_exists('notnull', $current) ? $current['notnull'] : false;
+ if ($previous['type'] != $type) {
+ $change['type'] = true;
+ }
+
+ $previous_notnull = !empty($previous['notnull']) ? $previous['notnull'] : false;
+ $notnull = !empty($current['notnull']) ? $current['notnull'] : false;
if ($previous_notnull != $notnull) {
$change['notnull'] = true;
}
@@ -629,19 +923,19 @@
*
* @param array $current new definition
* @param array $previous old definition
- * @return array containg all changes that will need to be applied
+ * @return array containing all changes that will need to be applied
* @access protected
*/
function _compareIntegerDefinition($current, $previous)
{
$change = array();
- $previous_unsigned = array_key_exists('unsigned', $previous) ? $previous['unsigned'] : false;
- $unsigned = array_key_exists('unsigned', $current) ? $current['unsigned'] : false;
+ $previous_unsigned = !empty($previous['unsigned']) ? $previous['unsigned'] : false;
+ $unsigned = !empty($current['unsigned']) ? $current['unsigned'] : false;
if ($previous_unsigned != $unsigned) {
$change['unsigned'] = true;
}
- $previous_autoincrement = array_key_exists('autoincrement', $previous) ? $previous['autoincrement'] : false;
- $autoincrement = array_key_exists('autoincrement', $current) ? $current['autoincrement'] : false;
+ $previous_autoincrement = !empty($previous['autoincrement']) ? $previous['autoincrement'] : false;
+ $autoincrement = !empty($current['autoincrement']) ? $current['autoincrement'] : false;
if ($previous_autoincrement != $autoincrement) {
$change['autoincrement'] = true;
}
@@ -656,16 +950,21 @@
*
* @param array $current new definition
* @param array $previous old definition
- * @return array containg all changes that will need to be applied
+ * @return array containing all changes that will need to be applied
* @access protected
*/
function _compareTextDefinition($current, $previous)
{
$change = array();
- $previous_length = array_key_exists('length', $previous) ? $previous['length'] : 0;
- $length = array_key_exists('length', $current) ? $current['length'] : 0;
+ $previous_length = !empty($previous['length']) ? $previous['length'] : 0;
+ $length = !empty($current['length']) ? $current['length'] : 0;
if ($previous_length != $length) {
$change['length'] = true;
+ }
+ $previous_fixed = !empty($previous['fixed']) ? $previous['fixed'] : 0;
+ $fixed = !empty($current['fixed']) ? $current['fixed'] : 0;
+ if ($previous_fixed != $fixed) {
+ $change['fixed'] = true;
}
return $change;
}
@@ -678,7 +977,7 @@
*
* @param array $current new definition
* @param array $previous old definition
- * @return array containg all changes that will need to be applied
+ * @return array containing all changes that will need to be applied
* @access protected
*/
function _compareCLOBDefinition($current, $previous)
@@ -694,7 +993,7 @@
*
* @param array $current new definition
* @param array $previous old definition
- * @return array containg all changes that will need to be applied
+ * @return array containing all changes that will need to be applied
* @access protected
*/
function _compareBLOBDefinition($current, $previous)
@@ -710,7 +1009,7 @@
*
* @param array $current new definition
* @param array $previous old definition
- * @return array containg all changes that will need to be applied
+ * @return array containing all changes that will need to be applied
* @access protected
*/
function _compareDateDefinition($current, $previous)
@@ -726,7 +1025,7 @@
*
* @param array $current new definition
* @param array $previous old definition
- * @return array containg all changes that will need to be applied
+ * @return array containing all changes that will need to be applied
* @access protected
*/
function _compareTimeDefinition($current, $previous)
@@ -742,7 +1041,7 @@
*
* @param array $current new definition
* @param array $previous old definition
- * @return array containg all changes that will need to be applied
+ * @return array containing all changes that will need to be applied
* @access protected
*/
function _compareTimestampDefinition($current, $previous)
@@ -758,7 +1057,7 @@
*
* @param array $current new definition
* @param array $previous old definition
- * @return array containg all changes that will need to be applied
+ * @return array containing all changes that will need to be applied
* @access protected
*/
function _compareBooleanDefinition($current, $previous)
@@ -774,7 +1073,7 @@
*
* @param array $current new definition
* @param array $previous old definition
- * @return array containg all changes that will need to be applied
+ * @return array containing all changes that will need to be applied
* @access protected
*/
function _compareFloatDefinition($current, $previous)
@@ -790,7 +1089,7 @@
*
* @param array $current new definition
* @param array $previous old definition
- * @return array containg all changes that will need to be applied
+ * @return array containing all changes that will need to be applied
* @access protected
*/
function _compareDecimalDefinition($current, $previous)
@@ -807,11 +1106,13 @@
*
* @param string $value text string value that is intended to be converted.
* @param string $type type to which the value should be converted to
+ * @param bool $quote determines if the value should be quoted and escaped
+ * @param bool $escape_wildcards if to escape escape wildcards
* @return string text string that represents the given argument value in
* a DBMS specific format.
* @access public
*/
- function quote($value, $type = null, $quote = true)
+ function quote($value, $type = null, $quote = true, $escape_wildcards = false)
{
$db =& $this->getDBInstance();
if (PEAR::isError($db)) {
@@ -833,14 +1134,15 @@
$type = 'integer';
break;
case 'double':
- // todo
+ // todo: default to decimal as float is quite unusual
+ // $type = 'float';
$type = 'decimal';
- $type = 'float';
break;
case 'boolean':
$type = 'boolean';
break;
case 'array':
+ $value = serialize($value);
case 'object':
$type = 'text';
break;
@@ -856,18 +1158,24 @@
}
break;
}
+ } elseif (!empty($db->options['datatype_map'][$type])) {
+ $type = $db->options['datatype_map'][$type];
+ if (!empty($db->options['datatype_map_callback'][$type])) {
+ $parameter = array('type' => $type, 'value' => $value, 'quote' => $quote, 'escape_wildcards' => $escape_wildcards);
+ return call_user_func_array($db->options['datatype_map_callback'][$type], array(&$db, __FUNCTION__, $parameter));
+ }
}
if (!method_exists($this, "_quote{$type}")) {
- return $db->raiseError('type not defined: '.$type);
+ return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+ 'type not defined: '.$type, __FUNCTION__);
}
- $value = $this->{"_quote{$type}"}($value);
-
- // ugly hack to remove single quotes
- if (!$quote && isset($value[0]) && $value[0] === "'") {
- $value = substr($value, 1, -1);
+ $value = $this->{"_quote{$type}"}($value, $quote, $escape_wildcards);
+ if ($quote && $escape_wildcards && $db->string_quoting['escape_pattern']
+ && $db->string_quoting['escape'] !== $db->string_quoting['escape_pattern']
+ ) {
+ $value.= $this->patternEscapeString();
}
-
return $value;
}
@@ -879,11 +1187,13 @@
* compose query statements.
*
* @param string $value text string value that is intended to be converted.
+ * @param bool $quote determines if the value should be quoted and escaped
+ * @param bool $escape_wildcards if to escape escape wildcards
* @return string text string that represents the given argument value in
* a DBMS specific format.
* @access protected
*/
- function _quoteInteger($value)
+ function _quoteInteger($value, $quote, $escape_wildcards)
{
return (int)$value;
}
@@ -896,18 +1206,28 @@
* compose query statements.
*
* @param string $value text string value that is intended to be converted.
+ * @param bool $quote determines if the value should be quoted and escaped
+ * @param bool $escape_wildcards if to escape escape wildcards
* @return string text string that already contains any DBMS specific
* escaped character sequences.
* @access protected
*/
- function _quoteText($value)
+ function _quoteText($value, $quote, $escape_wildcards)
{
+ if (!$quote) {
+ return $value;
+ }
+
$db =& $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
- return "'".$db->escape($value)."'";
+ $value = $db->escape($value, $escape_wildcards);
+ if (PEAR::isError($value)) {
+ return $value;
+ }
+ return "'".$value."'";
}
// }}}
@@ -917,7 +1237,7 @@
* Convert a text value into a DBMS specific format that is suitable to
* compose query statements.
*
- * @param $value
+ * @param string $value text string value that is intended to be converted.
* @return string text string that represents the given argument value in
* a DBMS specific format.
* @access protected
@@ -959,15 +1279,20 @@
* Convert a text value into a DBMS specific format that is suitable to
* compose query statements.
*
- * @param $value
+ * @param string $value text string value that is intended to be converted.
+ * @param bool $quote determines if the value should be quoted and escaped
+ * @param bool $escape_wildcards if to escape escape wildcards
* @return string text string that represents the given argument value in
* a DBMS specific format.
* @access protected
*/
- function _quoteLOB($value)
+ function _quoteLOB($value, $quote, $escape_wildcards)
{
$value = $this->_readFile($value);
- return $this->_quoteText($value);
+ if (PEAR::isError($value)) {
+ return $value;
+ }
+ return $this->_quoteText($value, $quote, $escape_wildcards);
}
// }}}
@@ -977,14 +1302,16 @@
* Convert a text value into a DBMS specific format that is suitable to
* compose query statements.
*
- * @param $value
+ * @param string $value text string value that is intended to be converted.
+ * @param bool $quote determines if the value should be quoted and escaped
+ * @param bool $escape_wildcards if to escape escape wildcards
* @return string text string that represents the given argument value in
* a DBMS specific format.
* @access protected
*/
- function _quoteCLOB($value)
+ function _quoteCLOB($value, $quote, $escape_wildcards)
{
- return $this->_quoteLOB($value);
+ return $this->_quoteLOB($value, $quote, $escape_wildcards);
}
// }}}
@@ -994,14 +1321,16 @@
* Convert a text value into a DBMS specific format that is suitable to
* compose query statements.
*
- * @param $value
+ * @param string $value text string value that is intended to be converted.
+ * @param bool $quote determines if the value should be quoted and escaped
+ * @param bool $escape_wildcards if to escape escape wildcards
* @return string text string that represents the given argument value in
* a DBMS specific format.
* @access protected
*/
- function _quoteBLOB($value)
+ function _quoteBLOB($value, $quote, $escape_wildcards)
{
- return $this->_quoteLOB($value);
+ return $this->_quoteLOB($value, $quote, $escape_wildcards);
}
// }}}
@@ -1012,13 +1341,15 @@
* compose query statements.
*
* @param string $value text string value that is intended to be converted.
+ * @param bool $quote determines if the value should be quoted and escaped
+ * @param bool $escape_wildcards if to escape escape wildcards
* @return string text string that represents the given argument value in
* a DBMS specific format.
* @access protected
*/
- function _quoteBoolean($value)
+ function _quoteBoolean($value, $quote, $escape_wildcards)
{
- return ($value ? "'Y'" : "'N'");
+ return ($value ? 1 : 0);
}
// }}}
@@ -1029,13 +1360,25 @@
* compose query statements.
*
* @param string $value text string value that is intended to be converted.
+ * @param bool $quote determines if the value should be quoted and escaped
+ * @param bool $escape_wildcards if to escape escape wildcards
* @return string text string that represents the given argument value in
* a DBMS specific format.
* @access protected
*/
- function _quoteDate($value)
+ function _quoteDate($value, $quote, $escape_wildcards)
{
- return $this->_quoteText($value);
+ if ($value === 'CURRENT_DATE') {
+ $db =& $this->getDBInstance();
+ if (PEAR::isError($db)) {
+ return $db;
+ }
+ if (isset($db->function) && is_a($db->function, 'MDB2_Driver_Function_Common')) {
+ return $db->function->now('date');
+ }
+ return 'CURRENT_DATE';
+ }
+ return $this->_quoteText($value, $quote, $escape_wildcards);
}
// }}}
@@ -1046,13 +1389,25 @@
* compose query statements.
*
* @param string $value text string value that is intended to be converted.
+ * @param bool $quote determines if the value should be quoted and escaped
+ * @param bool $escape_wildcards if to escape escape wildcards
* @return string text string that represents the given argument value in
* a DBMS specific format.
* @access protected
*/
- function _quoteTimestamp($value)
+ function _quoteTimestamp($value, $quote, $escape_wildcards)
{
- return $this->_quoteText($value);
+ if ($value === 'CURRENT_TIMESTAMP') {
+ $db =& $this->getDBInstance();
+ if (PEAR::isError($db)) {
+ return $db;
+ }
+ if (isset($db->function) && is_a($db->function, 'MDB2_Driver_Function_Common')) {
+ return $db->function->now('timestamp');
+ }
+ return 'CURRENT_TIMESTAMP';
+ }
+ return $this->_quoteText($value, $quote, $escape_wildcards);
}
// }}}
@@ -1063,13 +1418,25 @@
* compose query statements.
*
* @param string $value text string value that is intended to be converted.
+ * @param bool $quote determines if the value should be quoted and escaped
+ * @param bool $escape_wildcards if to escape escape wildcards
* @return string text string that represents the given argument value in
* a DBMS specific format.
* @access protected
*/
- function _quoteTime($value)
+ function _quoteTime($value, $quote, $escape_wildcards)
{
- return $this->_quoteText($value);
+ if ($value === 'CURRENT_TIME') {
+ $db =& $this->getDBInstance();
+ if (PEAR::isError($db)) {
+ return $db;
+ }
+ if (isset($db->function) && is_a($db->function, 'MDB2_Driver_Function_Common')) {
+ return $db->function->now('time');
+ }
+ return 'CURRENT_TIME';
+ }
+ return $this->_quoteText($value, $quote, $escape_wildcards);
}
// }}}
@@ -1080,13 +1447,23 @@
* compose query statements.
*
* @param string $value text string value that is intended to be converted.
+ * @param bool $quote determines if the value should be quoted and escaped
+ * @param bool $escape_wildcards if to escape escape wildcards
* @return string text string that represents the given argument value in
* a DBMS specific format.
* @access protected
*/
- function _quoteFloat($value)
+ function _quoteFloat($value, $quote, $escape_wildcards)
{
- return $this->_quoteText($value);
+ if (preg_match('/^(.*)e([-+])(\d+)$/i', $value, $matches)) {
+ $decimal = $this->_quoteDecimal($matches[1], $quote, $escape_wildcards);
+ $sign = $matches[2];
+ $exponent = str_pad($matches[3], 2, '0', STR_PAD_LEFT);
+ $value = $decimal.'E'.$sign.$exponent;
+ } else {
+ $value = $this->_quoteDecimal($value, $quote, $escape_wildcards);
+ }
+ return $value;
}
// }}}
@@ -1097,13 +1474,34 @@
* compose query statements.
*
* @param string $value text string value that is intended to be converted.
+ * @param bool $quote determines if the value should be quoted and escaped
+ * @param bool $escape_wildcards if to escape escape wildcards
* @return string text string that represents the given argument value in
* a DBMS specific format.
* @access protected
*/
- function _quoteDecimal($value)
+ function _quoteDecimal($value, $quote, $escape_wildcards)
{
- return $this->_quoteText($value);
+ $value = (string)$value;
+ $value = preg_replace('/[^\d\.,\-+eE]/', '', $value);
+ if (preg_match('/[^\.\d]/', $value)) {
+ if (strpos($value, ',')) {
+ // 1000,00
+ if (!strpos($value, '.')) {
+ // convert the last "," to a "."
+ $value = strrev(str_replace(',', '.', strrev($value)));
+ // 1.000,00
+ } elseif (strpos($value, '.') && strpos($value, '.') < strpos($value, ',')) {
+ $value = str_replace('.', '', $value);
+ // convert the last "," to a "."
+ $value = strrev(str_replace(',', '.', strrev($value)));
+ // 1,000.00
+ } else {
+ $value = str_replace(',', '', $value);
+ }
+ }
+ }
+ return $value;
}
// }}}
@@ -1124,17 +1522,23 @@
return $db;
}
- $fp = fopen($file, 'wb');
- while (!feof($lob)) {
- $result = fread($lob, $db->options['lob_buffer_length']);
- $read = strlen($result);
- if (fwrite($fp, $result, $read) != $read) {
- fclose($fp);
- return $db->raiseError(MDB2_ERROR, null, null,
- 'writeLOBToFile: could not write to the output file');
+ if (preg_match('/^(\w+:\/\/)(.*)$/', $file, $match)) {
+ if ($match[1] == 'file://') {
+ $file = $match[2];
}
}
- fclose($fp);
+
+ $fp = @fopen($file, 'wb');
+ while (!@feof($lob)) {
+ $result = @fread($lob, $db->options['lob_buffer_length']);
+ $read = strlen($result);
+ if (@fwrite($fp, $result, $read) != $read) {
+ @fclose($fp);
+ return $db->raiseError(MDB2_ERROR, null, null,
+ 'could not write to the output file', __FUNCTION__);
+ }
+ }
+ @fclose($fp);
return MDB2_OK;
}
@@ -1144,15 +1548,16 @@
/**
* retrieve LOB from the database
*
- * @param resource $lob stream handle
+ * @param array $lob array
* @return mixed MDB2_OK on success, a MDB2 error on failure
* @access protected
*/
function _retrieveLOB(&$lob)
{
if (is_null($lob['value'])) {
- $lob['value'] = $lob['ressource'];
+ $lob['value'] = $lob['resource'];
}
+ $lob['loaded'] = true;
return MDB2_OK;
}
@@ -1184,7 +1589,7 @@
* Determine whether it was reached the end of the large object and
* therefore there is no more data to be read for the its input stream.
*
- * @param resource $lob stream handle
+ * @param array $lob array
* @return mixed true or false on success, a MDB2 error on failure
* @access protected
*/
@@ -1209,7 +1614,7 @@
$lob_index = $lob_data['wrapper_data']->lob_index;
fclose($lob);
if (isset($this->lobs[$lob_index])) {
- $this->_destroyLOB($lob_index);
+ $this->_destroyLOB($this->lobs[$lob_index]);
unset($this->lobs[$lob_index]);
}
return MDB2_OK;
@@ -1222,10 +1627,10 @@
* Free any resources allocated during the lifetime of the large object
* handler object.
*
- * @param int $lob_index from the lob array
+ * @param array $lob array
* @access private
*/
- function _destroyLOB($lob_index)
+ function _destroyLOB(&$lob)
{
return MDB2_OK;
}
@@ -1258,6 +1663,162 @@
}
return implode(', ', $return);
}
-}
+ // }}}
+ // {{{ matchPattern()
+
+ /**
+ * build a pattern matching string
+ *
+ * @access public
+ *
+ * @param array $pattern even keys are strings, odd are patterns (% and _)
+ * @param string $operator optional pattern operator (LIKE, ILIKE and maybe others in the future)
+ * @param string $field optional field name that is being matched against
+ * (might be required when emulating ILIKE)
+ *
+ * @return string SQL pattern
+ */
+ function matchPattern($pattern, $operator = null, $field = null)
+ {
+ $db =& $this->getDBInstance();
+ if (PEAR::isError($db)) {
+ return $db;
+ }
+
+ $match = '';
+ if (!is_null($operator)) {
+ $operator = strtoupper($operator);
+ switch ($operator) {
+ // case insensitive
+ case 'ILIKE':
+ if (is_null($field)) {
+ return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+ 'case insensitive LIKE matching requires passing the field name', __FUNCTION__);
+ }
+ $db->loadModule('Function', null, true);
+ $match = $db->function->lower($field).' LIKE ';
+ break;
+ // case sensitive
+ case 'LIKE':
+ $match = is_null($field) ? 'LIKE ' : $field.' LIKE ';
+ break;
+ default:
+ return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+ 'not a supported operator type:'. $operator, __FUNCTION__);
+ }
+ }
+ $match.= "'";
+ foreach ($pattern as $key => $value) {
+ if ($key % 2) {
+ $match.= $value;
+ } else {
+ if ($operator === 'ILIKE') {
+ $value = strtolower($value);
+ }
+ $escaped = $db->escape($value);
+ if (PEAR::isError($escaped)) {
+ return $escaped;
+ }
+ $match.= $db->escapePattern($escaped);
+ }
+ }
+ $match.= "'";
+ $match.= $this->patternEscapeString();
+ return $match;
+ }
+
+ // }}}
+ // {{{ patternEscapeString()
+
+ /**
+ * build string to define pattern escape character
+ *
+ * @access public
+ *
+ * @return string define pattern escape character
+ */
+ function patternEscapeString()
+ {
+ return '';
+ }
+
+ // }}}
+ // {{{ mapNativeDatatype()
+
+ /**
+ * Maps a native array description of a field to a MDB2 datatype and length
+ *
+ * @param array $field native field description
+ * @return array containing the various possible types, length, sign, fixed
+ * @access public
+ */
+ function mapNativeDatatype($field)
+ {
+ $db =& $this->getDBInstance();
+ if (PEAR::isError($db)) {
+ return $db;
+ }
+
+ // If the user has specified an option to map the native field
+ // type to a custom MDB2 datatype...
+ $db_type = strtok($field['type'], '(), ');
+ if (!empty($db->options['nativetype_map_callback'][$db_type])) {
+ return call_user_func_array($db->options['nativetype_map_callback'][$db_type], array($db, $field));
+ }
+
+ // Otherwise perform the built-in (i.e. normal) MDB2 native type to
+ // MDB2 datatype conversion
+ return $this->_mapNativeDatatype($field);
+ }
+
+ // }}}
+ // {{{ _mapNativeDatatype()
+
+ /**
+ * Maps a native array description of a field to a MDB2 datatype and length
+ *
+ * @param array $field native field description
+ * @return array containing the various possible types, length, sign, fixed
+ * @access public
+ */
+ function _mapNativeDatatype($field)
+ {
+ $db =& $this->getDBInstance();
+ if (PEAR::isError($db)) {
+ return $db;
+ }
+
+ return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+ 'method not implemented', __FUNCTION__);
+ }
+
+ // }}}
+ // {{{ mapPrepareDatatype()
+
+ /**
+ * Maps an mdb2 datatype to mysqli prepare type
+ *
+ * @param string $type
+ * @return string
+ * @access public
+ */
+ function mapPrepareDatatype($type)
+ {
+ $db =& $this->getDBInstance();
+ if (PEAR::isError($db)) {
+ return $db;
+ }
+
+ if (!empty($db->options['datatype_map'][$type])) {
+ $type = $db->options['datatype_map'][$type];
+ if (!empty($db->options['datatype_map_callback'][$type])) {
+ $parameter = array('type' => $type);
+ return call_user_func_array($db->options['datatype_map_callback'][$type], array(&$db, __FUNCTION__, $parameter));
+ }
+ }
+
+ return $type;
+ }
+}
?>
\ No newline at end of file
--
Gitblit v1.9.1