mirror/php-dibi
1
0
Fork 0
mirror of https://github.com/dg/dibi.git synced 2025-08-01 11:50:15 +02:00
Code Issues Releases Wiki Activity

typos & whitespace

Browse Source
This commit is contained in:
David Grudl
2013-12-30 23:19:42 +01:00
parent 6f99db544f
commit 8112fe10d0
51 changed files with 592 additions and 1412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@@ -3,7 +3,7 @@
"description": "Dibi is Database Abstraction Library for PHP 5.",
"keywords": ["database", "dbal", "mysql", "postgresql", "sqlite", "mssql", "oracle", "access", "pdo", "odbc"],
"homepage": "http://dibiphp.com/",
"license": ["BSD-3", "GPLv2", "GPLv3"],
"license": ["BSD-3-Clause", "GPL-2.0", "GPL-3.0"],
"authors": [
{
"name": "David Grudl",

1
dibi/Nette/DibiNetteExtension.php
View File

@@ -10,7 +10,6 @@
*/
/**
* Dibi extension for Nette Framework. Creates 'connection' service.
*

16
dibi/Nette/DibiNettePanel.php
View File

@@ -2,21 +2,15 @@
/**
* This file is part of the "dibi" - smart database abstraction layer.
*
* Copyright (c) 2005 David Grudl (http://davidgrudl.com)
*
* For the full copyright and license information, please view
* the file license.txt that was distributed with this source code.
*/
if (interface_exists('Nette\Diagnostics\IBarPanel')) {
class_alias('Nette\Diagnostics\IBarPanel', 'IBarPanel');
}
/**
* Dibi panel for Nette\Diagnostics.
*
@@ -38,7 +32,6 @@ class DibiNettePanel extends DibiObject implements IBarPanel
private $events = array();
public function __construct($explain = TRUE, $filter = NULL)
{
$this->filter = $filter ? (int) $filter : DibiEvent::QUERY;
@@ -46,7 +39,6 @@ class DibiNettePanel extends DibiObject implements IBarPanel
}
public function register(DibiConnection $connection)
{
if (is_callable('Nette\Diagnostics\Debugger::enable') && !class_exists('NDebugger')) {
@@ -64,7 +56,6 @@ class DibiNettePanel extends DibiObject implements IBarPanel
}
/**
* After event notification.
* @return void
@@ -78,7 +69,6 @@ class DibiNettePanel extends DibiObject implements IBarPanel
}
/**
* Returns blue-screen custom tab.
* @return mixed
@@ -94,7 +84,6 @@ class DibiNettePanel extends DibiObject implements IBarPanel
}
/**
* Returns HTML code for custom tab. (Nette\Diagnostics\IBarPanel)
* @return mixed
@@ -107,12 +96,11 @@ class DibiNettePanel extends DibiObject implements IBarPanel
}
return '<span title="dibi"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAEYSURBVBgZBcHPio5hGAfg6/2+R980k6wmJgsJ5U/ZOAqbSc2GnXOwUg7BESgLUeIQ1GSjLFnMwsKGGg1qxJRmPM97/1zXFAAAAEADdlfZzr26miup2svnelq7d2aYgt3rebl585wN6+K3I1/9fJe7O/uIePP2SypJkiRJ0vMhr55FLCA3zgIAOK9uQ4MS361ZOSX+OrTvkgINSjS/HIvhjxNNFGgQsbSmabohKDNoUGLohsls6BaiQIMSs2FYmnXdUsygQYmumy3Nhi6igwalDEOJEjPKP7CA2aFNK8Bkyy3fdNCg7r9/fW3jgpVJbDmy5+PB2IYp4MXFelQ7izPrhkPHB+P5/PjhD5gCgCenx+VR/dODEwD+A3T7nqbxwf1HAAAAAElFTkSuQmCC" />'
. count($this->events) . ' queries'
. ($totalTime ? ' / ' . sprintf('%0.1f', $totalTime * 1000) . 'ms' : '')
. ($totalTime ? sprintf(' / %0.1f ms', $totalTime * 1000) : '')
. '</span>';
}
/**
* Returns HTML code for custom panel. (Nette\Diagnostics\IBarPanel)
* @return mixed
@@ -160,7 +148,7 @@ class DibiNettePanel extends DibiObject implements IBarPanel
'<style> #nette-debug td.nette-DibiProfiler-sql { background: white !important }
#nette-debug .nette-DibiProfiler-source { color: #999 !important }
#nette-debug nette-DibiProfiler tr table { margin: 8px 0; max-height: 150px; overflow:auto } </style>
<h1>Queries: ' . count($this->events) . ($totalTime === NULL ? '' : ', time: ' . sprintf('%0.3f', $totalTime * 1000) . ' ms') . '</h1>
<h1>Queries: ' . count($this->events) . ($totalTime === NULL ? '' : sprintf(', time: %0.3f ms', $totalTime * 1000)) . '</h1>
<div class="nette-inner nette-DibiProfiler">
<table>
<tr><th>Time&nbsp;ms</th><th>SQL Statement</th><th>Rows</th><th>Connection</th></tr>' . $s . '

67
dibi/dibi.php
View File

@@ -4,9 +4,6 @@
* dibi - smart database abstraction layer (http://dibiphp.com)
*
* Copyright (c) 2005, 2012 David Grudl (http://davidgrudl.com)
*
* For the full copyright and license information, please view
* the file license.txt that was distributed with this source code.
*/
@@ -43,9 +40,6 @@ if (interface_exists('Nette\Diagnostics\IBarPanel') || interface_exists('IBarPan
}
/**
* Interface for database drivers.
*
@@ -112,7 +106,6 @@ class dibi
public static $defaultDriver = 'mysql';
/**
* Static class - cannot be instantiated.
*/
@@ -122,11 +115,9 @@ class dibi
}
/********************* connections handling ****************d*g**/
/**
* Creates a new DibiConnection object and connects it to specified database.
* @param mixed connection parameters
@@ -140,7 +131,6 @@ class dibi
}
/**
* Disconnects from database (doesn't destroy DibiConnection object).
* @return void
@@ -151,7 +141,6 @@ class dibi
}
/**
* Returns TRUE when connection was established.
* @return bool
@@ -162,7 +151,6 @@ class dibi
}
/**
* Retrieve active connection.
* @param string connection registy name
@@ -187,7 +175,6 @@ class dibi
}
/**
* Sets connection.
* @param DibiConnection
@@ -199,7 +186,6 @@ class dibi
}
/**
* Change active connection.
* @param string connection registy name
@@ -212,11 +198,9 @@ class dibi
}
/********************* monostate for active connection ****************d*g**/
/**
* Generates and executes SQL query - Monostate for DibiConnection::query().
* @param array|mixed one or more arguments
@@ -230,7 +214,6 @@ class dibi
}
/**
* Executes the SQL query - Monostate for DibiConnection::nativeQuery().
* @param string SQL statement.
@@ -242,7 +225,6 @@ class dibi
}
/**
* Generates and prints SQL query - Monostate for DibiConnection::test().
* @param array|mixed one or more arguments
@@ -255,7 +237,6 @@ class dibi
}
/**
* Generates and returns SQL query as DibiDataSource - Monostate for DibiConnection::test().
* @param array|mixed one or more arguments
@@ -268,7 +249,6 @@ class dibi
}
/**
* Executes SQL query and fetch result - Monostate for DibiConnection::query() & fetch().
* @param array|mixed one or more arguments
@@ -282,11 +262,10 @@ class dibi
}
/**
* Executes SQL query and fetch results - Monostate for DibiConnection::query() & fetchAll().
* @param array|mixed one or more arguments
* @return array of DibiRow
* @return DibiRow[]
* @throws DibiException
*/
public static function fetchAll($args)
@@ -296,7 +275,6 @@ class dibi
}
/**
* Executes SQL query and fetch first column - Monostate for DibiConnection::query() & fetchSingle().
* @param array|mixed one or more arguments
@@ -310,7 +288,6 @@ class dibi
}
/**
* Executes SQL query and fetch pairs - Monostate for DibiConnection::query() & fetchPairs().
* @param array|mixed one or more arguments
@@ -324,7 +301,6 @@ class dibi
}
/**
* Gets the number of affected rows.
* Monostate for DibiConnection::getAffectedRows()
@@ -337,7 +313,6 @@ class dibi
}
/**
* Gets the number of affected rows. Alias for getAffectedRows().
* @return int number of rows
@@ -349,7 +324,6 @@ class dibi
}
/**
* Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
* Monostate for DibiConnection::getInsertId()
@@ -363,7 +337,6 @@ class dibi
}
/**
* Retrieves the ID generated for an AUTO_INCREMENT column. Alias for getInsertId().
* @param string optional sequence name
@@ -376,7 +349,6 @@ class dibi
}
/**
* Begins a transaction - Monostate for DibiConnection::begin().
* @param string optional savepoint name
@@ -389,7 +361,6 @@ class dibi
}
/**
* Commits statements in a transaction - Monostate for DibiConnection::commit($savepoint = NULL).
* @param string optional savepoint name
@@ -402,7 +373,6 @@ class dibi
}
/**
* Rollback changes in a transaction - Monostate for DibiConnection::rollback().
* @param string optional savepoint name
@@ -415,7 +385,6 @@ class dibi
}
/**
* Gets a information about the current database - Monostate for DibiConnection::getDatabaseInfo().
* @return DibiDatabaseInfo
@@ -426,7 +395,6 @@ class dibi
}
/**
* Import SQL dump from file - extreme fast!
* @param string filename
@@ -438,7 +406,6 @@ class dibi
}
/**
* Replacement for majority of dibi::methods() in future.
*/
@@ -451,11 +418,9 @@ class dibi
}
/********************* fluent SQL builders ****************d*g**/
/**
* @return DibiFluent
*/
@@ -465,7 +430,6 @@ class dibi
}
/**
* @param string column name
* @return DibiFluent
@@ -477,7 +441,6 @@ class dibi
}
/**
* @param string table
* @param array
@@ -489,7 +452,6 @@ class dibi
}
/**
* @param string table
* @param array
@@ -501,7 +463,6 @@ class dibi
}
/**
* @param string table
* @return DibiFluent
@@ -512,13 +473,11 @@ class dibi
}
/********************* data types ****************d*g**/
/**
* @return DibiDateTime
* @deprecated
*/
public static function datetime($time = NULL)
{
@@ -527,7 +486,6 @@ class dibi
}
/**
* @deprecated
*/
@@ -538,11 +496,9 @@ class dibi
}
/********************* substitutions ****************d*g**/
/**
* Returns substitution hashmap - Monostate for DibiConnection::getSubstitutes().
* @return DibiHashMap
@@ -553,7 +509,6 @@ class dibi
}
/** @deprecated */
public static function addSubst($expr, $subst)
{
@@ -562,7 +517,6 @@ class dibi
}
/** @deprecated */
public static function removeSubst($expr)
{
@@ -578,7 +532,6 @@ class dibi
}
/** @deprecated */
public static function setSubstFallback($callback)
{
@@ -587,11 +540,9 @@ class dibi
}
/********************* misc tools ****************d*g**/
/**
* Prints out a syntax highlighted version of the SQL command or DibiResult.
* @param string|DibiResult
@@ -605,7 +556,9 @@ class dibi
$sql->dump();
} else {
if ($sql === NULL) $sql = self::$sql;
if ($sql === NULL) {
$sql = self::$sql;
}
static $keywords1 = 'SELECT|(?:ON\s+DUPLICATE\s+KEY)?UPDATE|INSERT(?:\s+INTO)?|REPLACE(?:\s+INTO)?|DELETE|CALL|UNION|FROM|WHERE|HAVING|GROUP\s+BY|ORDER\s+BY|LIMIT|OFFSET|SET|VALUES|LEFT\s+JOIN|INNER\s+JOIN|TRUNCATE';
static $keywords2 = 'ALL|DISTINCT|DISTINCTROW|IGNORE|AS|USING|ON|AND|OR|IN|IS|NOT|NULL|LIKE|RLIKE|REGEXP|TRUE|FALSE';
@@ -638,20 +591,20 @@ class dibi
}
private static function highlightCallback($matches)
{
if (!empty($matches[1])) // comment
if (!empty($matches[1])) { // comment
return '<em style="color:gray">' . $matches[1] . '</em>';
if (!empty($matches[2])) // error
} elseif (!empty($matches[2])) { // error
return '<strong style="color:red">' . $matches[2] . '</strong>';
if (!empty($matches[3])) // most important keywords
} elseif (!empty($matches[3])) { // most important keywords
return '<strong style="color:blue">' . $matches[3] . '</strong>';
if (!empty($matches[4])) // other keywords
} elseif (!empty($matches[4])) { // other keywords
return '<strong style="color:green">' . $matches[4] . '</strong>';
}
}
}

56
dibi/drivers/firebird.php
View File

@@ -2,11 +2,7 @@
/**
* This file is part of the "dibi" - smart database abstraction layer.
*
* Copyright (c) 2005 David Grudl (http://davidgrudl.com)
*
* For the full copyright and license information, please view
* the file license.txt that was distributed with this source code.
*/
@@ -56,13 +52,12 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
}
/**
* Connects to a database.
* @return void
* @throws DibiException
*/
public function connect(array &$config)
public function connect(array & $config)
{
DibiConnection::alias($config, 'database', 'db');
@@ -95,7 +90,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
}
/**
* Disconnects from a database.
* @return void
@@ -106,7 +100,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
}
/**
* Executes the SQL query.
* @param string SQL statement.
@@ -138,7 +131,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
}
/**
* Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
* @return int|FALSE number of rows or FALSE on error
@@ -149,7 +141,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
}
/**
* Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
* @param string generator name
@@ -161,7 +152,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
}
/**
* Begins a transaction (if supported).
* @param string optional savepoint name
@@ -178,7 +168,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
}
/**
* Commits statements in a transaction.
* @param string optional savepoint name
@@ -199,7 +188,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
}
/**
* Rollback changes in a transaction.
* @param string optional savepoint name
@@ -220,7 +208,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
}
/**
* Is in transaction?
* @return bool
@@ -231,7 +218,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
}
/**
* Returns the connection resource.
* @return resource
@@ -242,7 +228,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
}
/**
* Returns the connection reflector.
* @return IDibiReflector
@@ -253,7 +238,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
}
/**
* Result set driver factory.
* @param resource
@@ -267,11 +251,9 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
}
/********************* SQL ********************/
/**
* Encodes data for use in a SQL statement.
* @param mixed value
@@ -304,7 +286,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
}
/**
* Encodes string for use in a LIKE statement.
* @param string
@@ -317,7 +298,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
}
/**
* Decodes data from result set.
* @param string value
@@ -334,28 +314,22 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
}
/**
* Injects LIMIT/OFFSET to the SQL query.
* @param string &$sql The SQL query that will be modified.
* @param int $limit
* @param int $offset
* @return void
*/
public function applyLimit(&$sql, $limit, $offset)
public function applyLimit(& $sql, $limit, $offset)
{
if ($limit < 0 && $offset < 1) return;
if ($limit >= 0 && $offset > 0) {
// see http://scott.yang.id.au/2004/01/limit-in-select-statements-in-firebird/
$sql = 'SELECT FIRST ' . (int) $limit . ($offset > 0 ? ' SKIP ' . (int) $offset : '') . ' * FROM (' . $sql . ')';
}
}
/********************* result set ********************/
/**
* Automatically frees the resources allocated for this result set.
* @return void
@@ -366,7 +340,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
}
/**
* Returns the number of rows in a result set.
* @return int
@@ -377,7 +350,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
}
/**
* Fetches the row at current position and moves the internal cursor to the next position.
* @param bool TRUE for associative array, FALSE for numeric
@@ -402,7 +374,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
}
/**
* Moves cursor position without fetching row.
* @param int the 0-based cursor pos to seek to
@@ -415,7 +386,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
}
/**
* Frees the resources allocated for this result set.
* @return void
@@ -427,7 +397,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
}
/**
* Returns the result set resource.
* @return mysqli_result
@@ -439,7 +408,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
}
/**
* Returns metadata for all columns in a result set.
* @return array
@@ -461,11 +429,9 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
}
/********************* IDibiReflector ********************/
/**
* Returns list of tables.
* @return array
@@ -489,7 +455,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
}
/**
* Returns metadata for all columns in a table.
* @param string
@@ -545,7 +510,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
}
/**
* Returns metadata for all indexes in a table (the constraints are included).
* @param string
@@ -580,7 +544,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
}
/**
* Returns metadata for all foreign keys in a table.
* @param string
@@ -611,7 +574,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
}
/**
* Returns list of indices in given table (the constraints are not listed).
* @param string
@@ -634,7 +596,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
}
/**
* Returns list of constraints in given table.
* @param string
@@ -659,7 +620,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
}
/**
* Returns metadata for all triggers in a table or database.
* (Only if user has permissions on ALTER TABLE, INSERT/UPDATE/DELETE record in table)
@@ -709,7 +669,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
}
/**
* Returns list of triggers for given table.
* (Only if user has permissions on ALTER TABLE, INSERT/UPDATE/DELETE record in table)
@@ -732,7 +691,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
}
/**
* Returns metadata from stored procedures and their input and output parameters.
* @param string
@@ -786,7 +744,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
}
/**
* Returns list of stored procedures.
* @return array
@@ -805,7 +762,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
}
/**
* Returns list of generators.
* @return array
@@ -825,7 +781,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
}
/**
* Returns list of user defined functions (UDF).
* @return array
@@ -847,8 +802,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD
}
/**
* Database procedure exception.
*
@@ -875,7 +828,6 @@ class DibiProcedureException extends DibiException
}
/**
* Gets the exception severity.
* @return string

36
dibi/drivers/mssql.php
View File

@@ -2,11 +2,7 @@
/**
* This file is part of the "dibi" - smart database abstraction layer.
*
* Copyright (c) 2005 David Grudl (http://davidgrudl.com)
*
* For the full copyright and license information, please view
* the file license.txt that was distributed with this source code.
*/
require_once dirname(__FILE__) . '/mssql.reflector.php';
@@ -38,7 +34,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
private $autoFree = TRUE;
/**
* @throws DibiNotSupportedException
*/
@@ -50,13 +45,12 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Connects to a database.
* @return void
* @throws DibiException
*/
public function connect(array &$config)
public function connect(array & $config)
{
if (isset($config['resource'])) {
$this->connection = $config['resource'];
@@ -76,7 +70,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Disconnects from a database.
* @return void
@@ -87,7 +80,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Executes the SQL query.
* @param string SQL statement.
@@ -107,7 +99,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
* @return int|FALSE number of rows or FALSE on error
@@ -118,7 +109,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
* @return int|FALSE int on success or FALSE on failure
@@ -134,7 +124,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Begins a transaction (if supported).
* @param string optional savepoint name
@@ -147,7 +136,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Commits statements in a transaction.
* @param string optional savepoint name
@@ -160,7 +148,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Rollback changes in a transaction.
* @param string optional savepoint name
@@ -173,7 +160,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Returns the connection resource.
* @return mixed
@@ -184,7 +170,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Returns the connection reflector.
* @return IDibiReflector
@@ -195,7 +180,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Result set driver factory.
* @param resource
@@ -209,11 +193,9 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/********************* SQL ****************d*g**/
/**
* Encodes data for use in a SQL statement.
* @param mixed value
@@ -247,7 +229,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Encodes string for use in a LIKE statement.
* @param string
@@ -261,7 +242,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Decodes data from result set.
* @param string value
@@ -278,15 +258,11 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Injects LIMIT/OFFSET to the SQL query.
* @param string &$sql The SQL query that will be modified.
* @param int $limit
* @param int $offset
* @return void
*/
public function applyLimit(&$sql, $limit, $offset)
public function applyLimit(& $sql, $limit, $offset)
{
// offset support is missing
if ($limit >= 0) {
@@ -299,11 +275,9 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/********************* result set ****************d*g**/
/**
* Automatically frees the resources allocated for this result set.
* @return void
@@ -314,7 +288,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Returns the number of rows in a result set.
* @return int
@@ -325,7 +298,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Fetches the row at current position and moves the internal cursor to the next position.
* @param bool TRUE for associative array, FALSE for numeric
@@ -337,7 +309,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Moves cursor position without fetching row.
* @param int the 0-based cursor pos to seek to
@@ -349,7 +320,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Frees the resources allocated for this result set.
* @return void
@@ -361,7 +331,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Returns metadata for all columns in a result set.
* @return array
@@ -383,7 +352,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Returns the result set resource.
* @return mixed

9
dibi/drivers/mssql.reflector.php
View File

@@ -5,9 +5,6 @@
*
* Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
*
* For the full copyright and license information, please view
* the file license.txt that was distributed with this source code.
*
* @package dibi\drivers
*/
@@ -25,14 +22,12 @@ class DibiMsSqlReflector extends DibiObject implements IDibiReflector
private $driver;
public function __construct(IDibiDriver $driver)
{
$this->driver = $driver;
}
/**
* Returns list of tables.
* @return array
@@ -54,7 +49,6 @@ class DibiMsSqlReflector extends DibiObject implements IDibiReflector
}
/**
* Returns count of rows in a table
* @param string
@@ -87,7 +81,6 @@ class DibiMsSqlReflector extends DibiObject implements IDibiReflector
}
/**
* Returns metadata for all columns in a table.
* @param string
@@ -138,7 +131,6 @@ class DibiMsSqlReflector extends DibiObject implements IDibiReflector
}
/**
* Returns metadata for all indexes in a table.
* @param string
@@ -180,7 +172,6 @@ class DibiMsSqlReflector extends DibiObject implements IDibiReflector
}
/**
* Returns metadata for all foreign keys in a table.
* @param string

36
dibi/drivers/mssql2005.php
View File

@@ -2,11 +2,7 @@
/**
* This file is part of the "dibi" - smart database abstraction layer.
*
* Copyright (c) 2005 David Grudl (http://davidgrudl.com)
*
* For the full copyright and license information, please view
* the file license.txt that was distributed with this source code.
*/
@@ -41,7 +37,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
private $affectedRows = FALSE;
/**
* @throws DibiNotSupportedException
*/
@@ -53,13 +48,12 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
}
/**
* Connects to a database.
* @return void
* @throws DibiException
*/
public function connect(array &$config)
public function connect(array & $config)
{
DibiConnection::alias($config, 'options|UID', 'username');
DibiConnection::alias($config, 'options|PWD', 'password');
@@ -80,7 +74,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
}
/**
* Disconnects from a database.
* @return void
@@ -91,7 +84,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
}
/**
* Executes the SQL query.
* @param string SQL statement.
@@ -114,7 +106,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
}
/**
* Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
* @return int|FALSE number of rows or FALSE on error
@@ -125,7 +116,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
}
/**
* Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
* @return int|FALSE int on success or FALSE on failure
@@ -141,7 +131,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
}
/**
* Begins a transaction (if supported).
* @param string optional savepoint name
@@ -154,7 +143,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
}
/**
* Commits statements in a transaction.
* @param string optional savepoint name
@@ -167,7 +155,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
}
/**
* Rollback changes in a transaction.
* @param string optional savepoint name
@@ -180,7 +167,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
}
/**
* Returns the connection resource.
* @return mixed
@@ -191,7 +177,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
}
/**
* Returns the connection reflector.
* @return IDibiReflector
@@ -202,7 +187,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
}
/**
* Result set driver factory.
* @param resource
@@ -216,11 +200,9 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
}
/********************* SQL ****************d*g**/
/**
* Encodes data for use in a SQL statement.
* @param mixed value
@@ -254,7 +236,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
}
/**
* Encodes string for use in a LIKE statement.
* @param string
@@ -268,7 +249,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
}
/**
* Decodes data from result set.
* @param string value
@@ -285,15 +265,11 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
}
/**
* Injects LIMIT/OFFSET to the SQL query.
* @param string &$sql The SQL query that will be modified.
* @param int $limit
* @param int $offset
* @return void
*/
public function applyLimit(&$sql, $limit, $offset)
public function applyLimit(& $sql, $limit, $offset)
{
// offset support is missing
if ($limit >= 0) {
@@ -306,11 +282,9 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
}
/********************* result set ****************d*g**/
/**
* Automatically frees the resources allocated for this result set.
* @return void
@@ -321,7 +295,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
}
/**
* Returns the number of rows in a result set.
* @return int
@@ -332,7 +305,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
}
/**
* Fetches the row at current position and moves the internal cursor to the next position.
* @param bool TRUE for associative array, FALSE for numeric
@@ -344,7 +316,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
}
/**
* Moves cursor position without fetching row.
* @param int the 0-based cursor pos to seek to
@@ -356,7 +327,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
}
/**
* Frees the resources allocated for this result set.
* @return void
@@ -368,7 +338,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
}
/**
* Returns metadata for all columns in a result set.
* @return array
@@ -387,7 +356,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult
}
/**
* Returns the result set resource.
* @return mixed

49
dibi/drivers/mysql.php
View File

@@ -2,11 +2,7 @@
/**
* This file is part of the "dibi" - smart database abstraction layer.
*
* Copyright (c) 2005 David Grudl (http://davidgrudl.com)
*
* For the full copyright and license information, please view
* the file license.txt that was distributed with this source code.
*/
@@ -53,7 +49,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
private $buffered;
/**
* @throws DibiNotSupportedException
*/
@@ -65,13 +60,12 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Connects to a database.
* @return void
* @throws DibiException
*/
public function connect(array &$config)
public function connect(array & $config)
{
if (isset($config['resource'])) {
$this->connection = $config['resource'];
@@ -88,7 +82,9 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
$config['host'] = $host;
$config['port'] = ini_get('mysql.default_port');
} else {
if (!isset($config['socket'])) $config['socket'] = ini_get('mysql.default_socket');
if (!isset($config['socket'])) {
$config['socket'] = ini_get('mysql.default_socket');
}
$config['host'] = NULL;
}
}
@@ -137,7 +133,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Disconnects from a database.
* @return void
@@ -148,7 +143,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Executes the SQL query.
* @param string SQL statement.
@@ -172,7 +166,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Retrieves information about the most recently executed query.
* @return array
@@ -181,7 +174,9 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
{
$res = array();
preg_match_all('#(.+?): +(\d+) *#', mysql_info($this->connection), $matches, PREG_SET_ORDER);
if (preg_last_error()) throw new DibiPcreException;
if (preg_last_error()) {
throw new DibiPcreException;
}
foreach ($matches as $m) {
$res[$m[1]] = (int) $m[2];
@@ -190,7 +185,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
* @return int|FALSE number of rows or FALSE on error
@@ -201,7 +195,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
* @return int|FALSE int on success or FALSE on failure
@@ -212,7 +205,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Begins a transaction (if supported).
* @param string optional savepoint name
@@ -225,7 +217,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Commits statements in a transaction.
* @param string optional savepoint name
@@ -238,7 +229,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Rollback changes in a transaction.
* @param string optional savepoint name
@@ -251,7 +241,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Returns the connection resource.
* @return mixed
@@ -262,7 +251,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Returns the connection reflector.
* @return IDibiReflector
@@ -273,7 +261,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Result set driver factory.
* @param resource
@@ -287,11 +274,9 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/********************* SQL ****************d*g**/
/**
* Encodes data for use in a SQL statement.
* @param mixed value
@@ -333,7 +318,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Encodes string for use in a LIKE statement.
* @param string
@@ -347,7 +331,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Decodes data from result set.
* @param string value
@@ -364,29 +347,23 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Injects LIMIT/OFFSET to the SQL query.
* @param string &$sql The SQL query that will be modified.
* @param int $limit
* @param int $offset
* @return void
*/
public function applyLimit(&$sql, $limit, $offset)
public function applyLimit(& $sql, $limit, $offset)
{
if ($limit < 0 && $offset < 1) return;
if ($limit >= 0 || $offset > 0) {
// see http://dev.mysql.com/doc/refman/5.0/en/select.html
$sql .= ' LIMIT ' . ($limit < 0 ? '18446744073709551615' : (int) $limit)
. ($offset > 0 ? ' OFFSET ' . (int) $offset : '');
}
}
/********************* result set ****************d*g**/
/**
* Automatically frees the resources allocated for this result set.
* @return void
@@ -397,7 +374,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Returns the number of rows in a result set.
* @return int
@@ -411,7 +387,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Fetches the row at current position and moves the internal cursor to the next position.
* @param bool TRUE for associative array, FALSE for numeric
@@ -423,7 +398,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Moves cursor position without fetching row.
* @param int the 0-based cursor pos to seek to
@@ -440,7 +414,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Frees the resources allocated for this result set.
* @return void
@@ -452,7 +425,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Returns metadata for all columns in a result set.
* @return array
@@ -475,7 +447,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv
}
/**
* Returns the result set resource.
* @return mixed

9
dibi/drivers/mysql.reflector.php
View File

@@ -2,11 +2,7 @@
/**
* This file is part of the "dibi" - smart database abstraction layer.
*
* Copyright (c) 2005 David Grudl (http://davidgrudl.com)
*
* For the full copyright and license information, please view
* the file license.txt that was distributed with this source code.
*/
@@ -23,14 +19,12 @@ class DibiMySqlReflector extends DibiObject implements IDibiReflector
private $driver;
public function __construct(IDibiDriver $driver)
{
$this->driver = $driver;
}
/**
* Returns list of tables.
* @return array
@@ -54,7 +48,6 @@ class DibiMySqlReflector extends DibiObject implements IDibiReflector
}
/**
* Returns metadata for all columns in a table.
* @param string
@@ -88,7 +81,6 @@ class DibiMySqlReflector extends DibiObject implements IDibiReflector
}
/**
* Returns metadata for all indexes in a table.
* @param string
@@ -115,7 +107,6 @@ class DibiMySqlReflector extends DibiObject implements IDibiReflector
}
/**
* Returns metadata for all foreign keys in a table.
* @param string

45
dibi/drivers/mysqli.php
View File

@@ -2,11 +2,7 @@
/**
* This file is part of the "dibi" - smart database abstraction layer.
*
* Copyright (c) 2005 David Grudl (http://davidgrudl.com)
*
* For the full copyright and license information, please view
* the file license.txt that was distributed with this source code.
*/
@@ -54,7 +50,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
private $buffered;
/**
* @throws DibiNotSupportedException
*/
@@ -66,13 +61,12 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Connects to a database.
* @return void
* @throws DibiException
*/
public function connect(array &$config)
public function connect(array & $config)
{
mysqli_report(MYSQLI_REPORT_OFF);
if (isset($config['resource'])) {
@@ -138,7 +132,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Disconnects from a database.
* @return void
@@ -149,7 +142,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Executes the SQL query.
* @param string SQL statement.
@@ -169,7 +161,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Retrieves information about the most recently executed query.
* @return array
@@ -178,7 +169,9 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
{
$res = array();
preg_match_all('#(.+?): +(\d+) *#', mysqli_info($this->connection), $matches, PREG_SET_ORDER);
if (preg_last_error()) throw new DibiPcreException;
if (preg_last_error()) {
throw new DibiPcreException;
}
foreach ($matches as $m) {
$res[$m[1]] = (int) $m[2];
@@ -187,7 +180,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
* @return int|FALSE number of rows or FALSE on error
@@ -198,7 +190,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
* @return int|FALSE int on success or FALSE on failure
@@ -209,7 +200,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Begins a transaction (if supported).
* @param string optional savepoint name
@@ -222,7 +212,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Commits statements in a transaction.
* @param string optional savepoint name
@@ -235,7 +224,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Rollback changes in a transaction.
* @param string optional savepoint name
@@ -248,7 +236,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Returns the connection resource.
* @return mysqli
@@ -259,7 +246,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Returns the connection reflector.
* @return IDibiReflector
@@ -270,7 +256,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Result set driver factory.
* @param mysqli_result
@@ -284,11 +269,9 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/********************* SQL ****************d*g**/
/**
* Encodes data for use in a SQL statement.
* @param mixed value
@@ -323,7 +306,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Encodes string for use in a LIKE statement.
* @param string
@@ -337,7 +319,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Decodes data from result set.
* @param string value
@@ -354,29 +335,23 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Injects LIMIT/OFFSET to the SQL query.
* @param string &$sql The SQL query that will be modified.
* @param int $limit
* @param int $offset
* @return void
*/
public function applyLimit(&$sql, $limit, $offset)
public function applyLimit(& $sql, $limit, $offset)
{
if ($limit < 0 && $offset < 1) return;
if ($limit >= 0 || $offset > 0) {
// see http://dev.mysql.com/doc/refman/5.0/en/select.html
$sql .= ' LIMIT ' . ($limit < 0 ? '18446744073709551615' : (int) $limit)
. ($offset > 0 ? ' OFFSET ' . (int) $offset : '');
}
}
/********************* result set ****************d*g**/
/**
* Automatically frees the resources allocated for this result set.
* @return void
@@ -387,7 +362,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Returns the number of rows in a result set.
* @return int
@@ -401,7 +375,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Fetches the row at current position and moves the internal cursor to the next position.
* @param bool TRUE for associative array, FALSE for numeric
@@ -413,7 +386,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Moves cursor position without fetching row.
* @param int the 0-based cursor pos to seek to
@@ -429,7 +401,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Frees the resources allocated for this result set.
* @return void
@@ -441,7 +412,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Returns metadata for all columns in a result set.
* @return array
@@ -475,7 +445,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Returns the result set resource.
* @return mysqli_result

50
dibi/drivers/odbc.php
View File

@@ -2,11 +2,7 @@
/**
* This file is part of the "dibi" - smart database abstraction layer.
*
* Copyright (c) 2005 David Grudl (http://davidgrudl.com)
*
* For the full copyright and license information, please view
* the file license.txt that was distributed with this source code.
*/
@@ -42,7 +38,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
private $row = 0;
/**
* @throws DibiNotSupportedException
*/
@@ -54,13 +49,12 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
}
/**
* Connects to a database.
* @return void
* @throws DibiException
*/
public function connect(array &$config)
public function connect(array & $config)
{
if (isset($config['resource'])) {
$this->connection = $config['resource'];
@@ -83,7 +77,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
}
/**
* Disconnects from a database.
* @return void
@@ -94,7 +87,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
}
/**
* Executes the SQL query.
* @param string SQL statement.
@@ -116,7 +108,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
}
/**
* Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
* @return int|FALSE number of rows or FALSE on error
@@ -127,7 +118,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
}
/**
* Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
* @return int|FALSE int on success or FALSE on failure
@@ -138,7 +128,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
}
/**
* Begins a transaction (if supported).
* @param string optional savepoint name
@@ -153,7 +142,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
}
/**
* Commits statements in a transaction.
* @param string optional savepoint name
@@ -169,7 +157,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
}
/**
* Rollback changes in a transaction.
* @param string optional savepoint name
@@ -185,7 +172,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
}
/**
* Is in transaction?
* @return bool
@@ -196,7 +182,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
}
/**
* Returns the connection resource.
* @return mixed
@@ -207,7 +192,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
}
/**
* Returns the connection reflector.
* @return IDibiReflector
@@ -218,7 +202,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
}
/**
* Result set driver factory.
* @param resource
@@ -232,11 +215,9 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
}
/********************* SQL ****************d*g**/
/**
* Encodes data for use in a SQL statement.
* @param mixed value
@@ -269,7 +250,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
}
/**
* Encodes string for use in a LIKE statement.
* @param string
@@ -283,7 +263,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
}
/**
* Decodes data from result set.
* @param string value
@@ -300,30 +279,26 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
}
/**
* Injects LIMIT/OFFSET to the SQL query.
* @param string &$sql The SQL query that will be modified.
* @param int $limit
* @param int $offset
* @return void
*/
public function applyLimit(&$sql, $limit, $offset)
public function applyLimit(& $sql, $limit, $offset)
{
// offset support is missing
if ($limit >= 0) {
$sql = 'SELECT TOP ' . (int) $limit . ' * FROM (' . $sql . ')';
}
if ($offset) throw new DibiNotSupportedException('Offset is not implemented in driver odbc.');
if ($offset) {
throw new DibiNotSupportedException('Offset is not implemented in driver odbc.');
}
}
/********************* result set ****************d*g**/
/**
* Automatically frees the resources allocated for this result set.
* @return void
@@ -334,7 +309,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
}
/**
* Returns the number of rows in a result set.
* @return int
@@ -346,7 +320,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
}
/**
* Fetches the row at current position and moves the internal cursor to the next position.
* @param bool TRUE for associative array, FALSE for numeric
@@ -358,7 +331,9 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
return odbc_fetch_array($this->resultSet, ++$this->row);
} else {
$set = $this->resultSet;
if (!odbc_fetch_row($set, ++$this->row)) return FALSE;
if (!odbc_fetch_row($set, ++$this->row)) {
return FALSE;
}
$count = odbc_num_fields($set);
$cols = array();
for ($i = 1; $i <= $count; $i++) $cols[] = odbc_result($set, $i);
@@ -367,7 +342,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
}
/**
* Moves cursor position without fetching row.
* @param int the 0-based cursor pos to seek to
@@ -380,7 +354,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
}
/**
* Frees the resources allocated for this result set.
* @return void
@@ -392,7 +365,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
}
/**
* Returns metadata for all columns in a result set.
* @return array
@@ -413,7 +385,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
}
/**
* Returns the result set resource.
* @return mixed
@@ -425,11 +396,9 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
}
/********************* IDibiReflector ****************d*g**/
/**
* Returns list of tables.
* @return array
@@ -451,7 +420,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
}
/**
* Returns metadata for all columns in a table.
* @param string
@@ -478,7 +446,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
}
/**
* Returns metadata for all indexes in a table.
* @param string
@@ -490,7 +457,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive
}
/**
* Returns metadata for all foreign keys in a table.
* @param string

41
dibi/drivers/oracle.php
View File

@@ -2,11 +2,7 @@
/**
* This file is part of the "dibi" - smart database abstraction layer.
*
* Copyright (c) 2005 David Grudl (http://davidgrudl.com)
*
* For the full copyright and license information, please view
* the file license.txt that was distributed with this source code.
*/
@@ -44,7 +40,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
private $fmtDate, $fmtDateTime;
/**
* @throws DibiNotSupportedException
*/
@@ -56,13 +51,12 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Connects to a database.
* @return void
* @throws DibiException
*/
public function connect(array &$config)
public function connect(array & $config)
{
$foo = & $config['charset'];
$this->fmtDate = isset($config['formatDate']) ? $config['formatDate'] : 'U';
@@ -81,7 +75,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Disconnects from a database.
* @return void
@@ -92,7 +85,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Executes the SQL query.
* @param string SQL statement.
@@ -118,7 +110,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
* @return int|FALSE number of rows or FALSE on error
@@ -129,7 +120,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
* @return int|FALSE int on success or FALSE on failure
@@ -141,7 +131,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Begins a transaction (if supported).
* @param string optional savepoint name
@@ -153,7 +142,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Commits statements in a transaction.
* @param string optional savepoint name
@@ -170,7 +158,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Rollback changes in a transaction.
* @param string optional savepoint name
@@ -187,7 +174,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Returns the connection resource.
* @return mixed
@@ -198,7 +184,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Returns the connection reflector.
* @return IDibiReflector
@@ -209,7 +194,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Result set driver factory.
* @param resource
@@ -223,11 +207,9 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/********************* SQL ****************d*g**/
/**
* Encodes data for use in a SQL statement.
* @param mixed value
@@ -261,7 +243,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Encodes string for use in a LIKE statement.
* @param string
@@ -276,7 +257,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Decodes data from result set.
* @param string value
@@ -293,15 +273,11 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Injects LIMIT/OFFSET to the SQL query.
* @param string &$sql The SQL query that will be modified.
* @param int $limit
* @param int $offset
* @return void
*/
public function applyLimit(&$sql, $limit, $offset)
public function applyLimit(& $sql, $limit, $offset)
{
if ($offset > 0) {
// see http://www.oracle.com/technology/oramag/oracle/06-sep/o56asktom.html
@@ -313,11 +289,9 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/********************* result set ****************d*g**/
/**
* Automatically frees the resources allocated for this result set.
* @return void
@@ -328,7 +302,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Returns the number of rows in a result set.
* @return int
@@ -339,7 +312,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Fetches the row at current position and moves the internal cursor to the next position.
* @param bool TRUE for associative array, FALSE for numeric
@@ -351,7 +323,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Moves cursor position without fetching row.
* @param int the 0-based cursor pos to seek to
@@ -363,7 +334,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Frees the resources allocated for this result set.
* @return void
@@ -375,7 +345,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Returns metadata for all columns in a result set.
* @return array
@@ -396,7 +365,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Returns the result set resource.
* @return mixed
@@ -408,11 +376,9 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/********************* IDibiReflector ****************d*g**/
/**
* Returns list of tables.
* @return array
@@ -433,7 +399,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Returns metadata for all columns in a table.
* @param string
@@ -445,7 +410,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Returns metadata for all indexes in a table.
* @param string
@@ -457,7 +421,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Returns metadata for all foreign keys in a table.
* @param string

47
dibi/drivers/pdo.php
View File

@@ -2,11 +2,7 @@
/**
* This file is part of the "dibi" - smart database abstraction layer.
*
* Copyright (c) 2005 David Grudl (http://davidgrudl.com)
*
* For the full copyright and license information, please view
* the file license.txt that was distributed with this source code.
*/
@@ -43,7 +39,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
private $driverName;
/**
* @throws DibiNotSupportedException
*/
@@ -55,13 +50,12 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
}
/**
* Connects to a database.
* @return void
* @throws DibiException
*/
public function connect(array &$config)
public function connect(array & $config)
{
$foo = & $config['dsn'];
$foo = & $config['options'];
@@ -85,7 +79,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
}
/**
* Disconnects from a database.
* @return void
@@ -96,7 +89,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
}
/**
* Executes the SQL query.
* @param string SQL statement.
@@ -131,7 +123,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
}
/**
* Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
* @return int|FALSE number of rows or FALSE on error
@@ -142,7 +133,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
}
/**
* Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
* @return int|FALSE int on success or FALSE on failure
@@ -153,7 +143,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
}
/**
* Begins a transaction (if supported).
* @param string optional savepoint name
@@ -169,7 +158,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
}
/**
* Commits statements in a transaction.
* @param string optional savepoint name
@@ -185,7 +173,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
}
/**
* Rollback changes in a transaction.
* @param string optional savepoint name
@@ -201,7 +188,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
}
/**
* Returns the connection resource.
* @return PDO
@@ -212,7 +198,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
}
/**
* Returns the connection reflector.
* @return IDibiReflector
@@ -233,7 +218,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
}
/**
* Result set driver factory.
* @param PDOStatement
@@ -247,11 +231,9 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
}
/********************* SQL ****************d*g**/
/**
* Encodes data for use in a SQL statement.
* @param mixed value
@@ -304,7 +286,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
}
/**
* Encodes string for use in a LIKE statement.
* @param string
@@ -317,7 +298,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
}
/**
* Decodes data from result set.
* @param string value
@@ -334,17 +314,15 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
}
/**
* Injects LIMIT/OFFSET to the SQL query.
* @param string &$sql The SQL query that will be modified.
* @param int $limit
* @param int $offset
* @return void
*/
public function applyLimit(&$sql, $limit, $offset)
public function applyLimit(& $sql, $limit, $offset)
{
if ($limit < 0 && $offset < 1) return;
if ($limit < 0 && $offset < 1) {
return;
}
switch ($this->driverName) {
case 'mysql':
@@ -353,8 +331,12 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
break;
case 'pgsql':
if ($limit >= 0) $sql .= ' LIMIT ' . (int) $limit;
if ($offset > 0) $sql .= ' OFFSET ' . (int) $offset;
if ($limit >= 0) {
$sql .= ' LIMIT ' . (int) $limit;
}
if ($offset > 0) {
$sql .= ' OFFSET ' . (int) $offset;
}
break;
case 'sqlite':
@@ -384,11 +366,9 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
}
/********************* result set ****************d*g**/
/**
* Returns the number of rows in a result set.
* @return int
@@ -399,7 +379,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
}
/**
* Fetches the row at current position and moves the internal cursor to the next position.
* @param bool TRUE for associative array, FALSE for numeric
@@ -411,7 +390,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
}
/**
* Moves cursor position without fetching row.
* @param int the 0-based cursor pos to seek to
@@ -423,7 +401,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
}
/**
* Frees the resources allocated for this result set.
* @return void
@@ -434,7 +411,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
}
/**
* Returns metadata for all columns in a result set.
* @return array
@@ -468,7 +444,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
}
/**
* Returns the result set resource.
* @return PDOStatement

56
dibi/drivers/postgre.php
View File

@@ -2,11 +2,7 @@
/**
* This file is part of the "dibi" - smart database abstraction layer.
*
* Copyright (c) 2005 David Grudl (http://davidgrudl.com)
*
* For the full copyright and license information, please view
* the file license.txt that was distributed with this source code.
*/
@@ -43,7 +39,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
private $escMethod = FALSE;
/**
* @throws DibiNotSupportedException
*/
@@ -55,13 +50,12 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Connects to a database.
* @return void
* @throws DibiException
*/
public function connect(array &$config)
public function connect(array & $config)
{
if (isset($config['resource'])) {
$this->connection = $config['resource'];
@@ -75,7 +69,9 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
DibiConnection::alias($config, 'user', 'username');
DibiConnection::alias($config, 'dbname', 'database');
foreach (array('host','hostaddr','port','dbname','user','password','connect_timeout','options','sslmode','service') as $key) {
if (isset($config[$key])) $string .= $key . '=' . $config[$key] . ' ';
if (isset($config[$key])) {
$string .= $key . '=' . $config[$key] . ' ';
}
}
}
@@ -110,7 +106,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Disconnects from a database.
* @return void
@@ -121,7 +116,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Executes the SQL query.
* @param string SQL statement.
@@ -145,7 +139,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
* @return int|FALSE number of rows or FALSE on error
@@ -156,7 +149,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
* @return int|FALSE int on success or FALSE on failure
@@ -170,14 +162,15 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
$res = $this->query("SELECT CURRVAL('$sequence')");
}
if (!$res) return FALSE;
if (!$res) {
return FALSE;
}
$row = $res->fetch(FALSE);
return is_array($row) ? $row[0] : FALSE;
}
/**
* Begins a transaction (if supported).
* @param string optional savepoint name
@@ -190,7 +183,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Commits statements in a transaction.
* @param string optional savepoint name
@@ -203,7 +195,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Rollback changes in a transaction.
* @param string optional savepoint name
@@ -216,7 +207,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Is in transaction?
* @return bool
@@ -227,7 +217,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Returns the connection resource.
* @return mixed
@@ -238,7 +227,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Returns the connection reflector.
* @return IDibiReflector
@@ -249,7 +237,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Result set driver factory.
* @param resource
@@ -263,11 +250,9 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/********************* SQL ****************d*g**/
/**
* Encodes data for use in a SQL statement.
* @param mixed value
@@ -317,7 +302,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Encodes string for use in a LIKE statement.
* @param string
@@ -337,7 +321,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Decodes data from result set.
* @param string value
@@ -354,29 +337,25 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Injects LIMIT/OFFSET to the SQL query.
* @param string &$sql The SQL query that will be modified.
* @param int $limit
* @param int $offset
* @return void
*/
public function applyLimit(&$sql, $limit, $offset)
public function applyLimit(& $sql, $limit, $offset)
{
if ($limit >= 0)
if ($limit >= 0) {
$sql .= ' LIMIT ' . (int) $limit;
}
if ($offset > 0)
if ($offset > 0) {
$sql .= ' OFFSET ' . (int) $offset;
}
}
/********************* result set ****************d*g**/
/**
* Automatically frees the resources allocated for this result set.
* @return void
@@ -387,7 +366,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Returns the number of rows in a result set.
* @return int
@@ -398,7 +376,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Fetches the row at current position and moves the internal cursor to the next position.
* @param bool TRUE for associative array, FALSE for numeric
@@ -410,7 +387,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Moves cursor position without fetching row.
* @param int the 0-based cursor pos to seek to
@@ -422,7 +398,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Frees the resources allocated for this result set.
* @return void
@@ -434,7 +409,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Returns metadata for all columns in a result set.
* @return array
@@ -457,7 +431,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Returns the result set resource.
* @return mixed
@@ -469,11 +442,9 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/********************* IDibiReflector ****************d*g**/
/**
* Returns list of tables.
* @return array
@@ -502,7 +473,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Returns metadata for all columns in a table.
* @param string
@@ -543,7 +513,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Returns metadata for all indexes in a table.
* @param string
@@ -585,7 +554,6 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Returns metadata for all foreign keys in a table.
* @param string

41
dibi/drivers/sqlite.php
View File

@@ -2,11 +2,7 @@
/**
* This file is part of the "dibi" - smart database abstraction layer.
*
* Copyright (c) 2005 David Grudl (http://davidgrudl.com)
*
* For the full copyright and license information, please view
* the file license.txt that was distributed with this source code.
*/
@@ -48,7 +44,6 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
private $dbcharset, $charset;
/**
* @throws DibiNotSupportedException
*/
@@ -60,13 +55,12 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Connects to a database.
* @return void
* @throws DibiException
*/
public function connect(array &$config)
public function connect(array & $config)
{
DibiConnection::alias($config, 'database', 'file');
$this->fmtDate = isset($config['formatDate']) ? $config['formatDate'] : 'U';
@@ -95,7 +89,6 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Disconnects from a database.
* @return void
@@ -106,7 +99,6 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Executes the SQL query.
* @param string SQL statement.
@@ -134,7 +126,6 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
* @return int|FALSE number of rows or FALSE on error
@@ -145,7 +136,6 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
* @return int|FALSE int on success or FALSE on failure
@@ -156,7 +146,6 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Begins a transaction (if supported).
* @param string optional savepoint name
@@ -169,7 +158,6 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Commits statements in a transaction.
* @param string optional savepoint name
@@ -182,7 +170,6 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Rollback changes in a transaction.
* @param string optional savepoint name
@@ -195,7 +182,6 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Returns the connection resource.
* @return mixed
@@ -206,7 +192,6 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Returns the connection reflector.
* @return IDibiReflector
@@ -217,7 +202,6 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Result set driver factory.
* @param resource
@@ -231,11 +215,9 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/********************* SQL ****************d*g**/
/**
* Encodes data for use in a SQL statement.
* @param mixed value
@@ -268,7 +250,6 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Encodes string for use in a LIKE statement.
* @param string
@@ -281,7 +262,6 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Decodes data from result set.
* @param string value
@@ -298,26 +278,21 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Injects LIMIT/OFFSET to the SQL query.
* @param string &$sql The SQL query that will be modified.
* @param int $limit
* @param int $offset
* @return void
*/
public function applyLimit(&$sql, $limit, $offset)
public function applyLimit(& $sql, $limit, $offset)
{
if ($limit < 0 && $offset < 1) return;
if ($limit >= 0 || $offset > 0) {
$sql .= ' LIMIT ' . $limit . ($offset > 0 ? ' OFFSET ' . (int) $offset : '');
}
}
/********************* result set ****************d*g**/
/**
* Returns the number of rows in a result set.
* @return int
@@ -331,7 +306,6 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Fetches the row at current position and moves the internal cursor to the next position.
* @param bool TRUE for associative array, FALSE for numeric
@@ -355,7 +329,6 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Moves cursor position without fetching row.
* @param int the 0-based cursor pos to seek to
@@ -371,7 +344,6 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Frees the resources allocated for this result set.
* @return void
@@ -382,7 +354,6 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Returns metadata for all columns in a result set.
* @return array
@@ -405,7 +376,6 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Returns the result set resource.
* @return mixed
@@ -416,11 +386,9 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/********************* user defined functions ****************d*g**/
/**
* Registers an user defined function for use in SQL statements.
* @param string function name
@@ -434,7 +402,6 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri
}
/**
* Registers an aggregating user defined function for use in SQL statements.
* @param string function name

9
dibi/drivers/sqlite.reflector.php
View File

@@ -2,11 +2,7 @@
/**
* This file is part of the "dibi" - smart database abstraction layer.
*
* Copyright (c) 2005 David Grudl (http://davidgrudl.com)
*
* For the full copyright and license information, please view
* the file license.txt that was distributed with this source code.
*/
@@ -23,14 +19,12 @@ class DibiSqliteReflector extends DibiObject implements IDibiReflector
private $driver;
public function __construct(IDibiDriver $driver)
{
$this->driver = $driver;
}
/**
* Returns list of tables.
* @return array
@@ -51,7 +45,6 @@ class DibiSqliteReflector extends DibiObject implements IDibiReflector
}
/**
* Returns metadata for all columns in a table.
* @param string
@@ -87,7 +80,6 @@ class DibiSqliteReflector extends DibiObject implements IDibiReflector
}
/**
* Returns metadata for all indexes in a table.
* @param string
@@ -139,7 +131,6 @@ class DibiSqliteReflector extends DibiObject implements IDibiReflector
}
/**
* Returns metadata for all foreign keys in a table.
* @param string

42
dibi/drivers/sqlite3.php
View File

@@ -2,11 +2,7 @@
/**
* This file is part of the "dibi" - smart database abstraction layer.
*
* Copyright (c) 2005 David Grudl (http://davidgrudl.com)
*
* For the full copyright and license information, please view
* the file license.txt that was distributed with this source code.
*/
@@ -46,7 +42,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
private $dbcharset, $charset;
/**
* @throws DibiNotSupportedException
*/
@@ -58,13 +53,12 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Connects to a database.
* @return void
* @throws DibiException
*/
public function connect(array &$config)
public function connect(array & $config)
{
DibiConnection::alias($config, 'database', 'file');
$this->fmtDate = isset($config['formatDate']) ? $config['formatDate'] : 'U';
@@ -93,7 +87,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Disconnects from a database.
* @return void
@@ -104,7 +97,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Executes the SQL query.
* @param string SQL statement.
@@ -127,7 +119,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
* @return int|FALSE number of rows or FALSE on error
@@ -138,7 +129,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
* @return int|FALSE int on success or FALSE on failure
@@ -149,7 +139,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Begins a transaction (if supported).
* @param string optional savepoint name
@@ -162,7 +151,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Commits statements in a transaction.
* @param string optional savepoint name
@@ -175,7 +163,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Rollback changes in a transaction.
* @param string optional savepoint name
@@ -188,7 +175,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Returns the connection resource.
* @return mixed
@@ -199,7 +185,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Returns the connection reflector.
* @return IDibiReflector
@@ -210,7 +195,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Result set driver factory.
* @param SQLite3Result
@@ -224,11 +208,9 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/********************* SQL ****************d*g**/
/**
* Encodes data for use in a SQL statement.
* @param mixed value
@@ -263,7 +245,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Encodes string for use in a LIKE statement.
* @param string
@@ -277,7 +258,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Decodes data from result set.
* @param string value
@@ -294,26 +274,21 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Injects LIMIT/OFFSET to the SQL query.
* @param string &$sql The SQL query that will be modified.
* @param int $limit
* @param int $offset
* @return void
*/
public function applyLimit(&$sql, $limit, $offset)
public function applyLimit(& $sql, $limit, $offset)
{
if ($limit < 0 && $offset < 1) return;
if ($limit >= 0 || $offset > 0) {
$sql .= ' LIMIT ' . $limit . ($offset > 0 ? ' OFFSET ' . (int) $offset : '');
}
}
/********************* result set ****************d*g**/
/**
* Automatically frees the resources allocated for this result set.
* @return void
@@ -324,7 +299,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Returns the number of rows in a result set.
* @return int
@@ -336,7 +310,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Fetches the row at current position and moves the internal cursor to the next position.
* @param bool TRUE for associative array, FALSE for numeric
@@ -360,7 +333,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Moves cursor position without fetching row.
* @param int the 0-based cursor pos to seek to
@@ -373,7 +345,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Frees the resources allocated for this result set.
* @return void
@@ -385,7 +356,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Returns metadata for all columns in a result set.
* @return array
@@ -407,7 +377,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Returns the result set resource.
* @return mixed
@@ -419,11 +388,9 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/********************* user defined functions ****************d*g**/
/**
* Registers an user defined function for use in SQL statements.
* @param string function name
@@ -437,7 +404,6 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr
}
/**
* Registers an aggregating user defined function for use in SQL statements.
* @param string function name

63
dibi/libs/DibiConnection.php
View File

@@ -2,15 +2,10 @@
/**
* This file is part of the "dibi" - smart database abstraction layer.
*
* Copyright (c) 2005 David Grudl (http://davidgrudl.com)
*
* For the full copyright and license information, please view
* the file license.txt that was distributed with this source code.
*/
/**
* dibi connection.
*
@@ -45,7 +40,6 @@ class DibiConnection extends DibiObject
private $substitutes;
/**
* Connection options: (see driver-specific options too)
* - lazy (bool) => if TRUE, connection will be established only when required
@@ -139,7 +133,6 @@ class DibiConnection extends DibiObject
}
/**
* Automatically frees the resources allocated for this result set.
* @return void
@@ -151,7 +144,6 @@ class DibiConnection extends DibiObject
}
/**
* Connects to a database.
* @return void
@@ -171,7 +163,6 @@ class DibiConnection extends DibiObject
}
/**
* Disconnects from a database.
* @return void
@@ -183,7 +174,6 @@ class DibiConnection extends DibiObject
}
/**
* Returns TRUE when connection was established.
* @return bool
@@ -194,7 +184,6 @@ class DibiConnection extends DibiObject
}
/**
* Returns configuration variable. If no $key is passed, returns the entire array.
* @see self::__construct
@@ -216,7 +205,6 @@ class DibiConnection extends DibiObject
}
/**
* Apply configuration alias or default values.
* @param array connect configuration
@@ -224,10 +212,12 @@ class DibiConnection extends DibiObject
* @param string alias key
* @return void
*/
public static function alias(&$config, $key, $alias)
public static function alias(& $config, $key, $alias)
{
$foo = & $config;
foreach (explode('|', $key) as $key) $foo = & $foo[$key];
foreach (explode('|', $key) as $key) {
$foo = & $foo[$key];
}
if (!isset($foo) && isset($config[$alias])) {
$foo = $config[$alias];
@@ -236,7 +226,6 @@ class DibiConnection extends DibiObject
}
/**
* Returns the driver and connects to a database in lazy mode.
* @return IDibiDriver
@@ -248,7 +237,6 @@ class DibiConnection extends DibiObject
}
/**
* Generates (translates) and executes SQL query.
* @param array|mixed one or more arguments
@@ -262,7 +250,6 @@ class DibiConnection extends DibiObject
}
/**
* Generates SQL query.
* @param array|mixed one or more arguments
@@ -276,7 +263,6 @@ class DibiConnection extends DibiObject
}
/**
* Generates and prints SQL query.
* @param array|mixed one or more arguments
@@ -300,7 +286,6 @@ class DibiConnection extends DibiObject
}
/**
* Generates (translates) and returns SQL query as DibiDataSource.
* @param array|mixed one or more arguments
@@ -314,7 +299,6 @@ class DibiConnection extends DibiObject
}
/**
* Generates SQL query.
* @param array
@@ -327,7 +311,6 @@ class DibiConnection extends DibiObject
}
/**
* Executes the SQL query.
* @param string SQL statement.
@@ -359,7 +342,6 @@ class DibiConnection extends DibiObject
}
/**
* Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
* @return int number of rows
@@ -369,12 +351,13 @@ class DibiConnection extends DibiObject
{
$this->connected || $this->connect();
$rows = $this->driver->getAffectedRows();
if (!is_int($rows) || $rows < 0) throw new DibiException('Cannot retrieve number of affected rows.');
if (!is_int($rows) || $rows < 0) {
throw new DibiException('Cannot retrieve number of affected rows.');
}
return $rows;
}
/**
* Gets the number of affected rows. Alias for getAffectedRows().
* @return int number of rows
@@ -386,7 +369,6 @@ class DibiConnection extends DibiObject
}
/**
* Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
* @param string optional sequence name
@@ -397,12 +379,13 @@ class DibiConnection extends DibiObject
{
$this->connected || $this->connect();
$id = $this->driver->getInsertId($sequence);
if ($id < 1) throw new DibiException('Cannot retrieve last generated ID.');
if ($id < 1) {
throw new DibiException('Cannot retrieve last generated ID.');
}
return (int) $id;
}
/**
* Retrieves the ID generated for an AUTO_INCREMENT column. Alias for getInsertId().
* @param string optional sequence name
@@ -415,7 +398,6 @@ class DibiConnection extends DibiObject
}
/**
* Begins a transaction (if supported).
* @param string optional savepoint name
@@ -436,7 +418,6 @@ class DibiConnection extends DibiObject
}
/**
* Commits statements in a transaction.
* @param string optional savepoint name
@@ -457,7 +438,6 @@ class DibiConnection extends DibiObject
}
/**
* Rollback changes in a transaction.
* @param string optional savepoint name
@@ -478,7 +458,6 @@ class DibiConnection extends DibiObject
}
/**
* Result set factory.
* @param IDibiResultDriver
@@ -492,11 +471,9 @@ class DibiConnection extends DibiObject
}
/********************* fluent SQL builders ****************d*g**/
/**
* @return DibiFluent
*/
@@ -506,7 +483,6 @@ class DibiConnection extends DibiObject
}
/**
* @param string column name
* @return DibiFluent
@@ -518,7 +494,6 @@ class DibiConnection extends DibiObject
}
/**
* @param string table
* @param array
@@ -533,7 +508,6 @@ class DibiConnection extends DibiObject
}
/**
* @param string table
* @param array
@@ -551,7 +525,6 @@ class DibiConnection extends DibiObject
}
/**
* @param string table
* @return DibiFluent
@@ -562,11 +535,9 @@ class DibiConnection extends DibiObject
}
/********************* substitutions ****************d*g**/
/**
* Returns substitution hashmap.
* @return DibiHashMap
@@ -577,7 +548,6 @@ class DibiConnection extends DibiObject
}
/**
* Provides substitution.
* @return string
@@ -588,7 +558,6 @@ class DibiConnection extends DibiObject
}
/**
* Substitution callback.
*/
@@ -598,11 +567,9 @@ class DibiConnection extends DibiObject
}
/********************* shortcuts ****************d*g**/
/**
* Executes SQL query and fetch result - shortcut for query() & fetch().
* @param array|mixed one or more arguments
@@ -616,11 +583,10 @@ class DibiConnection extends DibiObject
}
/**
* Executes SQL query and fetch results - shortcut for query() & fetchAll().
* @param array|mixed one or more arguments
* @return array of DibiRow
* @return DibiRow[]
* @throws DibiException
*/
public function fetchAll($args)
@@ -630,7 +596,6 @@ class DibiConnection extends DibiObject
}
/**
* Executes SQL query and fetch first column - shortcut for query() & fetchSingle().
* @param array|mixed one or more arguments
@@ -644,7 +609,6 @@ class DibiConnection extends DibiObject
}
/**
* Executes SQL query and fetch pairs - shortcut for query() & fetchPairs().
* @param array|mixed one or more arguments
@@ -658,11 +622,9 @@ class DibiConnection extends DibiObject
}
/********************* misc ****************d*g**/
/**
* Import SQL dump from file - extreme fast!
* @param string filename
@@ -698,7 +660,6 @@ class DibiConnection extends DibiObject
}
/**
* Gets a information about the current database.
* @return DibiDatabaseInfo
@@ -710,7 +671,6 @@ class DibiConnection extends DibiObject
}
/**
* Prevents unserialization.
*/
@@ -720,7 +680,6 @@ class DibiConnection extends DibiObject
}
/**
* Prevents serialization.
*/

35
dibi/libs/DibiDataSource.php
View File

@@ -2,15 +2,10 @@
/**
* This file is part of the "dibi" - smart database abstraction layer.
*
* Copyright (c) 2005 David Grudl (http://davidgrudl.com)
*
* For the full copyright and license information, please view
* the file license.txt that was distributed with this source code.
*/
/**
* Default implementation of IDataSource for dibi.
*
@@ -55,7 +50,6 @@ class DibiDataSource extends DibiObject implements IDataSource
private $limit;
/**
* @param string SQL command or table or view name, as data source
* @param DibiConnection connection
@@ -71,12 +65,11 @@ class DibiDataSource extends DibiObject implements IDataSource
}
/**
* Selects columns to query.
* @param string|array column name or array of column names
* @param string column alias
* @return DibiDataSource provides a fluent interface
* @return self
*/
public function select($col, $as = NULL)
{
@@ -90,11 +83,10 @@ class DibiDataSource extends DibiObject implements IDataSource
}
/**
* Adds conditions to query.
* @param mixed conditions
* @return DibiDataSource provides a fluent interface
* @return self
*/
public function where($cond)
{
@@ -109,12 +101,11 @@ class DibiDataSource extends DibiObject implements IDataSource
}
/**
* Selects columns to order by.
* @param string|array column name or array of column names
* @param string sorting direction
* @return DibiDataSource provides a fluent interface
* @return self
*/
public function orderBy($row, $sorting = 'ASC')
{
@@ -128,12 +119,11 @@ class DibiDataSource extends DibiObject implements IDataSource
}
/**
* Limits number of rows.
* @param int limit
* @param int offset
* @return DibiDataSource provides a fluent interface
* @return self
*/
public function applyLimit($limit, $offset = NULL)
{
@@ -144,7 +134,6 @@ class DibiDataSource extends DibiObject implements IDataSource
}
/**
* Returns the dibi connection.
* @return DibiConnection
@@ -155,11 +144,9 @@ class DibiDataSource extends DibiObject implements IDataSource
}
/********************* executing ****************d*g**/
/**
* Returns (and queries) DibiResult.
* @return DibiResult
@@ -173,7 +160,6 @@ class DibiDataSource extends DibiObject implements IDataSource
}
/**
* @return DibiResultIterator
*/
@@ -183,7 +169,6 @@ class DibiDataSource extends DibiObject implements IDataSource
}
/**
* Generates, executes SQL query and fetches the single row.
* @return DibiRow|FALSE array on success, FALSE if no next record
@@ -194,7 +179,6 @@ class DibiDataSource extends DibiObject implements IDataSource
}
/**
* Like fetch(), but returns only first field.
* @return mixed value on success, FALSE if no next record
@@ -205,7 +189,6 @@ class DibiDataSource extends DibiObject implements IDataSource
}
/**
* Fetches all records from table.
* @return array
@@ -216,7 +199,6 @@ class DibiDataSource extends DibiObject implements IDataSource
}
/**
* Fetches all records from table and returns associative tree.
* @param string associative descriptor
@@ -228,7 +210,6 @@ class DibiDataSource extends DibiObject implements IDataSource
}
/**
* Fetches all records from table like $key => $value pairs.
* @param string associative key
@@ -241,7 +222,6 @@ class DibiDataSource extends DibiObject implements IDataSource
}
/**
* Discards the internal cache.
* @return void
@@ -252,11 +232,9 @@ class DibiDataSource extends DibiObject implements IDataSource
}
/********************* exporting ****************d*g**/
/**
* Returns this data source wrapped in DibiFluent object.
* @return DibiFluent
@@ -267,7 +245,6 @@ class DibiDataSource extends DibiObject implements IDataSource
}
/**
* Returns this data source wrapped in DibiDataSource object.
* @return DibiDataSource
@@ -278,7 +255,6 @@ class DibiDataSource extends DibiObject implements IDataSource
}
/**
* Returns SQL query.
* @return string
@@ -299,11 +275,9 @@ FROM %SQL', $this->sql, '
}
/********************* counting ****************d*g**/
/**
* Returns the number of rows in a given data source.
* @return int
@@ -321,7 +295,6 @@ FROM %SQL', $this->sql, '
}
/**
* Returns the number of rows in a given data source.
* @return int

80
dibi/libs/DibiDatabaseInfo.php
View File

@@ -2,15 +2,10 @@
/**
* This file is part of the "dibi" - smart database abstraction layer.
*
* Copyright (c) 2005 David Grudl (http://davidgrudl.com)
*
* For the full copyright and license information, please view
* the file license.txt that was distributed with this source code.
*/
/**
* Reflection metadata class for a database.
*
@@ -33,7 +28,6 @@ class DibiDatabaseInfo extends DibiObject
private $tables;
public function __construct(IDibiReflector $reflector, $name)
{
$this->reflector = $reflector;
@@ -41,7 +35,6 @@ class DibiDatabaseInfo extends DibiObject
}
/**
* @return string
*/
@@ -51,9 +44,8 @@ class DibiDatabaseInfo extends DibiObject
}
/**
* @return array of DibiTableInfo
* @return DibiTableInfo[]
*/
public function getTables()
{
@@ -62,9 +54,8 @@ class DibiDatabaseInfo extends DibiObject
}
/**
* @return array of string
* @return string[]
*/
public function getTableNames()
{
@@ -77,7 +68,6 @@ class DibiDatabaseInfo extends DibiObject
}
/**
* @param string
* @return DibiTableInfo
@@ -95,7 +85,6 @@ class DibiDatabaseInfo extends DibiObject
}
/**
* @param string
* @return bool
@@ -107,7 +96,6 @@ class DibiDatabaseInfo extends DibiObject
}
/**
* @return void
*/
@@ -124,8 +112,6 @@ class DibiDatabaseInfo extends DibiObject
}
/**
* Reflection metadata class for a database table.
*
@@ -164,7 +150,6 @@ class DibiTableInfo extends DibiObject
private $primaryKey;
public function __construct(IDibiReflector $reflector, array $info)
{
$this->reflector = $reflector;
@@ -173,7 +158,6 @@ class DibiTableInfo extends DibiObject
}
/**
* @return string
*/
@@ -183,7 +167,6 @@ class DibiTableInfo extends DibiObject
}
/**
* @return bool
*/
@@ -193,9 +176,8 @@ class DibiTableInfo extends DibiObject
}
/**
* @return array of DibiColumnInfo
* @return DibiColumnInfo[]
*/
public function getColumns()
{
@@ -204,9 +186,8 @@ class DibiTableInfo extends DibiObject
}
/**
* @return array of string
* @return string[]
*/
public function getColumnNames()
{
@@ -219,7 +200,6 @@ class DibiTableInfo extends DibiObject
}
/**
* @param string
* @return DibiColumnInfo
@@ -237,7 +217,6 @@ class DibiTableInfo extends DibiObject
}
/**
* @param string
* @return bool
@@ -249,9 +228,8 @@ class DibiTableInfo extends DibiObject
}
/**
* @return array of DibiForeignKeyInfo
* @return DibiForeignKeyInfo[]
*/
public function getForeignKeys()
{
@@ -260,9 +238,8 @@ class DibiTableInfo extends DibiObject
}
/**
* @return array of DibiIndexInfo
* @return DibiIndexInfo[]
*/
public function getIndexes()
{
@@ -271,7 +248,6 @@ class DibiTableInfo extends DibiObject
}
/**
* @return DibiIndexInfo
*/
@@ -282,7 +258,6 @@ class DibiTableInfo extends DibiObject
}
/**
* @return void
*/
@@ -297,7 +272,6 @@ class DibiTableInfo extends DibiObject
}
/**
* @return void
*/
@@ -319,7 +293,6 @@ class DibiTableInfo extends DibiObject
}
/**
* @return void
*/
@@ -331,8 +304,6 @@ class DibiTableInfo extends DibiObject
}
/**
* Reflection metadata class for a result set.
*
@@ -354,16 +325,14 @@ class DibiResultInfo extends DibiObject
private $names;
public function __construct(IDibiResultDriver $driver)
{
$this->driver = $driver;
}
/**
* @return array of DibiColumnInfo
* @return DibiColumnInfo[]
*/
public function getColumns()
{
@@ -372,10 +341,9 @@ class DibiResultInfo extends DibiObject
}
/**
* @param bool
* @return array of string
* @return string[]
*/
public function getColumnNames($fullNames = FALSE)
{
@@ -388,7 +356,6 @@ class DibiResultInfo extends DibiObject
}
/**
* @param string
* @return DibiColumnInfo
@@ -406,7 +373,6 @@ class DibiResultInfo extends DibiObject
}
/**
* @param string
* @return bool
@@ -418,7 +384,6 @@ class DibiResultInfo extends DibiObject
}
/**
* @return void
*/
@@ -436,8 +401,6 @@ class DibiResultInfo extends DibiObject
}
/**
* Reflection metadata class for a table or result set column.
*
@@ -467,7 +430,6 @@ class DibiColumnInfo extends DibiObject
private $info;
public function __construct(IDibiReflector $reflector = NULL, array $info)
{
$this->reflector = $reflector;
@@ -475,7 +437,6 @@ class DibiColumnInfo extends DibiObject
}
/**
* @return string
*/
@@ -485,7 +446,6 @@ class DibiColumnInfo extends DibiObject
}
/**
* @return string
*/
@@ -495,7 +455,6 @@ class DibiColumnInfo extends DibiObject
}
/**
* @return bool
*/
@@ -505,7 +464,6 @@ class DibiColumnInfo extends DibiObject
}
/**
* @return DibiTableInfo
*/
@@ -518,7 +476,6 @@ class DibiColumnInfo extends DibiObject
}
/**
* @return string
*/
@@ -528,7 +485,6 @@ class DibiColumnInfo extends DibiObject
}
/**
* @return string
*/
@@ -538,7 +494,6 @@ class DibiColumnInfo extends DibiObject
}
/**
* @return mixed
*/
@@ -548,7 +503,6 @@ class DibiColumnInfo extends DibiObject
}
/**
* @return int
*/
@@ -558,7 +512,6 @@ class DibiColumnInfo extends DibiObject
}
/**
* @return bool
*/
@@ -568,7 +521,6 @@ class DibiColumnInfo extends DibiObject
}
/**
* @return bool
*/
@@ -578,7 +530,6 @@ class DibiColumnInfo extends DibiObject
}
/**
* @return bool
*/
@@ -588,7 +539,6 @@ class DibiColumnInfo extends DibiObject
}
/**
* @return mixed
*/
@@ -598,7 +548,6 @@ class DibiColumnInfo extends DibiObject
}
/**
* @param string
* @return mixed
@@ -609,7 +558,6 @@ class DibiColumnInfo extends DibiObject
}
/**
* Heuristic type detection.
* @param string
@@ -639,7 +587,6 @@ class DibiColumnInfo extends DibiObject
}
/**
* @internal
*/
@@ -654,8 +601,6 @@ class DibiColumnInfo extends DibiObject
}
/**
* Reflection metadata class for a foreign key.
*
@@ -675,7 +620,6 @@ class DibiForeignKeyInfo extends DibiObject
private $references;
public function __construct($name, array $references)
{
$this->name = $name;
@@ -683,7 +627,6 @@ class DibiForeignKeyInfo extends DibiObject
}
/**
* @return string
*/
@@ -693,7 +636,6 @@ class DibiForeignKeyInfo extends DibiObject
}
/**
* @return array
*/
@@ -705,8 +647,6 @@ class DibiForeignKeyInfo extends DibiObject
}
/**
* Reflection metadata class for a index or primary key.
*
@@ -730,7 +670,6 @@ class DibiIndexInfo extends DibiObject
}
/**
* @return string
*/
@@ -740,7 +679,6 @@ class DibiIndexInfo extends DibiObject
}
/**
* @return array
*/
@@ -750,7 +688,6 @@ class DibiIndexInfo extends DibiObject
}
/**
* @return bool
*/
@@ -760,7 +697,6 @@ class DibiIndexInfo extends DibiObject
}
/**
* @return bool
*/

12
dibi/libs/DibiDateTime.php
View File

@@ -2,15 +2,10 @@
/**
* This file is part of the "dibi" - smart database abstraction layer.
*
* Copyright (c) 2005 David Grudl (http://davidgrudl.com)
*
* For the full copyright and license information, please view
* the file license.txt that was distributed with this source code.
*/
/**
* DateTime with serialization and timestamp support for PHP 5.2.
*
@@ -33,7 +28,6 @@ class DibiDateTime extends DateTime
}
public function modifyClone($modify = '')
{
$dolly = clone($this);
@@ -41,7 +35,6 @@ class DibiDateTime extends DateTime
}
public function modify($modify)
{
parent::modify($modify);
@@ -49,7 +42,6 @@ class DibiDateTime extends DateTime
}
public function __sleep()
{
$this->fix = array($this->format('Y-m-d H:i:s'), $this->getTimezone()->getName());
@@ -57,7 +49,6 @@ class DibiDateTime extends DateTime
}
public function __wakeup()
{
$this->__construct($this->fix[0], new DateTimeZone($this->fix[1]));
@@ -65,21 +56,18 @@ class DibiDateTime extends DateTime
}
public function getTimestamp()
{
return (int) $this->format('U');
}
public function setTimestamp($timestamp)
{
return $this->__construct(date('Y-m-d H:i:s', $timestamp), new DateTimeZone($this->getTimezone()->getName())); // getTimeZone() crashes in PHP 5.2.6
}
public function __toString()
{
return $this->format('Y-m-d H:i:s');

7
dibi/libs/DibiEvent.php
View File

@@ -2,15 +2,10 @@
/**
* This file is part of the "dibi" - smart database abstraction layer.
*
* Copyright (c) 2005 David Grudl (http://davidgrudl.com)
*
* For the full copyright and license information, please view
* the file license.txt that was distributed with this source code.
*/
/**
* Profiler & logger event.
*
@@ -54,7 +49,6 @@ class DibiEvent
public $source;
public function __construct(DibiConnection $connection, $type, $sql = NULL)
{
$this->connection = $connection;
@@ -85,7 +79,6 @@ class DibiEvent
}
public function done($result = NULL)
{
$this->result = $result;

17
dibi/libs/DibiException.php
View File

@@ -2,15 +2,10 @@
/**
* This file is part of the "dibi" - smart database abstraction layer.
*
* Copyright (c) 2005 David Grudl (http://davidgrudl.com)
*
* For the full copyright and license information, please view
* the file license.txt that was distributed with this source code.
*/
/**
* dibi common exception.
*
@@ -36,7 +31,6 @@ class DibiException extends Exception
}
/**
* @return string The SQL passed to the constructor
*/
@@ -46,7 +40,6 @@ class DibiException extends Exception
}
/**
* @return string string represenation of exception with SQL command
*/
@@ -58,8 +51,6 @@ class DibiException extends Exception
}
/**
* database server exception.
*
@@ -72,12 +63,10 @@ class DibiDriverException extends DibiException
/********************* error catching ****************d*g**/
/** @var string */
private static $errorMsg;
/**
* Starts catching potential errors/warnings.
* @return void
@@ -89,7 +78,6 @@ class DibiDriverException extends DibiException
}
/**
* Returns catched error/warning message.
* @param string catched message
@@ -104,7 +92,6 @@ class DibiDriverException extends DibiException
}
/**
* Internal error handler. Do not call directly.
* @internal
@@ -124,8 +111,6 @@ class DibiDriverException extends DibiException
}
/**
* PCRE exception.
*
@@ -149,7 +134,6 @@ class DibiPcreException extends Exception {
}
/**
* @package dibi
*/
@@ -157,7 +141,6 @@ class DibiNotImplementedException extends DibiException
{}
/**
* @package dibi
*/

13
dibi/libs/DibiFileLogger.php
View File

@@ -2,15 +2,10 @@
/**
* This file is part of the "dibi" - smart database abstraction layer.
*
* Copyright (c) 2005 David Grudl (http://davidgrudl.com)
*
* For the full copyright and license information, please view
* the file license.txt that was distributed with this source code.
*/
/**
* dibi file logger.
*
@@ -26,7 +21,6 @@ class DibiFileLogger extends DibiObject
public $filter;
public function __construct($file, $filter = NULL)
{
$this->file = $file;
@@ -34,7 +28,6 @@ class DibiFileLogger extends DibiObject
}
/**
* After event notification.
* @return void
@@ -46,7 +39,9 @@ class DibiFileLogger extends DibiObject
}
$handle = fopen($this->file, 'a');
if (!$handle) return; // or throw exception?
if (!$handle) {
return; // or throw exception?
}
flock($handle, LOCK_EX);
if ($event->result instanceof Exception) {
@@ -65,7 +60,7 @@ class DibiFileLogger extends DibiObject
fwrite($handle,
"OK: " . $event->sql
. ($event->count ? ";\n-- rows: " . $event->count : '')
. "\n-- takes: " . sprintf('%0.3f', $event->time * 1000) . ' ms'
. "\n-- takes: " . sprintf('%0.3f ms', $event->time * 1000)
. "\n-- source: " . implode(':', $event->source)
. "\n-- driver: " . $event->connection->getConfig('driver') . '/' . $event->connection->getConfig('name')
. "\n-- " . date('Y-m-d H:i:s')

8
dibi/libs/DibiFirePhpLogger.php
View File

@@ -2,15 +2,10 @@
/**
* This file is part of the "dibi" - smart database abstraction layer.
*
* Copyright (c) 2005 David Grudl (http://davidgrudl.com)
*
* For the full copyright and license information, please view
* the file license.txt that was distributed with this source code.
*/
/**
* dibi FirePHP logger.
*
@@ -38,7 +33,6 @@ class DibiFirePhpLogger extends DibiObject
private static $fireTable = array(array('Time', 'SQL Statement', 'Rows', 'Connection'));
/**
* @return bool
*/
@@ -48,14 +42,12 @@ class DibiFirePhpLogger extends DibiObject
}
public function __construct($filter = NULL)
{
$this->filter = $filter ? (int) $filter : DibiEvent::QUERY;
}
/**
* After event notification.
* @return void

45
dibi/libs/DibiFluent.php
View File

@@ -2,15 +2,10 @@
/**
* This file is part of the "dibi" - smart database abstraction layer.
*
* Copyright (c) 2005 David Grudl (http://davidgrudl.com)
*
* For the full copyright and license information, please view
* the file license.txt that was distributed with this source code.
*/
/**
* dibi SQL builder via fluent interfaces. EXPERIMENTAL!
*
@@ -101,7 +96,6 @@ class DibiFluent extends DibiObject implements IDataSource
private static $normalizer;
/**
* @param DibiConnection
*/
@@ -115,12 +109,11 @@ class DibiFluent extends DibiObject implements IDataSource
}
/**
* Appends new argument to the clause.
* @param string clause name
* @param array arguments
* @return DibiFluent provides a fluent interface
* @return self
*/
public function __call($clause, $args)
{
@@ -205,11 +198,10 @@ class DibiFluent extends DibiObject implements IDataSource
}
/**
* Switch to a clause.
* @param string clause name
* @return DibiFluent provides a fluent interface
* @return self
*/
public function clause($clause, $remove = FALSE)
{
@@ -227,11 +219,10 @@ class DibiFluent extends DibiObject implements IDataSource
}
/**
* Removes a clause.
* @param string clause name
* @return DibiFluent provides a fluent interface
* @return self
*/
public function removeClause($clause)
{
@@ -240,12 +231,11 @@ class DibiFluent extends DibiObject implements IDataSource
}
/**
* Change a SQL flag.
* @param string flag name
* @param bool value
* @return DibiFluent provides a fluent interface
* @return self
*/
public function setFlag($flag, $value = TRUE)
{
@@ -259,7 +249,6 @@ class DibiFluent extends DibiObject implements IDataSource
}
/**
* Is a flag set?
* @param string flag name
@@ -271,7 +260,6 @@ class DibiFluent extends DibiObject implements IDataSource
}
/**
* Returns SQL command.
* @return string
@@ -282,7 +270,6 @@ class DibiFluent extends DibiObject implements IDataSource
}
/**
* Returns the dibi connection.
* @return DibiConnection
@@ -293,12 +280,11 @@ class DibiFluent extends DibiObject implements IDataSource
}
/**
* Adds DibiResult setup.
* @param string method
* @param mixed args
* @return DibiFluent provides a fluent interface
* @return self
*/
public function setupResult($method)
{
@@ -307,11 +293,9 @@ class DibiFluent extends DibiObject implements IDataSource
}
/********************* executing ****************d*g**/
/**
* Generates and executes SQL query.
* @param mixed what to return?
@@ -325,7 +309,6 @@ class DibiFluent extends DibiObject implements IDataSource
}
/**
* Generates, executes SQL query and fetches the single row.
* @return DibiRow|FALSE array on success, FALSE if no next record
@@ -340,7 +323,6 @@ class DibiFluent extends DibiObject implements IDataSource
}
/**
* Like fetch(), but returns only first field.
* @return mixed value on success, FALSE if no next record
@@ -355,7 +337,6 @@ class DibiFluent extends DibiObject implements IDataSource
}
/**
* Fetches all records from table.
* @param int offset
@@ -368,7 +349,6 @@ class DibiFluent extends DibiObject implements IDataSource
}
/**
* Fetches all records from table and returns associative tree.
* @param string associative descriptor
@@ -380,7 +360,6 @@ class DibiFluent extends DibiObject implements IDataSource
}
/**
* Fetches all records from table like $key => $value pairs.
* @param string associative key
@@ -393,7 +372,6 @@ class DibiFluent extends DibiObject implements IDataSource
}
/**
* Required by the IteratorAggregate interface.
* @param int offset
@@ -406,7 +384,6 @@ class DibiFluent extends DibiObject implements IDataSource
}
/**
* Generates and prints SQL query or it's part.
* @param string clause name
@@ -418,7 +395,6 @@ class DibiFluent extends DibiObject implements IDataSource
}
/**
* @return int
*/
@@ -430,7 +406,6 @@ class DibiFluent extends DibiObject implements IDataSource
}
/**
* @return DibiResult
*/
@@ -444,11 +419,9 @@ class DibiFluent extends DibiObject implements IDataSource
}
/********************* exporting ****************d*g**/
/**
* @return DibiDataSource
*/
@@ -458,7 +431,6 @@ class DibiFluent extends DibiObject implements IDataSource
}
/**
* Returns SQL query.
* @return string
@@ -473,7 +445,6 @@ class DibiFluent extends DibiObject implements IDataSource
}
/**
* Generates parameters for DibiTranslator.
* @param string clause name
@@ -499,7 +470,9 @@ class DibiFluent extends DibiObject implements IDataSource
if ($clause === $this->command && $this->flags) {
$args[] = implode(' ', array_keys($this->flags));
}
foreach ($statement as $arg) $args[] = $arg;
foreach ($statement as $arg) {
$args[] = $arg;
}
}
}
@@ -507,7 +480,6 @@ class DibiFluent extends DibiObject implements IDataSource
}
/**
* Format camelCase clause name to UPPER CASE.
* @param string
@@ -524,7 +496,6 @@ class DibiFluent extends DibiObject implements IDataSource
}
public function __clone()
{
// remove references

9
dibi/libs/DibiHashMap.php
View File

@@ -2,15 +2,10 @@
/**
* This file is part of the "dibi" - smart database abstraction layer.
*
* Copyright (c) 2005 David Grudl (http://davidgrudl.com)
*
* For the full copyright and license information, please view
* the file license.txt that was distributed with this source code.
*/
/**
* Lazy cached storage.
*
@@ -29,7 +24,6 @@ abstract class DibiHashMapBase
}
public function setCallback($callback)
{
if (!is_callable($callback)) {
@@ -40,7 +34,6 @@ abstract class DibiHashMapBase
}
public function getCallback()
{
return $this->callback;
@@ -49,7 +42,6 @@ abstract class DibiHashMapBase
}
/**
* Lazy cached storage.
*
@@ -68,7 +60,6 @@ final class DibiHashMap extends DibiHashMapBase
}
public function __get($nm)
{
if ($nm == '') {

7
dibi/libs/DibiLiteral.php
View File

@@ -2,19 +2,15 @@
/**
* This file is part of the "dibi" - smart database abstraction layer.
*
* Copyright (c) 2005 David Grudl (http://davidgrudl.com)
*
* For the full copyright and license information, please view
* the file license.txt that was distributed with this source code.
*/
/**
* SQL literal value.
*
* @author David Grudl
* @package dibi
*/
class DibiLiteral extends DibiObject
{
@@ -28,7 +24,6 @@ class DibiLiteral extends DibiObject
}
/**
* @return string
*/

25
dibi/libs/DibiObject.php
View File

@@ -2,15 +2,10 @@
/**
* This file is part of the "dibi" - smart database abstraction layer.
*
* Copyright (c) 2005 David Grudl (http://davidgrudl.com)
*
* For the full copyright and license information, please view
* the file license.txt that was distributed with this source code.
*/
/**
* DibiObject is the ultimate ancestor of all instantiable classes.
*
@@ -58,7 +53,6 @@ abstract class DibiObject
private static $extMethods;
/**
* Returns the name of the class of this object.
* @return string
@@ -69,7 +63,6 @@ abstract class DibiObject
}
/**
* Access to reflection.
* @return \ReflectionObject
@@ -80,7 +73,6 @@ abstract class DibiObject
}
/**
* Call to undefined method.
* @param string method name
@@ -125,7 +117,6 @@ abstract class DibiObject
}
/**
* Call to undefined static method.
* @param string method name (in lower case!)
@@ -140,7 +131,6 @@ abstract class DibiObject
}
/**
* Adding method to class.
* @param string method name
@@ -158,7 +148,9 @@ abstract class DibiObject
self::$extMethods[$pair[1]][''] = NULL;
}
}
if ($name === NULL) return NULL;
if ($name === NULL) {
return NULL;
}
}
$name = strtolower($name);
@@ -202,14 +194,13 @@ abstract class DibiObject
}
/**
* Returns property value. Do not call directly.
* @param string property name
* @return mixed property value
* @throws \LogicException if the property is not defined.
*/
public function &__get($name)
public function & __get($name)
{
$class = get_class($this);
@@ -222,8 +213,8 @@ abstract class DibiObject
$m = 'get' . $name;
if (self::hasAccessor($class, $m)) {
// ampersands:
// - uses &__get() because declaration should be forward compatible (e.g. with Nette\Web\Html)
// - doesn't call &$this->$m because user could bypass property setter by: $x = & $obj->property; $x = 'new value';
// - uses & __get() because declaration should be forward compatible (e.g. with Nette\Web\Html)
// - doesn't call & $this->$m because user could bypass property setter by: $x = & $obj->property; $x = 'new value';
$val = $this->$m();
return $val;
}
@@ -239,7 +230,6 @@ abstract class DibiObject
}
/**
* Sets value of a property. Do not call directly.
* @param string property name
@@ -274,7 +264,6 @@ abstract class DibiObject
}
/**
* Is property defined?
* @param string property name
@@ -287,7 +276,6 @@ abstract class DibiObject
}
/**
* Access to undeclared property.
* @param string property name
@@ -301,7 +289,6 @@ abstract class DibiObject
}
/**
* Has property an accessor?
* @param string class name

65
dibi/libs/DibiResult.php
View File

@@ -2,15 +2,10 @@
/**
* This file is part of the "dibi" - smart database abstraction layer.
*
* Copyright (c) 2005 David Grudl (http://davidgrudl.com)
*
* For the full copyright and license information, please view
* the file license.txt that was distributed with this source code.
*/
/**
* dibi result set.
*
@@ -58,7 +53,6 @@ class DibiResult extends DibiObject implements IDataSource
private $formats = array();
/**
* @param IDibiResultDriver
*/
@@ -69,7 +63,6 @@ class DibiResult extends DibiObject implements IDataSource
}
/**
* @deprecated
*/
@@ -79,7 +72,6 @@ class DibiResult extends DibiObject implements IDataSource
}
/**
* Frees the resources allocated for this result set.
* @return void
@@ -93,7 +85,6 @@ class DibiResult extends DibiObject implements IDataSource
}
/**
* Safe access to property $driver.
* @return IDibiResultDriver
@@ -109,11 +100,9 @@ class DibiResult extends DibiObject implements IDataSource
}
/********************* rows ****************d*g**/
/**
* Moves cursor position without fetching row.
* @param int the 0-based cursor pos to seek to
@@ -126,7 +115,6 @@ class DibiResult extends DibiObject implements IDataSource
}
/**
* Required by the Countable interface.
* @return int
@@ -137,7 +125,6 @@ class DibiResult extends DibiObject implements IDataSource
}
/**
* Returns the number of rows in a result set.
* @return int
@@ -148,7 +135,6 @@ class DibiResult extends DibiObject implements IDataSource
}
/**
* Returns the number of rows in a result set. Alias for getRowCount().
* @deprecated
@@ -160,7 +146,6 @@ class DibiResult extends DibiObject implements IDataSource
}
/**
* Required by the IteratorAggregate interface.
* @return DibiResultIterator
@@ -174,15 +159,13 @@ class DibiResult extends DibiObject implements IDataSource
}
/********************* fetching rows ****************d*g**/
/**
* Set fetched object class. This class should extend the DibiRow class.
* @param string
* @return DibiResult provides a fluent interface
* @return self
*/
public function setRowClass($class)
{
@@ -191,7 +174,6 @@ class DibiResult extends DibiObject implements IDataSource
}
/**
* Returns fetched object class name.
* @return string
@@ -202,7 +184,6 @@ class DibiResult extends DibiObject implements IDataSource
}
/**
* Fetches the row at current position, process optional type conversion.
* and moves the internal cursor to the next position
@@ -223,7 +204,6 @@ class DibiResult extends DibiObject implements IDataSource
}
/**
* Like fetch(), but returns only first field.
* @return mixed value on success, FALSE if no next record
@@ -240,23 +220,26 @@ class DibiResult extends DibiObject implements IDataSource
}
/**
* Fetches all records from table.
* @param int offset
* @param int limit
* @return array of DibiRow
* @return DibiRow[]
*/
final public function fetchAll($offset = NULL, $limit = NULL)
{
$limit = $limit === NULL ? -1 : (int) $limit;
$this->seek((int) $offset);
$row = $this->fetch();
if (!$row) return array(); // empty result set
if (!$row) {
return array(); // empty result set
}
$data = array();
do {
if ($limit === 0) break;
if ($limit === 0) {
break;
}
$limit--;
$data[] = $row;
} while ($row = $this->fetch());
@@ -265,7 +248,6 @@ class DibiResult extends DibiObject implements IDataSource
}
/**
* Fetches all records from table and returns associative tree.
* Examples:
@@ -285,7 +267,9 @@ class DibiResult extends DibiObject implements IDataSource
$this->seek(0);
$row = $this->fetch();
if (!$row) return array(); // empty result set
if (!$row) {
return array(); // empty result set
}
$data = NULL;
$assoc = preg_split('#(\[\]|->|=|\|)#', $assoc, NULL, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
@@ -344,7 +328,6 @@ class DibiResult extends DibiObject implements IDataSource
}
/**
* @deprecated
*/
@@ -352,7 +335,9 @@ class DibiResult extends DibiObject implements IDataSource
{
$this->seek(0);
$row = $this->fetch();
if (!$row) return array(); // empty result set
if (!$row) {
return array(); // empty result set
}
$data = NULL;
$assoc = explode(',', $assoc);
@@ -417,7 +402,6 @@ class DibiResult extends DibiObject implements IDataSource
}
/**
* Fetches all records from table like $key => $value pairs.
* @param string associative key
@@ -429,7 +413,9 @@ class DibiResult extends DibiObject implements IDataSource
{
$this->seek(0);
$row = $this->fetch();
if (!$row) return array(); // empty result set
if (!$row) {
return array(); // empty result set
}
$data = array();
@@ -475,11 +461,9 @@ class DibiResult extends DibiObject implements IDataSource
}
/********************* column types ****************d*g**/
/**
* Autodetect column types.
* @return void
@@ -495,7 +479,6 @@ class DibiResult extends DibiObject implements IDataSource
}
/**
* Converts values to specified type and format.
* @param array
@@ -543,12 +526,11 @@ class DibiResult extends DibiObject implements IDataSource
}
/**
* Define column type.
* @param string column
* @param string type (use constant Dibi::*)
* @return DibiResult provides a fluent interface
* @return self
*/
final public function setType($col, $type)
{
@@ -557,7 +539,6 @@ class DibiResult extends DibiObject implements IDataSource
}
/**
* Returns column type.
* @return string
@@ -568,12 +549,11 @@ class DibiResult extends DibiObject implements IDataSource
}
/**
* Sets data format.
* @param string type (use constant Dibi::*)
* @param string format
* @return DibiResult provides a fluent interface
* @return self
*/
final public function setFormat($type, $format)
{
@@ -582,7 +562,6 @@ class DibiResult extends DibiObject implements IDataSource
}
/**
* Returns data format.
* @return string
@@ -593,11 +572,9 @@ class DibiResult extends DibiObject implements IDataSource
}
/********************* meta info ****************d*g**/
/**
* Returns a meta information about the current result set.
* @return DibiResultInfo
@@ -611,7 +588,6 @@ class DibiResult extends DibiObject implements IDataSource
}
/**
* @deprecated
*/
@@ -621,7 +597,6 @@ class DibiResult extends DibiObject implements IDataSource
}
/** @deprecated */
public function getColumnNames($fullNames = FALSE)
{
@@ -630,11 +605,9 @@ class DibiResult extends DibiObject implements IDataSource
}
/********************* misc tools ****************d*g**/
/**
* Displays complete result set as HTML table for debug purposes.
* @return void

11
dibi/libs/DibiResultIterator.php
View File

@@ -2,15 +2,10 @@
/**
* This file is part of the "dibi" - smart database abstraction layer.
*
* Copyright (c) 2005 David Grudl (http://davidgrudl.com)
*
* For the full copyright and license information, please view
* the file license.txt that was distributed with this source code.
*/
/**
* External result set iterator.
*
@@ -47,7 +42,6 @@ class DibiResultIterator implements Iterator, Countable
}
/**
* Rewinds the iterator to the first element.
* @return void
@@ -60,7 +54,6 @@ class DibiResultIterator implements Iterator, Countable
}
/**
* Returns the key of the current element.
* @return mixed
@@ -71,7 +64,6 @@ class DibiResultIterator implements Iterator, Countable
}
/**
* Returns the current element.
* @return mixed
@@ -82,7 +74,6 @@ class DibiResultIterator implements Iterator, Countable
}
/**
* Moves forward to next element.
* @return void
@@ -94,7 +85,6 @@ class DibiResultIterator implements Iterator, Countable
}
/**
* Checks if there is a current element after calls to rewind() or next().
* @return bool
@@ -105,7 +95,6 @@ class DibiResultIterator implements Iterator, Countable
}
/**
* Required by the Countable interface.
* @return int

21
dibi/libs/DibiRow.php
View File

@@ -2,15 +2,10 @@
/**
* This file is part of the "dibi" - smart database abstraction layer.
*
* Copyright (c) 2005 David Grudl (http://davidgrudl.com)
*
* For the full copyright and license information, please view
* the file license.txt that was distributed with this source code.
*/
/**
* Result set single row.
*
@@ -22,9 +17,10 @@ class DibiRow implements ArrayAccess, IteratorAggregate, Countable
public function __construct($arr)
{
foreach ($arr as $k => $v) $this->$k = $v;
foreach ($arr as $k => $v) {
$this->$k = $v;
}
}
public function toArray()
@@ -33,7 +29,6 @@ class DibiRow implements ArrayAccess, IteratorAggregate, Countable
}
/**
* Converts value to DateTime object.
* @param string key
@@ -53,7 +48,6 @@ class DibiRow implements ArrayAccess, IteratorAggregate, Countable
}
/**
* Converts value to UNIX timestamp.
* @param string key
@@ -69,7 +63,6 @@ class DibiRow implements ArrayAccess, IteratorAggregate, Countable
}
/**
* Converts value to boolean.
* @param string key
@@ -82,7 +75,6 @@ class DibiRow implements ArrayAccess, IteratorAggregate, Countable
}
/** @deprecated */
public function asDate($key, $format = NULL)
{
@@ -95,46 +87,39 @@ class DibiRow implements ArrayAccess, IteratorAggregate, Countable
}
/********************* interfaces ArrayAccess, Countable & IteratorAggregate ****************d*g**/
final public function count()
{
return count((array) $this);
}
final public function getIterator()
{
return new ArrayIterator($this);
}
final public function offsetSet($nm, $val)
{
$this->$nm = $val;
}
final public function offsetGet($nm)
{
return $this->$nm;
}
final public function offsetExists($nm)
{
return isset($this->$nm);
}
final public function offsetUnset($nm)
{
unset($this->$nm);

59
dibi/libs/DibiTranslator.php
View File

@@ -2,15 +2,10 @@
/**
* This file is part of the "dibi" - smart database abstraction layer.
*
* Copyright (c) 2005 David Grudl (http://davidgrudl.com)
*
* For the full copyright and license information, please view
* the file license.txt that was distributed with this source code.
*/
/**
* dibi SQL translator.
*
@@ -53,14 +48,12 @@ final class DibiTranslator extends DibiObject
private $identifiers;
public function __construct(DibiConnection $connection)
{
$this->connection = $connection;
}
/**
* Generates SQL.
* @param array
@@ -94,8 +87,7 @@ final class DibiTranslator extends DibiObject
// iterate
$sql = array();
while ($cursor < count($this->args))
{
while ($cursor < count($this->args)) {
$arg = $this->args[$cursor];
$cursor++;
@@ -126,7 +118,9 @@ final class DibiTranslator extends DibiObject
array($this, 'cb'),
substr($arg, $toSkip)
);
if (preg_last_error()) throw new DibiPcreException;
if (preg_last_error()) {
throw new DibiPcreException;
}
}
continue;
}
@@ -148,7 +142,9 @@ final class DibiTranslator extends DibiObject
$commandIns = $commandIns === 'INSERT' || $commandIns === 'REPLAC';
$sql[] = $this->formatValue($arg, $commandIns ? 'v' : 'a');
} else {
if ($lastArr === $cursor - 1) $sql[] = ',';
if ($lastArr === $cursor - 1) {
$sql[] = ',';
}
$sql[] = $this->formatValue($arg, $commandIns ? 'l' : 'a');
}
$lastArr = $cursor;
@@ -161,7 +157,9 @@ final class DibiTranslator extends DibiObject
} // while
if ($comment) $sql[] = "*/";
if ($comment) {
$sql[] = "*/";
}
$sql = implode(' ', $sql);
@@ -178,7 +176,6 @@ final class DibiTranslator extends DibiObject
}
/**
* Apply modifier to single value.
* @param mixed
@@ -347,7 +344,9 @@ final class DibiTranslator extends DibiObject
case 'iN': // signed int or NULL
case 'in': // deprecated
if ($value == '') $value = NULL;
if ($value == '') {
$value = NULL;
}
// intentionally break omitted
case 'i': // signed int
@@ -397,7 +396,9 @@ final class DibiTranslator extends DibiObject
array($this, 'cb'),
substr($value, $toSkip)
);
if (preg_last_error()) throw new DibiPcreException;
if (preg_last_error()) {
throw new DibiPcreException;
}
}
return $value;
@@ -457,7 +458,6 @@ final class DibiTranslator extends DibiObject
}
/**
* PREG callback from translate() or formatValue().
* @param array
@@ -536,12 +536,16 @@ final class DibiTranslator extends DibiObject
return '';
} elseif ($mod === 'lmt') { // apply limit
if ($this->args[$cursor] !== NULL) $this->limit = (int) $this->args[$cursor];
if ($this->args[$cursor] !== NULL) {
$this->limit = (int) $this->args[$cursor];
}
$cursor++;
return '';
} elseif ($mod === 'ofs') { // apply offset
if ($this->args[$cursor] !== NULL) $this->offset = (int) $this->args[$cursor];
if ($this->args[$cursor] !== NULL) {
$this->offset = (int) $this->args[$cursor];
}
$cursor++;
return '';
@@ -551,21 +555,23 @@ final class DibiTranslator extends DibiObject
}
}
if ($this->comment) return '...';
if ($this->comment) {
return '...';
}
if ($matches[1]) // SQL identifiers: `ident`
if ($matches[1]) { // SQL identifiers: `ident`
return $this->identifiers->{$matches[1]};
if ($matches[2]) // SQL identifiers: [ident]
} elseif ($matches[2]) { // SQL identifiers: [ident]
return $this->identifiers->{$matches[2]};
if ($matches[3]) // SQL strings: '...'
} elseif ($matches[3]) { // SQL strings: '...'
return $this->driver->escape( str_replace("''", "'", $matches[4]), dibi::TEXT);
if ($matches[5]) // SQL strings: "..."
} elseif ($matches[5]) { // SQL strings: "..."
return $this->driver->escape( str_replace('""', '"', $matches[6]), dibi::TEXT);
if ($matches[7]) { // string quote
} elseif ($matches[7]) { // string quote
$this->hasError = TRUE;
return '**Alone quote**';
}
@@ -580,7 +586,6 @@ final class DibiTranslator extends DibiObject
}
/**
* Apply substitutions to indentifier and delimites it.
* @param string indentifier
@@ -592,7 +597,9 @@ final class DibiTranslator extends DibiObject
$value = $this->connection->substitute($value);
$parts = explode('.', $value);
foreach ($parts as & $v) {
if ($v !== '*') $v = $this->driver->escape($v, dibi::IDENTIFIER);
if ($v !== '*') {
$v = $this->driver->escape($v, dibi::IDENTIFIER);
}
}
return implode('.', $parts);
}

19
dibi/libs/interfaces.php
View File

@@ -2,15 +2,10 @@
/**
* This file is part of the "dibi" - smart database abstraction layer.
*
* Copyright (c) 2005 David Grudl (http://davidgrudl.com)
*
* For the full copyright and license information, please view
* the file license.txt that was distributed with this source code.
*/
/**
* Provides an interface between a dataset and data-aware components.
* @package dibi
@@ -22,7 +17,6 @@ interface IDataSource extends Countable, IteratorAggregate
}
/**
* dibi driver interface.
* @package dibi
@@ -36,7 +30,7 @@ interface IDibiDriver
* @return void
* @throws DibiException
*/
function connect(array &$config);
function connect(array & $config);
/**
* Disconnects from a database.
@@ -120,19 +114,13 @@ interface IDibiDriver
/**
* Injects LIMIT/OFFSET to the SQL query.
* @param string &$sql The SQL query that will be modified.
* @param int $limit
* @param int $offset
* @return void
*/
function applyLimit(&$sql, $limit, $offset);
function applyLimit(& $sql, $limit, $offset);
}
/**
* dibi result set driver interface.
* @package dibi
@@ -193,9 +181,6 @@ interface IDibiResultDriver
}
/**
* dibi driver reflection.
*

13
examples/Nette/Debugger.php
View File

@@ -23,7 +23,6 @@ render(){$obLevel=ob_get_level();$panels=array();foreach($this->panels
as$id=>$panel){try{$panels[]=array('id'=>preg_replace('#[^a-z0-9]+#i','-',$id),'tab'=>$tab=(string)$panel->getTab(),'panel'=>$tab?(string)$panel->getPanel():NULL);}catch(Exception$e){$panels[]=array('id'=>"error-$id",'tab'=>"Error: $id",'panel'=>nl2br(htmlSpecialChars((string)$e)));while(ob_get_level()>$obLevel){ob_end_clean();}}}?>
<!-- Nette Debug Bar -->
<?php ob_start()?>
@@ -130,7 +129,6 @@ htmlspecialchars('; caused by '.get_class($ex).' '.$ex->getMessage().($ex->getCo
</head>
<body>
<div id="netteBluescreen">
<a id="netteBluescreenIcon" href="#" rel="next"><abbr>&#x25bc;</abbr></a
@@ -146,7 +144,6 @@ urlencode($title.' '.preg_replace('#\'.*\'|".*"#Us','',$exception->getMessage())
</div>
<?php $ex=$exception;$level=0;?>
<?php do{?>
@@ -165,7 +162,6 @@ htmlspecialchars($ex->getMessage())?></b></p>
<?php endif?>
<?php foreach($panels
as$panel):?>
<?php $panel=call_user_func($panel,$ex);if(empty($panel['tab'])||empty($panel['panel']))continue;?>
@@ -180,7 +176,6 @@ htmlSpecialChars($panel['tab'])?> <abbr>&#x25bc;</abbr></a></h2>
<?php endforeach?>
<?php $stack=$ex->getTrace();$expanded=NULL?>
<?php if(strpos($ex->getFile(),$expandPath)===0){foreach($stack
as$key=>$row){if(isset($row['file'])&&strpos($row['file'],$expandPath)!==0){$expanded=$key;break;}}}?>
@@ -196,7 +191,6 @@ self::highlightFile($ex->getFile(),$ex->getLine(),15,isset($ex->context)?$ex->co
</div></div>
<?php if(isset($stack[0]['class'])&&$stack[0]['class']==='NDebugger'&&($stack[0]['function']==='_shutdownHandler'||$stack[0]['function']==='_errorHandler'))unset($stack[0])?>
<?php if($stack):?>
<div class="panel">
@@ -251,7 +245,6 @@ self::highlightFile($row['file'],$row['line'])?></div>
<?php endif?>
<?php if(isset($ex->context)&&is_array($ex->context)):?>
<div class="panel">
<h2><a href="#" rel="netteBsPnl<?php echo++$counter?>">Variables <abbr>&#x25ba;</abbr></a></h2>
@@ -272,7 +265,6 @@ as$k=>$v){echo'<tr><th>$',htmlspecialchars($k),'</th><td>',NDebugHelpers::clicka
<?php while(--$level)echo'</div></div>'?>
<?php $bottomPanels=array()?>
<?php foreach($panels
as$panel):?>
@@ -288,7 +280,6 @@ htmlSpecialChars($panel['tab'])?> <abbr>&#x25ba;</abbr></a></h2>
<?php endforeach?>
<div class="panel">
<h2><a href="#" rel="netteBsPnl<?php echo++$counter?>">Environment <abbr>&#x25ba;</abbr></a></h2>
@@ -336,7 +327,6 @@ as$k=>$v)echo'<tr><th>',htmlspecialchars($k),'</th><td>',NDebugHelpers::clickabl
</div></div>
<div class="panel">
<h2><a href="#" rel="netteBsPnl<?php echo++$counter?>">HTTP request <abbr>&#x25ba;</abbr></a></h2>
@@ -371,7 +361,6 @@ foreach($GLOBALS[$name]as$k=>$v)echo'<tr><th>',htmlspecialchars($k),'</th><td>',
</div></div>
<div class="panel">
<h2><a href="#" rel="netteBsPnl<?php echo++$counter?>">HTTP response <abbr>&#x25ba;</abbr></a></h2>
@@ -388,7 +377,6 @@ htmlspecialchars($s),'<br>';?></pre>
</div></div>
<?php foreach($bottomPanels
as$panel):?>
<div class="panel">
@@ -401,7 +389,6 @@ htmlSpecialChars($panel['tab'])?> <abbr>&#x25bc;</abbr></a></h2>
<?php endforeach?>
<ul>
<li>Report generated at <?php echo@date('Y/m/d H:i:s',NDebugger::$time)?></li>
<?php if(preg_match('#^https?://#',NDebugger::$source)):?>

2
examples/Nette/license.txt
View File

@@ -18,7 +18,6 @@ project or top-level domain, and choose a name that stands on its own merits.
If your stuff is good, it will not take long to establish a reputation for yourselves.
New BSD License
---------------
@@ -51,7 +50,6 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
GNU General Public License
--------------------------

15
examples/connecting-to-databases.php
View File

@@ -23,8 +23,6 @@ try {
echo "</p>\n";
// connects to SQlite using DibiConnection object
echo '<p>Connecting to Sqlite: ';
try {
@@ -40,8 +38,6 @@ try {
echo "</p>\n";
// connects to MySQL using DSN
echo '<p>Connecting to MySQL: ';
try {
@@ -54,8 +50,6 @@ try {
echo "</p>\n";
// connects to MySQLi using array
echo '<p>Connecting to MySQLi: ';
try {
@@ -78,8 +72,6 @@ try {
echo "</p>\n";
// connects to ODBC
echo '<p>Connecting to ODBC: ';
try {
@@ -97,8 +89,6 @@ try {
echo "</p>\n";
// connects to PostgreSql
echo '<p>Connecting to PostgreSql: ';
try {
@@ -115,8 +105,6 @@ try {
echo "</p>\n";
// connects to PDO
echo '<p>Connecting to Sqlite via PDO: ';
try {
@@ -132,7 +120,6 @@ try {
echo "</p>\n";
// connects to MS SQL
echo '<p>Connecting to MS SQL: ';
try {
@@ -150,7 +137,6 @@ try {
echo "</p>\n";
// connects to MS SQL 2005
echo '<p>Connecting to MS SQL 2005: ';
try {
@@ -169,7 +155,6 @@ try {
echo "</p>\n";
// connects to Oracle
echo '<p>Connecting to Oracle: ';
try {

3
examples/database-reflection.php
View File

@@ -14,7 +14,6 @@ dibi::connect(array(
));
// retrieve database reflection
$database = dibi::getDatabaseInfo();
@@ -26,7 +25,6 @@ foreach ($database->getTables() as $table) {
echo "</ul>\n";
// table reflection
$table = $database->getTable('products');
@@ -40,7 +38,6 @@ foreach ($table->getColumns() as $column) {
echo "</ul>\n";
echo "Indexes";
echo "<ul>\n";
foreach ($table->getIndexes() as $index) {

1
examples/dumping-sql-and-result-set.php
View File

@@ -14,7 +14,6 @@ dibi::connect(array(
));
$res = dibi::query('
SELECT * FROM products
INNER JOIN orders USING (product_id)

1
examples/nette-debug-and-exceptions.php
View File

@@ -31,7 +31,6 @@ dibi::connect(array(
dibi::query('SELECT * FROM customers WHERE customer_id < ?', 38);
dibi::connect(array(
'driver' => 'sqlite',
'database' => 'data/sample.sdb',

3
examples/query-language-and-conditions.php
View File

@@ -32,8 +32,6 @@ dibi::test('
// -> SELECT * FROM customers WHERE name LIKE 'K%'
// if & else & (optional) end
dibi::test("
SELECT *
@@ -45,7 +43,6 @@ dibi::test("
// -> SELECT * FROM people WHERE id > 0 AND bar=2
// nested condition
dibi::test('
SELECT *

6
examples/query-language-basic-examples.php
View File

@@ -29,7 +29,6 @@ dibi::test('
// -> SELECT COUNT(*) as [count] FROM [comments] WHERE [ip] LIKE '192.168.%' AND [date] > 876693600
// dibi detects INSERT or REPLACE command
dibi::test('
REPLACE INTO products', array(
@@ -40,7 +39,6 @@ dibi::test('
// -> REPLACE INTO products ([title], [price], [active]) VALUES ('Super product', 318, 1)
// multiple INSERT command
$array = array(
'title' => 'Super Product',
@@ -52,7 +50,6 @@ dibi::test("INSERT INTO products", $array, $array, $array);
// -> INSERT INTO products ([title], [price], [brand], [created]) VALUES ('Super Product', ...) , (...) , (...)
// dibi detects UPDATE command
dibi::test("
UPDATE colors SET", array(
@@ -63,7 +60,6 @@ dibi::test("
// -> UPDATE colors SET [color]='blue', [order]=12 WHERE id=123
// modifier applied to array
$array = array(1, 2, 3);
dibi::test("
@@ -74,7 +70,6 @@ dibi::test("
// -> SELECT * FROM people WHERE id IN ( 1, 2, 3 )
// modifier %by for ORDER BY
$order = array(
'field1' => 'asc',
@@ -88,7 +83,6 @@ dibi::test("
// -> SELECT * FROM people ORDER BY [field1] ASC, [field2] DESC
// indentifiers and strings syntax mix
dibi::test('UPDATE [table] SET `item` = "5 1/4"" diskette"');
// -> UPDATE [table] SET [item] = '5 1/4" diskette'

1
examples/result-set-data-types.php
View File

@@ -34,7 +34,6 @@ dump( $res->fetch() );
// }
// using auto-detection (works well with MySQL or other strictly typed databases)
$res = dibi::query('SELECT * FROM [customers]');

2
examples/using-datetime.php
View File

@@ -10,7 +10,6 @@ require_once '../dibi/dibi.php';
date_default_timezone_set('Europe/Prague');
// CHANGE TO REAL PARAMETERS!
dibi::connect(array(
'driver' => 'sqlite',
@@ -20,7 +19,6 @@ dibi::connect(array(
));
// generate and dump SQL
dibi::test("
INSERT INTO [mytable]", array(

1
examples/using-extension-methods.php
View File

@@ -15,7 +15,6 @@ dibi::connect(array(
));
// using the "prototype" to add custom method to class DibiResult
function DibiResult_prototype_fetchShuffle(DibiResult $obj)
{

6
examples/using-fluent-syntax.php
View File

@@ -35,7 +35,6 @@ dibi::select('product_id')->as('id')
// USING (product_id) INNER JOIN customers USING (customer_id) ORDER BY [title]
// SELECT ...
echo dibi::select('title')->as('id')
->from('products')
@@ -43,7 +42,6 @@ echo dibi::select('title')->as('id')
// -> Chair (as result of query: SELECT [title] AS [id] FROM [products])
// INSERT ...
dibi::insert('products', $record)
->setFlag('IGNORE')
@@ -51,7 +49,6 @@ dibi::insert('products', $record)
// -> INSERT IGNORE INTO [products] ([title], [price], [active]) VALUES ('Super product', 318, 1)
// UPDATE ...
dibi::update('products', $record)
->where('product_id = ?', $id)
@@ -59,7 +56,6 @@ dibi::update('products', $record)
// -> UPDATE [products] SET [title]='Super product', [price]=318, [active]=1 WHERE product_id = 10
// DELETE ...
dibi::delete('products')
->where('product_id = ?', $id)
@@ -67,7 +63,6 @@ dibi::delete('products')
// -> DELETE FROM [products] WHERE product_id = 10
// custom commands
dibi::command()
->update('products')
@@ -77,7 +72,6 @@ dibi::command()
// -> UPDATE [products] SET [title]='Super product', [price]=318, [active]=1 WHERE product_id = 10
dibi::command()
->truncate('products')
->test();

2
examples/using-limit-and-offset.php
View File

@@ -19,13 +19,11 @@ dibi::test('SELECT * FROM [products]');
// -> SELECT * FROM [products]
// with limit = 2
dibi::test('SELECT * FROM [products] %lmt', 2);
// -> SELECT * FROM [products] LIMIT 2
// with limit = 2, offset = 1
dibi::test('SELECT * FROM [products] %lmt %ofs', 2, 1);
// -> SELECT * FROM [products] LIMIT 2 OFFSET 1

1
examples/using-logger.php
View File

@@ -21,7 +21,6 @@ dibi::connect(array(
));
try {
$res = dibi::query('SELECT * FROM [customers] WHERE [customer_id] = ?', 1);

8
examples/using-substitutions.php
View File

@@ -14,8 +14,6 @@ dibi::connect(array(
));
// create new substitution :blog: ==> wp_
dibi::getSubstitutes()->blog = 'wp_';
@@ -23,9 +21,6 @@ dibi::test("SELECT * FROM [:blog:items]");
// -> SELECT * FROM [wp_items]
// create new substitution :: (empty) ==> my_
dibi::getSubstitutes()->{''} = 'my_';
@@ -33,9 +28,6 @@ dibi::test("UPDATE ::table SET [text]='Hello World'");
// -> UPDATE my_table SET [text]='Hello World'
// create substitutions using fallback callback
function substFallBack($expr)
{

3
tests/DibiFluent.cloning.phpt
View File

@@ -9,7 +9,6 @@
*/
require dirname(__FILE__) . '/initialize.php';
@@ -27,7 +26,6 @@ $fluent->test();
$dolly->test();
$fluent = dibi::select('id')->from('table')->where('id = %i',1);
$dolly = clone $fluent;
$dolly->where('cd = %i',5);
@@ -36,7 +34,6 @@ $fluent->test();
$dolly->test();
$fluent = dibi::select("*")->from("table");
$dolly = clone $fluent;
$dolly->removeClause("select")->select("count(*)");