mirror/php-dibi
1
0
Fork 0
mirror of https://github.com/dg/dibi.git synced 2025-08-07 06:36:44 +02:00
Code Issues Releases Wiki Activity

* fixed DibiPostgreDriver::insertId

Browse Source 
* changed URL to http://dibiphp.com
This commit is contained in:
David Grudl
2007-12-05 09:27:55 +00:00
parent 7d964e054b
commit dfacb48449
24 changed files with 85 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dibi/dibi.php
View File

@@ -9,13 +9,13 @@
* This source file is subject to the "dibi license" that is bundled * This source file is subject to the "dibi license" that is bundled
* with this package in the file license.txt. * with this package in the file license.txt.
* *
* For more information please see http://php7.org/dibi/ * For more information please see http://dibiphp.com/
* *
* @author David Grudl * @author David Grudl
* @copyright Copyright (c) 2005, 2007 David Grudl * @copyright Copyright (c) 2005, 2007 David Grudl
* @license http://php7.org/dibi/license dibi license * @license http://dibiphp.com/license dibi license
* @version 0.9 (Revision: $WCREV$, Date: $WCDATE$) * @version 0.9 (Revision: $WCREV$, Date: $WCDATE$)
* @link http://php7.org/dibi/ * @link http://dibiphp.com/
* @package dibi * @package dibi
*/ */

6
dibi/drivers/mssql.php
View File

@@ -9,11 +9,11 @@
* This source file is subject to the "dibi license" that is bundled * This source file is subject to the "dibi license" that is bundled
* with this package in the file license.txt. * with this package in the file license.txt.
* *
* For more information please see http://php7.org/dibi/ * For more information please see http://dibiphp.com/
* *
* @copyright Copyright (c) 2005, 2007 David Grudl * @copyright Copyright (c) 2005, 2007 David Grudl
* @license http://php7.org/dibi/license dibi license * @license http://dibiphp.com/license dibi license
* @link http://php7.org/dibi/ * @link http://dibiphp.com/
* @package dibi * @package dibi
*/ */

13
dibi/drivers/mysql.php
View File

@@ -9,11 +9,11 @@
* This source file is subject to the "dibi license" that is bundled * This source file is subject to the "dibi license" that is bundled
* with this package in the file license.txt. * with this package in the file license.txt.
* *
* For more information please see http://php7.org/dibi/ * For more information please see http://dibiphp.com/
* *
* @copyright Copyright (c) 2005, 2007 David Grudl * @copyright Copyright (c) 2005, 2007 David Grudl
* @license http://php7.org/dibi/license dibi license * @license http://dibiphp.com/license dibi license
* @link http://php7.org/dibi/ * @link http://dibiphp.com/
* @package dibi * @package dibi
*/ */
@@ -32,6 +32,7 @@
* - 'charset' - character encoding to set * - 'charset' - character encoding to set
* - 'unbuffered' - sends query without fetching and buffering the result rows automatically? * - 'unbuffered' - sends query without fetching and buffering the result rows automatically?
* - 'options' - driver specific constants (MYSQL_*) * - 'options' - driver specific constants (MYSQL_*)
* - 'sqlmode' - see http://dev.mysql.com/doc/refman/5.0/en/server-sql-mode.html
* - 'lazy' - if TRUE, connection will be established only when required * - 'lazy' - if TRUE, connection will be established only when required
* *
* @author David Grudl * @author David Grudl
@@ -124,7 +125,7 @@ class DibiMySqlDriver extends NObject implements DibiDriverInterface
// affects the character set used by mysql_real_escape_string() (was added in MySQL 5.0.7 and PHP 5.2.3) // affects the character set used by mysql_real_escape_string() (was added in MySQL 5.0.7 and PHP 5.2.3)
$ok = @mysql_set_charset($config['charset'], $this->connection); $ok = @mysql_set_charset($config['charset'], $this->connection);
} }
if (!$ok) $ok = @mysql_query("SET NAMES '" . $config['charset'] . "'", $this->connection); if (!$ok) $ok = @mysql_query("SET NAMES '$config[charset]'", $this->connection);
if (!$ok) $this->throwException(); if (!$ok) $this->throwException();
} }
@@ -132,6 +133,10 @@ class DibiMySqlDriver extends NObject implements DibiDriverInterface
@mysql_select_db($config['database'], $this->connection) or $this->throwException(); @mysql_select_db($config['database'], $this->connection) or $this->throwException();
} }
if (isset($config['sqlmode'])) {
if (!@mysql_query("SET sql_mode='$config[sqlmode]'", $this->connection)) $this->throwException();
}
$this->buffered = empty($config['unbuffered']); $this->buffered = empty($config['unbuffered']);
} }

13
dibi/drivers/mysqli.php
View File

@@ -9,11 +9,11 @@
* This source file is subject to the "dibi license" that is bundled * This source file is subject to the "dibi license" that is bundled
* with this package in the file license.txt. * with this package in the file license.txt.
* *
* For more information please see http://php7.org/dibi/ * For more information please see http://dibiphp.com/
* *
* @copyright Copyright (c) 2005, 2007 David Grudl * @copyright Copyright (c) 2005, 2007 David Grudl
* @license http://php7.org/dibi/license dibi license * @license http://dibiphp.com/license dibi license
* @link http://php7.org/dibi/ * @link http://dibiphp.com/
* @package dibi * @package dibi
*/ */
@@ -32,6 +32,7 @@
* - 'charset' - character encoding to set * - 'charset' - character encoding to set
* - 'unbuffered' - sends query without fetching and buffering the result rows automatically? * - 'unbuffered' - sends query without fetching and buffering the result rows automatically?
* - 'options' - driver specific constants (MYSQLI_*) * - 'options' - driver specific constants (MYSQLI_*)
* - 'sqlmode' - see http://dev.mysql.com/doc/refman/5.0/en/server-sql-mode.html
* - 'lazy' - if TRUE, connection will be established only when required * - 'lazy' - if TRUE, connection will be established only when required
* *
* @author David Grudl * @author David Grudl
@@ -109,10 +110,14 @@ class DibiMySqliDriver extends NObject implements DibiDriverInterface
if (isset($config['charset'])) { if (isset($config['charset'])) {
// affects the character set used by mysql_real_escape_string() (was added in MySQL 5.0.7 and PHP 5.0.5) // affects the character set used by mysql_real_escape_string() (was added in MySQL 5.0.7 and PHP 5.0.5)
$ok = @mysqli_set_charset($this->connection, $config['charset']); $ok = @mysqli_set_charset($this->connection, $config['charset']);
if (!$ok) $ok = @mysqli_query($this->connection, "SET NAMES '" . $config['charset'] . "'"); if (!$ok) $ok = @mysqli_query($this->connection, "SET NAMES '$config[charset]'");
if (!$ok) $this->throwException(); if (!$ok) $this->throwException();
} }
if (isset($config['sqlmode'])) {
if (!@mysqli_query($this->connection, "SET sql_mode='$config[sqlmode]'")) $this->throwException();
}
$this->buffered = empty($config['unbuffered']); $this->buffered = empty($config['unbuffered']);
} }

6
dibi/drivers/odbc.php
View File

@@ -9,11 +9,11 @@
* This source file is subject to the "dibi license" that is bundled * This source file is subject to the "dibi license" that is bundled
* with this package in the file license.txt. * with this package in the file license.txt.
* *
* For more information please see http://php7.org/dibi/ * For more information please see http://dibiphp.com/
* *
* @copyright Copyright (c) 2005, 2007 David Grudl * @copyright Copyright (c) 2005, 2007 David Grudl
* @license http://php7.org/dibi/license dibi license * @license http://dibiphp.com/license dibi license
* @link http://php7.org/dibi/ * @link http://dibiphp.com/
* @package dibi * @package dibi
*/ */

6
dibi/drivers/oracle.php
View File

@@ -9,11 +9,11 @@
* This source file is subject to the "dibi license" that is bundled * This source file is subject to the "dibi license" that is bundled
* with this package in the file license.txt. * with this package in the file license.txt.
* *
* For more information please see http://php7.org/dibi/ * For more information please see http://dibiphp.com/
* *
* @copyright Copyright (c) 2005, 2007 David Grudl * @copyright Copyright (c) 2005, 2007 David Grudl
* @license http://php7.org/dibi/license dibi license * @license http://dibiphp.com/license dibi license
* @link http://php7.org/dibi/ * @link http://dibiphp.com/
* @package dibi * @package dibi
*/ */

6
dibi/drivers/pdo.php
View File

@@ -9,11 +9,11 @@
* This source file is subject to the "dibi license" that is bundled * This source file is subject to the "dibi license" that is bundled
* with this package in the file license.txt. * with this package in the file license.txt.
* *
* For more information please see http://php7.org/dibi/ * For more information please see http://dibiphp.com/
* *
* @copyright Copyright (c) 2005, 2007 David Grudl * @copyright Copyright (c) 2005, 2007 David Grudl
* @license http://php7.org/dibi/license dibi license * @license http://dibiphp.com/license dibi license
* @link http://php7.org/dibi/ * @link http://dibiphp.com/
* @package dibi * @package dibi
*/ */

14
dibi/drivers/postgre.php
View File

@@ -9,11 +9,11 @@
* This source file is subject to the "dibi license" that is bundled * This source file is subject to the "dibi license" that is bundled
* with this package in the file license.txt. * with this package in the file license.txt.
* *
* For more information please see http://php7.org/dibi/ * For more information please see http://dibiphp.com/
* *
* @copyright Copyright (c) 2005, 2007 David Grudl * @copyright Copyright (c) 2005, 2007 David Grudl
* @license http://php7.org/dibi/license dibi license * @license http://dibiphp.com/license dibi license
* @link http://php7.org/dibi/ * @link http://dibiphp.com/
* @package dibi * @package dibi
*/ */
@@ -163,16 +163,16 @@ class DibiPostgreDriver extends NObject implements DibiDriverInterface
{ {
if ($sequence === NULL) { if ($sequence === NULL) {
// PostgreSQL 8.1 is needed // PostgreSQL 8.1 is needed
$has = $this->query("SELECT LASTVAL() AS seq"); $has = $this->query("SELECT LASTVAL()");
} else { } else {
$has = $this->query("SELECT CURRVAL('$sequence') AS seq"); $has = $this->query("SELECT CURRVAL('$sequence')");
} }
if (!$has) return FALSE; if (!$has) return FALSE;
$row = $this->fetch(); $row = $this->fetch(FALSE);
$this->free(); $this->free();
return isset($row['seq']) ? $row['seq'] : FALSE; return is_array($row) ? $row[0] : FALSE;
} }

6
dibi/drivers/sqlite.php
View File

@@ -9,11 +9,11 @@
* This source file is subject to the "dibi license" that is bundled * This source file is subject to the "dibi license" that is bundled
* with this package in the file license.txt. * with this package in the file license.txt.
* *
* For more information please see http://php7.org/dibi/ * For more information please see http://dibiphp.com/
* *
* @copyright Copyright (c) 2005, 2007 David Grudl * @copyright Copyright (c) 2005, 2007 David Grudl
* @license http://php7.org/dibi/license dibi license * @license http://dibiphp.com/license dibi license
* @link http://php7.org/dibi/ * @link http://dibiphp.com/
* @package dibi * @package dibi
*/ */

6
dibi/libs/DibiConnection.php
View File

@@ -9,11 +9,11 @@
* This source file is subject to the "dibi license" that is bundled * This source file is subject to the "dibi license" that is bundled
* with this package in the file license.txt. * with this package in the file license.txt.
* *
* For more information please see http://php7.org/dibi/ * For more information please see http://dibiphp.com/
* *
* @copyright Copyright (c) 2005, 2007 David Grudl * @copyright Copyright (c) 2005, 2007 David Grudl
* @license http://php7.org/dibi/license dibi license * @license http://dibiphp.com/license dibi license
* @link http://php7.org/dibi/ * @link http://dibiphp.com/
* @package dibi * @package dibi
*/ */

6
dibi/libs/DibiDriverInterface.php
View File

@@ -9,11 +9,11 @@
* This source file is subject to the "dibi license" that is bundled * This source file is subject to the "dibi license" that is bundled
* with this package in the file license.txt. * with this package in the file license.txt.
* *
* For more information please see http://php7.org/dibi/ * For more information please see http://dibiphp.com/
* *
* @copyright Copyright (c) 2005, 2007 David Grudl * @copyright Copyright (c) 2005, 2007 David Grudl
* @license http://php7.org/dibi/license dibi license * @license http://dibiphp.com/license dibi license
* @link http://php7.org/dibi/ * @link http://dibiphp.com/
* @package dibi * @package dibi
*/ */

6
dibi/libs/DibiException.php
View File

@@ -9,11 +9,11 @@
* This source file is subject to the "dibi license" that is bundled * This source file is subject to the "dibi license" that is bundled
* with this package in the file license.txt. * with this package in the file license.txt.
* *
* For more information please see http://php7.org/dibi/ * For more information please see http://dibiphp.com/
* *
* @copyright Copyright (c) 2005, 2007 David Grudl * @copyright Copyright (c) 2005, 2007 David Grudl
* @license http://php7.org/dibi/license dibi license * @license http://dibiphp.com/license dibi license
* @link http://php7.org/dibi/ * @link http://dibiphp.com/
* @package dibi * @package dibi
*/ */

6
dibi/libs/DibiLogger.php
View File

@@ -9,11 +9,11 @@
* This source file is subject to the "dibi license" that is bundled * This source file is subject to the "dibi license" that is bundled
* with this package in the file license.txt. * with this package in the file license.txt.
* *
* For more information please see http://php7.org/dibi/ * For more information please see http://dibiphp.com/
* *
* @copyright Copyright (c) 2005, 2007 David Grudl * @copyright Copyright (c) 2005, 2007 David Grudl
* @license http://php7.org/dibi/license dibi license * @license http://dibiphp.com/license dibi license
* @link http://php7.org/dibi/ * @link http://dibiphp.com/
* @package dibi * @package dibi
*/ */

6
dibi/libs/DibiResult.php
View File

@@ -9,11 +9,11 @@
* This source file is subject to the "dibi license" that is bundled * This source file is subject to the "dibi license" that is bundled
* with this package in the file license.txt. * with this package in the file license.txt.
* *
* For more information please see http://php7.org/dibi/ * For more information please see http://dibiphp.com/
* *
* @copyright Copyright (c) 2005, 2007 David Grudl * @copyright Copyright (c) 2005, 2007 David Grudl
* @license http://php7.org/dibi/license dibi license * @license http://dibiphp.com/license dibi license
* @link http://php7.org/dibi/ * @link http://dibiphp.com/
* @package dibi * @package dibi
*/ */

6
dibi/libs/DibiResultIterator.php
View File

@@ -9,11 +9,11 @@
* This source file is subject to the "dibi license" that is bundled * This source file is subject to the "dibi license" that is bundled
* with this package in the file license.txt. * with this package in the file license.txt.
* *
* For more information please see http://php7.org/dibi/ * For more information please see http://dibiphp.com/
* *
* @copyright Copyright (c) 2005, 2007 David Grudl * @copyright Copyright (c) 2005, 2007 David Grudl
* @license http://php7.org/dibi/license dibi license * @license http://dibiphp.com/license dibi license
* @link http://php7.org/dibi/ * @link http://dibiphp.com/
* @package dibi * @package dibi
*/ */

6
dibi/libs/DibiTranslator.php
View File

@@ -9,11 +9,11 @@
* This source file is subject to the "dibi license" that is bundled * This source file is subject to the "dibi license" that is bundled
* with this package in the file license.txt. * with this package in the file license.txt.
* *
* For more information please see http://php7.org/dibi/ * For more information please see http://dibiphp.com/
* *
* @copyright Copyright (c) 2005, 2007 David Grudl * @copyright Copyright (c) 2005, 2007 David Grudl
* @license http://php7.org/dibi/license dibi license * @license http://dibiphp.com/license dibi license
* @link http://php7.org/dibi/ * @link http://dibiphp.com/
* @package dibi * @package dibi
*/ */

6
dibi/libs/DibiVariable.php
View File

@@ -9,11 +9,11 @@
* This source file is subject to the "dibi license" that is bundled * This source file is subject to the "dibi license" that is bundled
* with this package in the file license.txt. * with this package in the file license.txt.
* *
* For more information please see http://php7.org/dibi/ * For more information please see http://dibiphp.com/
* *
* @copyright Copyright (c) 2005, 2007 David Grudl * @copyright Copyright (c) 2005, 2007 David Grudl
* @license http://php7.org/dibi/license dibi license * @license http://dibiphp.com/license dibi license
* @link http://php7.org/dibi/ * @link http://dibiphp.com/
* @package dibi * @package dibi
*/ */

10
dibi/libs/NClass.php
View File

@@ -9,11 +9,11 @@
* This source file is subject to the "dibi license" that is bundled * This source file is subject to the "dibi license" that is bundled
* with this package in the file license.txt. * with this package in the file license.txt.
* *
* For more information please see http://php7.org/dibi/ * For more information please see http://dibiphp.com/
* *
* @copyright Copyright (c) 2004, 2007 David Grudl * @copyright Copyright (c) 2004, 2007 David Grudl
* @license http://php7.org/nette/license Nette license * @license http://nettephp.com/license Nette license
* @link http://php7.org/nette/ * @link http://nettephp.com/
* @package Nette * @package Nette
*/ */
@@ -24,8 +24,8 @@
* *
* @author David Grudl * @author David Grudl
* @copyright Copyright (c) 2004, 2007 David Grudl * @copyright Copyright (c) 2004, 2007 David Grudl
* @license http://php7.org/nette/license Nette license * @license http://nettephp.com/license Nette license
* @link http://php7.org/nette/ * @link http://nettephp.com/
* @package Nette * @package Nette
*/ */
abstract class NClass abstract class NClass

10
dibi/libs/NException.php
View File

@@ -9,11 +9,11 @@
* This source file is subject to the "dibi license" that is bundled * This source file is subject to the "dibi license" that is bundled
* with this package in the file license.txt. * with this package in the file license.txt.
* *
* For more information please see http://php7.org/dibi/ * For more information please see http://dibiphp.com/
* *
* @copyright Copyright (c) 2004, 2007 David Grudl * @copyright Copyright (c) 2004, 2007 David Grudl
* @license http://php7.org/nette/license Nette license * @license http://nettephp.com/license Nette license
* @link http://php7.org/nette/ * @link http://nettephp.com/
* @package Nette * @package Nette
*/ */
@@ -24,8 +24,8 @@
* *
* @author David Grudl * @author David Grudl
* @copyright Copyright (c) 2004, 2007 David Grudl * @copyright Copyright (c) 2004, 2007 David Grudl
* @license http://php7.org/nette/license Nette license * @license http://nettephp.com/license Nette license
* @link http://php7.org/nette/ * @link http://nettephp.com/
* @package Nette * @package Nette
*/ */
class NException extends Exception class NException extends Exception

10
dibi/libs/NObject.php
View File

@@ -9,11 +9,11 @@
* This source file is subject to the "dibi license" that is bundled * This source file is subject to the "dibi license" that is bundled
* with this package in the file license.txt. * with this package in the file license.txt.
* *
* For more information please see http://php7.org/dibi/ * For more information please see http://dibiphp.com/
* *
* @copyright Copyright (c) 2004, 2007 David Grudl * @copyright Copyright (c) 2004, 2007 David Grudl
* @license http://php7.org/nette/license Nette license * @license http://nettephp.com/license Nette license
* @link http://php7.org/nette/ * @link http://nettephp.com/
* @package Nette * @package Nette
*/ */
@@ -47,8 +47,8 @@
* *
* @author David Grudl * @author David Grudl
* @copyright Copyright (c) 2004, 2007 David Grudl * @copyright Copyright (c) 2004, 2007 David Grudl
* @license http://php7.org/nette/license Nette license * @license http://nettephp.com/license Nette license
* @link http://php7.org/nette/ * @link http://nettephp.com/
* @package Nette * @package Nette
*/ */
abstract class NObject abstract class NObject

BIN
examples/sample.mdb
View File

Binary file not shown.

BIN
examples/sample.sdb
View File

Binary file not shown.

2
icons/example.html
View File

@@ -1,2 +1,2 @@
<a href="http://php7.org/dibi/" title="dibi - tiny 'n' smart database abstraction layer" <a href="http://dibiphp.com" title="dibi - tiny 'n' smart database abstraction layer"
><img src="dibi-powered.gif" width="80" height="15" alt="dibi powered" /></a> ><img src="dibi-powered.gif" width="80" height="15" alt="dibi powered" /></a>

4
readme.txt
View File

@@ -21,7 +21,7 @@ Documentation and Examples
Refer to the 'examples' directory for examples. Dibi documentation is Refer to the 'examples' directory for examples. Dibi documentation is
available on the homepage: available on the homepage:
http://php7.org/dibi/ http://dibiphp.com
@@ -38,4 +38,4 @@ whitespaces are removed.
----- -----
For more information, visit the author's weblog (in czech language): For more information, visit the author's weblog (in czech language):
http://latrine.dgx.cz/ http://latrine.dgx.cz