mirror of
https://github.com/dg/dibi.git
synced 2025-08-02 20:27:35 +02:00
removed some old and deprecated stuff
This commit is contained in:
@@ -115,12 +115,7 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (isset($config['charset'])) {
|
if (isset($config['charset'])) {
|
||||||
$ok = FALSE;
|
if (!@mysqli_set_charset($this->connection, $config['charset'])) {
|
||||||
if (version_compare(PHP_VERSION , '5.1.5', '>=')) {
|
|
||||||
// affects the character set used by mysql_real_escape_string() (was added in MySQL 5.0.7 and PHP 5.0.5, fixed in PHP 5.1.5)
|
|
||||||
$ok = @mysqli_set_charset($this->connection, $config['charset']); // intentionally @
|
|
||||||
}
|
|
||||||
if (!$ok) {
|
|
||||||
$this->query("SET NAMES '$config[charset]'");
|
$this->query("SET NAMES '$config[charset]'");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -35,9 +35,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
|
|||||||
/** @var int|FALSE Affected rows */
|
/** @var int|FALSE Affected rows */
|
||||||
private $affectedRows = FALSE;
|
private $affectedRows = FALSE;
|
||||||
|
|
||||||
/** @var bool Escape method */
|
|
||||||
private $escMethod = FALSE;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @throws DibiNotSupportedException
|
* @throws DibiNotSupportedException
|
||||||
@@ -103,8 +100,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
|
|||||||
if (isset($config['schema'])) {
|
if (isset($config['schema'])) {
|
||||||
$this->query('SET search_path TO "' . $config['schema'] . '"');
|
$this->query('SET search_path TO "' . $config['schema'] . '"');
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->escMethod = version_compare(PHP_VERSION , '5.2.0', '>=');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -266,24 +261,16 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
|
|||||||
{
|
{
|
||||||
switch ($type) {
|
switch ($type) {
|
||||||
case dibi::TEXT:
|
case dibi::TEXT:
|
||||||
if ($this->escMethod) {
|
|
||||||
if (!is_resource($this->connection)) {
|
if (!is_resource($this->connection)) {
|
||||||
throw new DibiException('Lost connection to server.');
|
throw new DibiException('Lost connection to server.');
|
||||||
}
|
}
|
||||||
return "'" . pg_escape_string($this->connection, $value) . "'";
|
return "'" . pg_escape_string($this->connection, $value) . "'";
|
||||||
} else {
|
|
||||||
return "'" . pg_escape_string($value) . "'";
|
|
||||||
}
|
|
||||||
|
|
||||||
case dibi::BINARY:
|
case dibi::BINARY:
|
||||||
if ($this->escMethod) {
|
|
||||||
if (!is_resource($this->connection)) {
|
if (!is_resource($this->connection)) {
|
||||||
throw new DibiException('Lost connection to server.');
|
throw new DibiException('Lost connection to server.');
|
||||||
}
|
}
|
||||||
return "'" . pg_escape_bytea($this->connection, $value) . "'";
|
return "'" . pg_escape_bytea($this->connection, $value) . "'";
|
||||||
} else {
|
|
||||||
return "'" . pg_escape_bytea($value) . "'";
|
|
||||||
}
|
|
||||||
|
|
||||||
case dibi::IDENTIFIER:
|
case dibi::IDENTIFIER:
|
||||||
// @see http://www.postgresql.org/docs/8.2/static/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS
|
// @see http://www.postgresql.org/docs/8.2/static/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS
|
||||||
@@ -313,12 +300,7 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
|
|||||||
*/
|
*/
|
||||||
public function escapeLike($value, $pos)
|
public function escapeLike($value, $pos)
|
||||||
{
|
{
|
||||||
if ($this->escMethod) {
|
|
||||||
$value = pg_escape_string($this->connection, $value);
|
$value = pg_escape_string($this->connection, $value);
|
||||||
} else {
|
|
||||||
$value = pg_escape_string($value);
|
|
||||||
}
|
|
||||||
|
|
||||||
$value = strtr($value, array( '%' => '\\\\%', '_' => '\\\\_'));
|
$value = strtr($value, array( '%' => '\\\\%', '_' => '\\\\_'));
|
||||||
return ($pos <= 0 ? "'%" : "'") . $value . ($pos >= 0 ? "%'" : "'");
|
return ($pos <= 0 ? "'%" : "'") . $value . ($pos >= 0 ? "%'" : "'");
|
||||||
}
|
}
|
||||||
@@ -418,13 +400,12 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
|
|||||||
*/
|
*/
|
||||||
public function getResultColumns()
|
public function getResultColumns()
|
||||||
{
|
{
|
||||||
$hasTable = version_compare(PHP_VERSION , '5.2.0', '>=');
|
|
||||||
$count = pg_num_fields($this->resultSet);
|
$count = pg_num_fields($this->resultSet);
|
||||||
$columns = array();
|
$columns = array();
|
||||||
for ($i = 0; $i < $count; $i++) {
|
for ($i = 0; $i < $count; $i++) {
|
||||||
$row = array(
|
$row = array(
|
||||||
'name' => pg_field_name($this->resultSet, $i),
|
'name' => pg_field_name($this->resultSet, $i),
|
||||||
'table' => $hasTable ? pg_field_table($this->resultSet, $i) : NULL,
|
'table' => pg_field_table($this->resultSet, $i),
|
||||||
'nativetype'=> pg_field_type($this->resultSet, $i),
|
'nativetype'=> pg_field_type($this->resultSet, $i),
|
||||||
);
|
);
|
||||||
$row['fullname'] = $row['table'] ? $row['table'] . '.' . $row['name'] : $row['name'];
|
$row['fullname'] = $row['table'] ? $row['table'] . '.' . $row['name'] : $row['name'];
|
||||||
|
@@ -438,29 +438,6 @@ class dibi
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/********************* data types ****************d*g**/
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated
|
|
||||||
*/
|
|
||||||
public static function datetime($time = NULL)
|
|
||||||
{
|
|
||||||
trigger_error(__METHOD__ . '() is deprecated; create DateTime object instead.', E_USER_WARNING);
|
|
||||||
return new DibiDateTime($time);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated
|
|
||||||
*/
|
|
||||||
public static function date($date = NULL)
|
|
||||||
{
|
|
||||||
trigger_error(__METHOD__ . '() is deprecated; create DateTime object instead.', E_USER_WARNING);
|
|
||||||
return new DibiDateTime($date);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/********************* substitutions ****************d*g**/
|
/********************* substitutions ****************d*g**/
|
||||||
|
|
||||||
|
|
||||||
@@ -474,37 +451,6 @@ class dibi
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/** @deprecated */
|
|
||||||
public static function addSubst($expr, $subst)
|
|
||||||
{
|
|
||||||
trigger_error(__METHOD__ . '() is deprecated; use dibi::getSubstitutes()->expr = val; instead.', E_USER_WARNING);
|
|
||||||
self::getSubstitutes()->$expr = $subst;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/** @deprecated */
|
|
||||||
public static function removeSubst($expr)
|
|
||||||
{
|
|
||||||
trigger_error(__METHOD__ . '() is deprecated; use unset(dibi::getSubstitutes()->expr) instead.', E_USER_WARNING);
|
|
||||||
$substitutes = self::getSubstitutes();
|
|
||||||
if ($expr === TRUE) {
|
|
||||||
foreach ($substitutes as $expr => $foo) {
|
|
||||||
unset($substitutes->$expr);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
unset($substitutes->$expr);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/** @deprecated */
|
|
||||||
public static function setSubstFallback($callback)
|
|
||||||
{
|
|
||||||
trigger_error(__METHOD__ . '() is deprecated; use dibi::getSubstitutes()->setCallback() instead.', E_USER_WARNING);
|
|
||||||
self::getSubstitutes()->setCallback($callback);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/********************* misc tools ****************d*g**/
|
/********************* misc tools ****************d*g**/
|
||||||
|
|
||||||
|
|
||||||
|
@@ -203,15 +203,10 @@ class DibiFluent extends DibiObject implements IDataSource
|
|||||||
* @param string clause name
|
* @param string clause name
|
||||||
* @return self
|
* @return self
|
||||||
*/
|
*/
|
||||||
public function clause($clause, $remove = FALSE)
|
public function clause($clause)
|
||||||
{
|
{
|
||||||
$this->cursor = & $this->clauses[self::$normalizer->$clause];
|
$this->cursor = & $this->clauses[self::$normalizer->$clause];
|
||||||
|
if ($this->cursor === NULL) {
|
||||||
if ($remove) { // deprecated, use removeClause
|
|
||||||
trigger_error(__METHOD__ . '(..., TRUE) is deprecated; use removeClause() instead.', E_USER_NOTICE);
|
|
||||||
$this->cursor = NULL;
|
|
||||||
|
|
||||||
} elseif ($this->cursor === NULL) {
|
|
||||||
$this->cursor = array();
|
$this->cursor = array();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -138,26 +138,12 @@ class DibiResult extends DibiObject implements IDataSource
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the number of rows in a result set. Alias for getRowCount().
|
|
||||||
* @deprecated
|
|
||||||
*/
|
|
||||||
final public function rowCount()
|
|
||||||
{
|
|
||||||
trigger_error(__METHOD__ . '() is deprecated; use count($res) or $res->getRowCount() instead.', E_USER_WARNING);
|
|
||||||
return $this->getResultDriver()->getRowCount();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Required by the IteratorAggregate interface.
|
* Required by the IteratorAggregate interface.
|
||||||
* @return DibiResultIterator
|
* @return DibiResultIterator
|
||||||
*/
|
*/
|
||||||
final public function getIterator()
|
final public function getIterator()
|
||||||
{
|
{
|
||||||
if (func_num_args()) {
|
|
||||||
trigger_error(__METHOD__ . ' arguments $offset & $limit have been dropped; use SQL clauses instead.', E_USER_WARNING);
|
|
||||||
}
|
|
||||||
return new DibiResultIterator($this);
|
return new DibiResultIterator($this);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -603,14 +589,6 @@ class DibiResult extends DibiObject implements IDataSource
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/** @deprecated */
|
|
||||||
public function getColumnNames($fullNames = FALSE)
|
|
||||||
{
|
|
||||||
trigger_error(__METHOD__ . '() is deprecated; use $res->getInfo()->getColumnNames() instead.', E_USER_WARNING);
|
|
||||||
return $this->getInfo()->getColumnNames($fullNames);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/********************* misc tools ****************d*g**/
|
/********************* misc tools ****************d*g**/
|
||||||
|
|
||||||
|
|
||||||
|
@@ -48,42 +48,6 @@ class DibiRow implements ArrayAccess, IteratorAggregate, Countable
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Converts value to UNIX timestamp.
|
|
||||||
* @param string key
|
|
||||||
* @return int
|
|
||||||
*/
|
|
||||||
public function asTimestamp($key)
|
|
||||||
{
|
|
||||||
trigger_error(__METHOD__ . '() is deprecated.', E_USER_WARNING);
|
|
||||||
return $this->asDateTime($key, 'U');
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Converts value to boolean.
|
|
||||||
* @param string key
|
|
||||||
* @return mixed
|
|
||||||
*/
|
|
||||||
public function asBool($key)
|
|
||||||
{
|
|
||||||
trigger_error(__METHOD__ . '() is deprecated.', E_USER_WARNING);
|
|
||||||
return $this[$key];
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/** @deprecated */
|
|
||||||
public function asDate($key, $format = NULL)
|
|
||||||
{
|
|
||||||
trigger_error(__METHOD__ . '() is deprecated.', E_USER_WARNING);
|
|
||||||
if ($format === NULL) {
|
|
||||||
return $this->asTimestamp($key);
|
|
||||||
} else {
|
|
||||||
return $this->asDateTime($key, $format === TRUE ? NULL : $format);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/********************* interfaces ArrayAccess, Countable & IteratorAggregate ****************d*g**/
|
/********************* interfaces ArrayAccess, Countable & IteratorAggregate ****************d*g**/
|
||||||
|
|
||||||
|
|
||||||
|
@@ -17,12 +17,12 @@ dibi::connect(array(
|
|||||||
|
|
||||||
|
|
||||||
// using the "prototype" to add custom method to class DibiResult
|
// using the "prototype" to add custom method to class DibiResult
|
||||||
function DibiResult_prototype_fetchShuffle(DibiResult $obj)
|
DibiResult::extensionMethod('fetchShuffle', function(DibiResult $obj)
|
||||||
{
|
{
|
||||||
$all = $obj->fetchAll();
|
$all = $obj->fetchAll();
|
||||||
shuffle($all);
|
shuffle($all);
|
||||||
return $all;
|
return $all;
|
||||||
}
|
});
|
||||||
|
|
||||||
|
|
||||||
// fetch complete result set shuffled
|
// fetch complete result set shuffled
|
||||||
|
Reference in New Issue
Block a user