'; - -// with limit = 2 -$res = dibi::query('SELECT * FROM [products] %lmt', 2); -foreach ($res as $n => $row) { - print_r($row); -} - -echo '
'; - -// with limit = 2, offset = 1 -$res = dibi::query('SELECT * FROM [products] %lmt %ofs', 2, 1); -foreach ($res as $n => $row) { - print_r($row); -} +
dibi apply limit/offset example
+
+ 'sqlite',
+ 'database' => 'sample.sdb',
+));
+
+
+// no limit
+$res = dibi::query('SELECT * FROM [products]');
+foreach ($res as $n => $row) {
+ print_r($row);
+}
+
+echo '
';
+
+// with limit = 2
+$res = dibi::query('SELECT * FROM [products] %lmt', 2);
+foreach ($res as $n => $row) {
+ print_r($row);
+}
+
+echo '
';
+
+// with limit = 2, offset = 1
+$res = dibi::query('SELECT * FROM [products] %lmt %ofs', 2, 1);
+foreach ($res as $n => $row) {
+ print_r($row);
+}
diff --git a/examples/connect.php b/examples/connect.php
index 88279e12..62414272 100644
--- a/examples/connect.php
+++ b/examples/connect.php
@@ -1,145 +1,145 @@
-dibi::connect() example
-Connecting to Sqlite: ';
-try {
- dibi::connect(array(
- 'driver' => 'sqlite',
- 'database' => 'sample.sdb',
- 'result:objects' => TRUE, // fetch rows as objects
- ));
- echo 'OK';
-
-} catch (DibiException $e) {
- echo get_class($e), ': ', $e->getMessage(), "\n";
-}
-echo "\n";
-
-
-
-
-// connects to MySQL using DSN
-echo 'Connecting to MySQL: ';
-try {
- dibi::connect('driver=mysql&host=localhost&username=root&password=xxx&database=test&charset=utf8');
- echo 'OK';
-
-} catch (DibiException $e) {
- echo get_class($e), ': ', $e->getMessage(), "\n";
-}
-echo "
\n";
-
-
-
-
-// connects to MySQLi using array
-echo 'Connecting to MySQL: ';
-try {
- dibi::connect(array(
- 'driver' => 'mysqli',
- 'host' => 'localhost',
- 'username' => 'root',
- 'password' => 'xxx',
- 'database' => 'dibi',
- 'charset' => 'utf8',
- ));
- echo 'OK';
-
-} catch (DibiException $e) {
- echo get_class($e), ': ', $e->getMessage(), "\n";
-}
-echo "
\n";
-
-
-
-
-// connects to ODBC
-echo 'Connecting to ODBC: ';
-try {
- dibi::connect(array(
- 'driver' => 'odbc',
- 'username' => 'root',
- 'password' => '***',
- 'dsn' => 'Driver={Microsoft Access Driver (*.mdb)};Dbq='.dirname(__FILE__).'/sample.mdb',
- ));
- echo 'OK';
-
-} catch (DibiException $e) {
- echo get_class($e), ': ', $e->getMessage(), "\n";
-}
-echo "
\n";
-
-
-
-
-// connects to PostgreSql
-echo 'Connecting to PostgreSql: ';
-try {
- dibi::connect(array(
- 'driver' => 'postgre',
- 'string' => 'host=localhost port=5432 dbname=mary',
- 'persistent' => TRUE,
- ));
- echo 'OK';
-
-} catch (DibiException $e) {
- echo get_class($e), ': ', $e->getMessage(), "\n";
-}
-echo "
\n";
-
-
-
-
-// connects to PDO
-echo 'Connecting to Sqlite via PDO: ';
-try {
- dibi::connect(array(
- 'driver' => 'pdo',
- 'dsn' => 'sqlite2::memory:',
- ));
- echo 'OK';
-
-} catch (DibiException $e) {
- echo get_class($e), ': ', $e->getMessage(), "\n";
-}
-echo "
\n";
-
-
-
-// connects to MS SQL
-echo 'Connecting to MS SQL: ';
-try {
- dibi::connect(array(
- 'driver' => 'mssql',
- 'host' => 'localhost',
- 'username' => 'root',
- 'password' => 'xxx',
- ));
- echo 'OK';
-
-} catch (DibiException $e) {
- echo get_class($e), ': ', $e->getMessage(), "\n";
-}
-echo "
\n";
-
-
-
-// connects to Oracle
-echo 'Connecting to Oracle: ';
-try {
- dibi::connect(array(
- 'driver' => 'oracle',
- 'username' => 'root',
- 'password' => 'xxx',
- 'database' => 'db',
- ));
- echo 'OK';
-
-} catch (DibiException $e) {
- echo get_class($e), ': ', $e->getMessage(), "\n";
-}
+
dibi::connect() example
+Connecting to Sqlite: ';
+try {
+ dibi::connect(array(
+ 'driver' => 'sqlite',
+ 'database' => 'sample.sdb',
+ 'result:objects' => TRUE, // fetch rows as objects
+ ));
+ echo 'OK';
+
+} catch (DibiException $e) {
+ echo get_class($e), ': ', $e->getMessage(), "\n";
+}
+echo "\n";
+
+
+
+
+// connects to MySQL using DSN
+echo 'Connecting to MySQL: ';
+try {
+ dibi::connect('driver=mysql&host=localhost&username=root&password=xxx&database=test&charset=utf8');
+ echo 'OK';
+
+} catch (DibiException $e) {
+ echo get_class($e), ': ', $e->getMessage(), "\n";
+}
+echo "
\n";
+
+
+
+
+// connects to MySQLi using array
+echo 'Connecting to MySQL: ';
+try {
+ dibi::connect(array(
+ 'driver' => 'mysqli',
+ 'host' => 'localhost',
+ 'username' => 'root',
+ 'password' => 'xxx',
+ 'database' => 'dibi',
+ 'charset' => 'utf8',
+ ));
+ echo 'OK';
+
+} catch (DibiException $e) {
+ echo get_class($e), ': ', $e->getMessage(), "\n";
+}
+echo "
\n";
+
+
+
+
+// connects to ODBC
+echo 'Connecting to ODBC: ';
+try {
+ dibi::connect(array(
+ 'driver' => 'odbc',
+ 'username' => 'root',
+ 'password' => '***',
+ 'dsn' => 'Driver={Microsoft Access Driver (*.mdb)};Dbq='.dirname(__FILE__).'/sample.mdb',
+ ));
+ echo 'OK';
+
+} catch (DibiException $e) {
+ echo get_class($e), ': ', $e->getMessage(), "\n";
+}
+echo "
\n";
+
+
+
+
+// connects to PostgreSql
+echo 'Connecting to PostgreSql: ';
+try {
+ dibi::connect(array(
+ 'driver' => 'postgre',
+ 'string' => 'host=localhost port=5432 dbname=mary',
+ 'persistent' => TRUE,
+ ));
+ echo 'OK';
+
+} catch (DibiException $e) {
+ echo get_class($e), ': ', $e->getMessage(), "\n";
+}
+echo "
\n";
+
+
+
+
+// connects to PDO
+echo 'Connecting to Sqlite via PDO: ';
+try {
+ dibi::connect(array(
+ 'driver' => 'pdo',
+ 'dsn' => 'sqlite2::memory:',
+ ));
+ echo 'OK';
+
+} catch (DibiException $e) {
+ echo get_class($e), ': ', $e->getMessage(), "\n";
+}
+echo "
\n";
+
+
+
+// connects to MS SQL
+echo 'Connecting to MS SQL: ';
+try {
+ dibi::connect(array(
+ 'driver' => 'mssql',
+ 'host' => 'localhost',
+ 'username' => 'root',
+ 'password' => 'xxx',
+ ));
+ echo 'OK';
+
+} catch (DibiException $e) {
+ echo get_class($e), ': ', $e->getMessage(), "\n";
+}
+echo "
\n";
+
+
+
+// connects to Oracle
+echo 'Connecting to Oracle: ';
+try {
+ dibi::connect(array(
+ 'driver' => 'oracle',
+ 'username' => 'root',
+ 'password' => 'xxx',
+ 'database' => 'db',
+ ));
+ echo 'OK';
+
+} catch (DibiException $e) {
+ echo get_class($e), ': ', $e->getMessage(), "\n";
+}
echo "
\n";
\ No newline at end of file
diff --git a/examples/datetime.demo.php b/examples/datetime.demo.php
index 9b1535cd..978414a8 100644
--- a/examples/datetime.demo.php
+++ b/examples/datetime.demo.php
@@ -1,28 +1,28 @@
-IDibiVariable example
- 'sqlite',
- 'database' => 'sample.sdb',
- 'format:date' => "'Y-m-d'",
- 'format:datetime' => "'Y-m-d H-i-s'",
-));
-
-
-
-// generate and dump SQL
-dibi::test("
-INSERT INTO [mytable]", array(
- 'id' => 123,
- 'date' => dibi::date('12.3.2007'),
- 'stamp' => dibi::dateTime('23.1.2007 10:23'),
-));
+IDibiVariable example
+ 'sqlite',
+ 'database' => 'sample.sdb',
+ 'format:date' => "'Y-m-d'",
+ 'format:datetime' => "'Y-m-d H-i-s'",
+));
+
+
+
+// generate and dump SQL
+dibi::test("
+INSERT INTO [mytable]", array(
+ 'id' => 123,
+ 'date' => dibi::date('12.3.2007'),
+ 'stamp' => dibi::dateTime('23.1.2007 10:23'),
+));
diff --git a/examples/dibi.table.php b/examples/dibi.table.php
index 5752a1b4..31cf2190 100644
--- a/examples/dibi.table.php
+++ b/examples/dibi.table.php
@@ -1,88 +1,88 @@
-DibiTable demo
-
- 'sqlite',
- 'database' => 'sample.sdb',
-));
-
-dibi::begin();
-
-
-// autodetection: primary keys are customer_id, order_id, ...
-DibiTable::$primaryMask = '%s_id';
-
-
-// table products
-class Products extends DibiTable
-{
-// rely on autodetection...
-// protected $name = 'products';
-// protected $primary = 'product_id';
-
-}
-
-
-
-
-
-// create table object
-$products = new Products();
-
-echo "Table name: $products->name\n";
-echo "Primary key: $products->primary\n";
-
-
-// Finds rows by primary key
-foreach ($products->find(1, 3) as $row) {
- print_r($row);
-}
-
-
-// select all
-$products->findAll()->dump();
-
-
-// select all, order by title, product_id
-$products->findAll('title', $products->primary)->dump();
-
-
-// fetches single row with id 3
-$row = $products->fetch(3);
-
-
-// deletes row from a table
-$count = $products->delete(1);
-
-// deletes multiple rows
-$count = $products->delete(array(1, 2, 3));
-var_dump($count); // number of deleted rows
-
-
-// update row #2 in a table
-$data = (object) NULL;
-$data->title = 'New title';
-$count = $products->update(2, $data);
-var_dump($count); // number of updated rows
-
-
-// update multiple rows in a table
-$count = $products->update(array(3, 5), $data);
-var_dump($count); // number of updated rows
-
-
-// inserts row into a table
-$data = array();
-$data['title'] = 'New product';
-$id = $products->insert($data);
-var_dump($id); // generated id
-
-
-// is absolutely SQL injection safe
-$key = '3 OR 1=1';
-$products->delete($key);
-// --> DELETE FROM [products] WHERE [product_id] IN ( 3 )
+DibiTable demo
+
+ 'sqlite',
+ 'database' => 'sample.sdb',
+));
+
+dibi::begin();
+
+
+// autodetection: primary keys are customer_id, order_id, ...
+DibiTable::$primaryMask = '%s_id';
+
+
+// table products
+class Products extends DibiTable
+{
+// rely on autodetection...
+// protected $name = 'products';
+// protected $primary = 'product_id';
+
+}
+
+
+
+
+
+// create table object
+$products = new Products();
+
+echo "Table name: $products->name\n";
+echo "Primary key: $products->primary\n";
+
+
+// Finds rows by primary key
+foreach ($products->find(1, 3) as $row) {
+ print_r($row);
+}
+
+
+// select all
+$products->findAll()->dump();
+
+
+// select all, order by title, product_id
+$products->findAll('title', $products->primary)->dump();
+
+
+// fetches single row with id 3
+$row = $products->fetch(3);
+
+
+// deletes row from a table
+$count = $products->delete(1);
+
+// deletes multiple rows
+$count = $products->delete(array(1, 2, 3));
+var_dump($count); // number of deleted rows
+
+
+// update row #2 in a table
+$data = (object) NULL;
+$data->title = 'New title';
+$count = $products->update(2, $data);
+var_dump($count); // number of updated rows
+
+
+// update multiple rows in a table
+$count = $products->update(array(3, 5), $data);
+var_dump($count); // number of updated rows
+
+
+// inserts row into a table
+$data = array();
+$data['title'] = 'New product';
+$id = $products->insert($data);
+var_dump($id); // generated id
+
+
+// is absolutely SQL injection safe
+$key = '3 OR 1=1';
+$products->delete($key);
+// --> DELETE FROM [products] WHERE [product_id] IN ( 3 )
diff --git a/examples/dump.php b/examples/dump.php
index b3f2648e..30ed2d19 100644
--- a/examples/dump.php
+++ b/examples/dump.php
@@ -1,30 +1,30 @@
-dibi dump example
- 'sqlite',
- 'database' => 'sample.sdb',
-));
-
-
-
-$res = dibi::query('
-SELECT * FROM [products]
-INNER JOIN [orders] USING ([product_id])
-INNER JOIN [customers] USING ([customer_id])
-');
-
-
-echo 'dibi::dump()
';
-
-// dump last query (dibi::$sql)
-dibi::dump();
-
-
-// dump result table
-echo 'DibiResult::dump()
';
-
-$res->dump();
+dibi dump example
+ 'sqlite',
+ 'database' => 'sample.sdb',
+));
+
+
+
+$res = dibi::query('
+SELECT * FROM [products]
+INNER JOIN [orders] USING ([product_id])
+INNER JOIN [customers] USING ([customer_id])
+');
+
+
+echo 'dibi::dump()
';
+
+// dump last query (dibi::$sql)
+dibi::dump();
+
+
+// dump result table
+echo 'DibiResult::dump()
';
+
+$res->dump();
diff --git a/examples/extension.method.php b/examples/extension.method.php
index 964a7d0a..7612e83e 100644
--- a/examples/extension.method.php
+++ b/examples/extension.method.php
@@ -1,27 +1,27 @@
-dibi extension method example
-
- 'sqlite',
- 'database' => 'sample.sdb',
-));
-
-
-
-// using the "prototype" to add custom method to class DibiResult
-function DibiResult_prototype_fetchShuffle(DibiResult $obj)
-{
- $all = $obj->fetchAll();
- shuffle($all);
- return $all;
-}
-
-
-// fetch complete result set shuffled
-$res = dibi::query('SELECT * FROM [customers]');
-$all = $res->fetchShuffle();
-print_r($all);
+dibi extension method example
+
+ 'sqlite',
+ 'database' => 'sample.sdb',
+));
+
+
+
+// using the "prototype" to add custom method to class DibiResult
+function DibiResult_prototype_fetchShuffle(DibiResult $obj)
+{
+ $all = $obj->fetchAll();
+ shuffle($all);
+ return $all;
+}
+
+
+// fetch complete result set shuffled
+$res = dibi::query('SELECT * FROM [customers]');
+$all = $res->fetchShuffle();
+print_r($all);
diff --git a/examples/fetch.php b/examples/fetch.php
index ce098aba..dd7a5150 100644
--- a/examples/fetch.php
+++ b/examples/fetch.php
@@ -1,93 +1,93 @@
-dibi fetch example
-
- 'sqlite',
- 'database' => 'sample.sdb',
-));
-
-
-/*
-TABLE products
-
-product_id | title
------------+----------
- 1 | Chair
- 2 | Table
- 3 | Computer
-
-*/
-
-
-// fetch a single row
-$row = dibi::fetch('SELECT title FROM [products]');
-print_r($row); // Chair
-echo '
';
-
-
-// fetch a single value
-$value = dibi::fetchSingle('SELECT [title] FROM [products]');
-print_r($value); // Chair
-echo '
';
-
-
-// fetch complete result set
-$all = dibi::fetchAll('SELECT * FROM [products]');
-print_r($all);
-echo '
';
-
-
-// fetch complete result set like association array
-$res = dibi::query('SELECT * FROM [products]');
-$assoc = $res->fetchAssoc('title'); // key
-print_r($assoc);
-echo '
';
-
-
-// fetch complete result set like pairs key => value
-$pairs = $res->fetchPairs('product_id', 'title');
-print_r($pairs);
-echo '
';
-
-
-// fetch row by row
-foreach ($res as $n => $row) {
- print_r($row);
-}
-echo '
';
-
-
-// fetch row by row with defined offset
-foreach ($res->getIterator(2) as $n => $row) {
- print_r($row);
-}
-
-// fetch row by row with defined offset and limit
-foreach ($res->getIterator(2, 1) as $n => $row) {
- print_r($row);
-}
-
-
-// more complex association array
-$res = dibi::query('
-SELECT *
-FROM [products]
-INNER JOIN [orders] USING ([product_id])
-INNER JOIN [customers] USING ([customer_id])
-');
-
-$assoc = $res->fetchAssoc('customers.name,products.title'); // key
-print_r($assoc);
-echo '
';
-
-$assoc = $res->fetchAssoc('customers.name,#,products.title'); // key
-print_r($assoc);
-echo '
';
-
-$assoc = $res->fetchAssoc('customers.name,=,products.title'); // key
-print_r($assoc);
-echo '
';
+dibi fetch example
+
+ 'sqlite',
+ 'database' => 'sample.sdb',
+));
+
+
+/*
+TABLE products
+
+product_id | title
+-----------+----------
+ 1 | Chair
+ 2 | Table
+ 3 | Computer
+
+*/
+
+
+// fetch a single row
+$row = dibi::fetch('SELECT title FROM [products]');
+print_r($row); // Chair
+echo '
';
+
+
+// fetch a single value
+$value = dibi::fetchSingle('SELECT [title] FROM [products]');
+print_r($value); // Chair
+echo '
';
+
+
+// fetch complete result set
+$all = dibi::fetchAll('SELECT * FROM [products]');
+print_r($all);
+echo '
';
+
+
+// fetch complete result set like association array
+$res = dibi::query('SELECT * FROM [products]');
+$assoc = $res->fetchAssoc('title'); // key
+print_r($assoc);
+echo '
';
+
+
+// fetch complete result set like pairs key => value
+$pairs = $res->fetchPairs('product_id', 'title');
+print_r($pairs);
+echo '
';
+
+
+// fetch row by row
+foreach ($res as $n => $row) {
+ print_r($row);
+}
+echo '
';
+
+
+// fetch row by row with defined offset
+foreach ($res->getIterator(2) as $n => $row) {
+ print_r($row);
+}
+
+// fetch row by row with defined offset and limit
+foreach ($res->getIterator(2, 1) as $n => $row) {
+ print_r($row);
+}
+
+
+// more complex association array
+$res = dibi::query('
+SELECT *
+FROM [products]
+INNER JOIN [orders] USING ([product_id])
+INNER JOIN [customers] USING ([customer_id])
+');
+
+$assoc = $res->fetchAssoc('customers.name,products.title'); // key
+print_r($assoc);
+echo '
';
+
+$assoc = $res->fetchAssoc('customers.name,#,products.title'); // key
+print_r($assoc);
+echo '
';
+
+$assoc = $res->fetchAssoc('customers.name,=,products.title'); // key
+print_r($assoc);
+echo '
';
diff --git a/examples/fluent.test.php b/examples/fluent.test.php
index 0126f625..374a6363 100644
--- a/examples/fluent.test.php
+++ b/examples/fluent.test.php
@@ -1,63 +1,63 @@
-dibi dump example
- 'sqlite',
- 'database' => 'sample.sdb',
-));
-
-
-$id = 10;
-$record = array(
- 'title' => 'Drtička na trávu',
- 'price' => 318,
- 'active' => TRUE,
-);
-
-// SELECT ...
-dibi::select('product_id')->as('id')
- ->select('title')
- ->from('products')
- ->innerJoin('orders')->using('(product_id)')
- ->innerJoin('customers USING (customer_id)')
- ->orderBy('title')
- ->test();
-
-echo "\n";
-
-// INSERT ...
-dibi::insert('products', $record)
- ->setFlag('IGNORE')
- ->test();
-
-echo "\n";
-
-// UPDATE ...
-dibi::update('products', $record)
- ->where('product_id = %d', $id)
- ->test();
-
-echo "\n";
-
-// DELETE ...
-dibi::delete('products')
- ->where('product_id = %d', $id)
- ->test();
-
-echo "\n";
-
-// custom commands
-dibi::command()
- ->update('products')
- ->where('product_id = %d', $id)
- ->set($record)
- ->test();
-
-echo "\n";
-
-dibi::command()
- ->truncate('products')
- ->test();
+dibi dump example
+ 'sqlite',
+ 'database' => 'sample.sdb',
+));
+
+
+$id = 10;
+$record = array(
+ 'title' => 'Drtička na trávu',
+ 'price' => 318,
+ 'active' => TRUE,
+);
+
+// SELECT ...
+dibi::select('product_id')->as('id')
+ ->select('title')
+ ->from('products')
+ ->innerJoin('orders')->using('(product_id)')
+ ->innerJoin('customers USING (customer_id)')
+ ->orderBy('title')
+ ->test();
+
+echo "\n";
+
+// INSERT ...
+dibi::insert('products', $record)
+ ->setFlag('IGNORE')
+ ->test();
+
+echo "\n";
+
+// UPDATE ...
+dibi::update('products', $record)
+ ->where('product_id = %d', $id)
+ ->test();
+
+echo "\n";
+
+// DELETE ...
+dibi::delete('products')
+ ->where('product_id = %d', $id)
+ ->test();
+
+echo "\n";
+
+// custom commands
+dibi::command()
+ ->update('products')
+ ->where('product_id = %d', $id)
+ ->set($record)
+ ->test();
+
+echo "\n";
+
+dibi::command()
+ ->truncate('products')
+ ->test();
diff --git a/examples/load-sql-dump.php b/examples/load-sql-dump.php
index 5eedc6b5..07071372 100644
--- a/examples/load-sql-dump.php
+++ b/examples/load-sql-dump.php
@@ -1,16 +1,16 @@
-dibi import SQL dump example
-
- 'sqlite',
- 'database' => 'sample.sdb',
-));
-
-
-$count = dibi::loadFile('compress.zlib://dump.sql.gz');
-
+dibi import SQL dump example
+
+ 'sqlite',
+ 'database' => 'sample.sdb',
+));
+
+
+$count = dibi::loadFile('compress.zlib://dump.sql.gz');
+
echo 'Number of SQL commands:', $count;
\ No newline at end of file
diff --git a/examples/logger.php b/examples/logger.php
index 0a291865..306ac821 100644
--- a/examples/logger.php
+++ b/examples/logger.php
@@ -1,32 +1,32 @@
-dibi logger example
- 'sqlite',
- 'database' => 'sample.sdb',
-));
-
-
-
-try {
- $res = dibi::query('SELECT * FROM [customers] WHERE [customer_id] = %i', 1);
-
- $res = dibi::query('SELECT * FROM [customers] WHERE [customer_id] < %i', 5);
-
- $res = dibi::query('SELECT FROM [customers] WHERE [customer_id] < %i', 38);
-
-} catch (DibiException $e) {
- echo '', get_class($e), ': ', $e->getMessage(), '
';
-}
-
-
-echo "File log.sql:
";
-
-echo '', file_get_contents('log.sql'), '';
+dibi logger example
+ 'sqlite',
+ 'database' => 'sample.sdb',
+));
+
+
+
+try {
+ $res = dibi::query('SELECT * FROM [customers] WHERE [customer_id] = %i', 1);
+
+ $res = dibi::query('SELECT * FROM [customers] WHERE [customer_id] < %i', 5);
+
+ $res = dibi::query('SELECT FROM [customers] WHERE [customer_id] < %i', 38);
+
+} catch (DibiException $e) {
+ echo '', get_class($e), ': ', $e->getMessage(), '
';
+}
+
+
+echo "File log.sql:
";
+
+echo '', file_get_contents('log.sql'), '';
diff --git a/examples/metatypes.php b/examples/metatypes.php
index d77f5b42..5e4484ff 100644
--- a/examples/metatypes.php
+++ b/examples/metatypes.php
@@ -1,21 +1,21 @@
-dibi metatypes example
-
- 'sqlite',
- 'database' => 'sample.sdb',
-));
-
-
-$res = dibi::query('SELECT * FROM [customers]');
-
-// auto-convert this column to integer
-$res->setType('customer_id', Dibi::FIELD_INTEGER);
-$res->setType('added', Dibi::FIELD_DATETIME, 'H:i j.n.Y');
-
-$row = $res->fetch();
-var_dump($row);
+dibi metatypes example
+
+ 'sqlite',
+ 'database' => 'sample.sdb',
+));
+
+
+$res = dibi::query('SELECT * FROM [customers]');
+
+// auto-convert this column to integer
+$res->setType('customer_id', Dibi::FIELD_INTEGER);
+$res->setType('added', Dibi::FIELD_DATETIME, 'H:i j.n.Y');
+
+$row = $res->fetch();
+var_dump($row);
diff --git a/examples/nette-debug.php b/examples/nette-debug.php
index ae73c5c9..c26c41e7 100644
--- a/examples/nette-debug.php
+++ b/examples/nette-debug.php
@@ -1,19 +1,19 @@
-Nette::Debug && dibi example
- 'sqlite',
- 'database' => 'sample.sdb',
-));
-
-
-
-// throws error
-dibi::query('SELECT FROM [customers] WHERE [customer_id] < %i', 38);
+Nette::Debug && dibi example
+ 'sqlite',
+ 'database' => 'sample.sdb',
+));
+
+
+
+// throws error
+dibi::query('SELECT FROM [customers] WHERE [customer_id] < %i', 38);
diff --git a/examples/profiler.php b/examples/profiler.php
index fede2305..4e762240 100644
--- a/examples/profiler.php
+++ b/examples/profiler.php
@@ -1,25 +1,25 @@
-Dibi profiler example
- 'sqlite',
- 'database' => 'sample.sdb',
-));
-
-
-for ($i=0; $i<20; $i++) {
- $res = dibi::query('SELECT * FROM [customers] WHERE [customer_id] < %i', $i);
-}
-
-?>
-
-Last query:
-
-Number of queries:
-
-Elapsed time for last query: ms
-
-Total elapsed time: ms
+Dibi profiler example
+ 'sqlite',
+ 'database' => 'sample.sdb',
+));
+
+
+for ($i=0; $i<20; $i++) {
+ $res = dibi::query('SELECT * FROM [customers] WHERE [customer_id] < %i', $i);
+}
+
+?>
+
+Last query:
+
+Number of queries:
+
+Elapsed time for last query: ms
+
+Total elapsed time: ms
diff --git a/examples/sql-builder.php b/examples/sql-builder.php
index e9fcb777..256c8dcf 100644
--- a/examples/sql-builder.php
+++ b/examples/sql-builder.php
@@ -1,66 +1,66 @@
-
-dibi SQL builder example
-
- 'sqlite',
- 'database' => 'sample.sdb',
-));
-
-
-// dibi detects INSERT or REPLACE command
-dibi::test('
-REPLACE INTO [products]', array(
- 'title' => 'Drtika na trvu',
- 'price' => 318,
- 'active' => TRUE,
-));
-
-
-// multiple INSERT command
-$array = array(
- 'title' => 'Super Product',
- 'price' => 12,
- 'brand' => NULL,
- 'created' => dibi::datetime(),
-);
-dibi::test("INSERT INTO [products]", $array, $array, $array);
-
-
-// dibi detects UPDATE command
-dibi::test("
-UPDATE [colors] SET", array(
- 'color' => 'blue',
- 'order' => 12,
-), "
-WHERE [id]=%i", 123);
-
-
-// SELECT
-$ipMask = '192.168.%';
-$timestamp = mktime(0, 0, 0, 10, 13, 1997);
-
-dibi::test('
-SELECT COUNT(*) as [count]
-FROM [comments]
-WHERE [ip] LIKE %s', $ipMask, '
-AND [date] > ', dibi::date($timestamp)
-);
-
-
-// IN array
-$array = array(1, 2, 3);
-dibi::test("
-SELECT *
-FROM [people]
-WHERE [id] IN (", $array, ")
-");
+
+dibi SQL builder example
+
+ 'sqlite',
+ 'database' => 'sample.sdb',
+));
+
+
+// dibi detects INSERT or REPLACE command
+dibi::test('
+REPLACE INTO [products]', array(
+ 'title' => 'Drtika na trvu',
+ 'price' => 318,
+ 'active' => TRUE,
+));
+
+
+// multiple INSERT command
+$array = array(
+ 'title' => 'Super Product',
+ 'price' => 12,
+ 'brand' => NULL,
+ 'created' => dibi::datetime(),
+);
+dibi::test("INSERT INTO [products]", $array, $array, $array);
+
+
+// dibi detects UPDATE command
+dibi::test("
+UPDATE [colors] SET", array(
+ 'color' => 'blue',
+ 'order' => 12,
+), "
+WHERE [id]=%i", 123);
+
+
+// SELECT
+$ipMask = '192.168.%';
+$timestamp = mktime(0, 0, 0, 10, 13, 1997);
+
+dibi::test('
+SELECT COUNT(*) as [count]
+FROM [comments]
+WHERE [ip] LIKE %s', $ipMask, '
+AND [date] > ', dibi::date($timestamp)
+);
+
+
+// IN array
+$array = array(1, 2, 3);
+dibi::test("
+SELECT *
+FROM [people]
+WHERE [id] IN (", $array, ")
+");
diff --git a/examples/sql-condition.php b/examples/sql-condition.php
index 4c373c8a..f17cf123 100644
--- a/examples/sql-condition.php
+++ b/examples/sql-condition.php
@@ -1,51 +1,51 @@
-
-dibi conditional SQL example
-
- 'sqlite',
- 'database' => 'sample.sdb',
-));
-
-
-$cond1 = rand(0,2) < 1;
-$cond2 = rand(0,2) < 1;
-$foo = -1;
-$bar = 2;
-
-
-$name = $cond1 ? 'K%' : NULL;
-
-// if & end
-dibi::test('
-SELECT *
-FROM [customers]
-%if', isset($name), 'WHERE [name] LIKE %s', $name, '%end'
-);
-
-
-// if & else & (optional) end
-dibi::test("
-SELECT *
-FROM [people]
-WHERE [id] > 0
- %if", ($foo > 0), "AND [foo]=%i", $foo, "
- %else %if", ($bar > 0), "AND [bar]=%i", $bar, "
-");
-
-
-// nested condition
-dibi::test('
-SELECT *
-FROM [customers]
-WHERE
- %if', isset($name), '[name] LIKE %s', $name, '
- %if', $cond2, 'AND [admin]=1 %end
- %else 1 LIMIT 10 %end'
-);
+
+dibi conditional SQL example
+
+ 'sqlite',
+ 'database' => 'sample.sdb',
+));
+
+
+$cond1 = rand(0,2) < 1;
+$cond2 = rand(0,2) < 1;
+$foo = -1;
+$bar = 2;
+
+
+$name = $cond1 ? 'K%' : NULL;
+
+// if & end
+dibi::test('
+SELECT *
+FROM [customers]
+%if', isset($name), 'WHERE [name] LIKE %s', $name, '%end'
+);
+
+
+// if & else & (optional) end
+dibi::test("
+SELECT *
+FROM [people]
+WHERE [id] > 0
+ %if", ($foo > 0), "AND [foo]=%i", $foo, "
+ %else %if", ($bar > 0), "AND [bar]=%i", $bar, "
+");
+
+
+// nested condition
+dibi::test('
+SELECT *
+FROM [customers]
+WHERE
+ %if', isset($name), '[name] LIKE %s', $name, '
+ %if', $cond2, 'AND [admin]=1 %end
+ %else 1 LIMIT 10 %end'
+);
diff --git a/examples/table-prefix.php b/examples/table-prefix.php
index 9a36ceae..fc13185c 100644
--- a/examples/table-prefix.php
+++ b/examples/table-prefix.php
@@ -1,44 +1,44 @@
-dibi prefix & substitute example
- 'sqlite',
- 'database' => 'sample.sdb',
-));
-
-
-// create new substitution :blog: ==> wp_
-dibi::addSubst('blog', 'wp_');
-
-
-// generate and dump SQL
-dibi::test("UPDATE [:blog:items] SET [text]='Hello World'");
-
-
-
-
-// create new substitution :: (empty) ==> my_
-dibi::addSubst('', 'my_');
-
-
-// generate and dump SQL
-dibi::test("UPDATE [database.::table] SET [text]='Hello World'");
-
-
-
-
-
-function substFallBack($expr)
-{
- return 'the_' . $expr;
-}
-
-// create substitution fallback
-dibi::setSubstFallBack('substFallBack');
-
-
-// generate and dump SQL
-dibi::test("UPDATE [:account:user] SET [name]='John Doe'");
+dibi prefix & substitute example
+ 'sqlite',
+ 'database' => 'sample.sdb',
+));
+
+
+// create new substitution :blog: ==> wp_
+dibi::addSubst('blog', 'wp_');
+
+
+// generate and dump SQL
+dibi::test("UPDATE [:blog:items] SET [text]='Hello World'");
+
+
+
+
+// create new substitution :: (empty) ==> my_
+dibi::addSubst('', 'my_');
+
+
+// generate and dump SQL
+dibi::test("UPDATE [database.::table] SET [text]='Hello World'");
+
+
+
+
+
+function substFallBack($expr)
+{
+ return 'the_' . $expr;
+}
+
+// create substitution fallback
+dibi::setSubstFallBack('substFallBack');
+
+
+// generate and dump SQL
+dibi::test("UPDATE [:account:user] SET [name]='John Doe'");
diff --git a/examples/transaction.php b/examples/transaction.php
index 7b316e8b..14f43443 100644
--- a/examples/transaction.php
+++ b/examples/transaction.php
@@ -1,28 +1,28 @@
-dibi transaction example
-
- 'sqlite',
- 'database' => 'sample.sdb',
-));
-
-
-echo "Before:
\n";
-dibi::query('SELECT * FROM [products]')->dump();
-
-
-
-dibi::begin();
-dibi::query('INSERT INTO [products]', array(
- 'title' => 'Test product',
-));
-dibi::rollback(); // or dibi::commit();
-
-
-
-echo "After:
\n";
+dibi transaction example
+
+ 'sqlite',
+ 'database' => 'sample.sdb',
+));
+
+
+echo "Before:
\n";
+dibi::query('SELECT * FROM [products]')->dump();
+
+
+
+dibi::begin();
+dibi::query('INSERT INTO [products]', array(
+ 'title' => 'Test product',
+));
+dibi::rollback(); // or dibi::commit();
+
+
+
+echo "After:
\n";
dibi::query('SELECT * FROM [products]')->dump();
\ No newline at end of file
diff --git a/icons/example.html b/icons/example.html
index 80cfd835..f6e0e7f2 100644
--- a/icons/example.html
+++ b/icons/example.html
@@ -1,2 +1,2 @@
-
+
diff --git a/license.cs.txt b/license.cs.txt
index 1c73580d..9f7bb367 100644
--- a/license.cs.txt
+++ b/license.cs.txt
@@ -1,69 +1,69 @@
-----------------------------------------------------------------------------------
-Tento text je NEOFICILNM pekladem "Dibi license". Nevyjaduje prvn podstatu
-podmnek pro en tohoto softwaru - k tomuto elu slou vhradn pvodn
-anglick verze licence.
-----------------------------------------------------------------------------------
-
-
-Dibi Licence, verze 1
-======================
-
-Copyright (c) 2005, 2008 David Grudl (http://davidgrudl.com)
-Vechna prva vyhrazena.
-
-Tato licence je prvn ujednn mezi vmi a Davidem Grudlem (dle Author)
-pro poteby pouit "dibi" (dle "Software"). Zsknm, pouitm
-a/nebo zkoprovnm Software projevujete souhlas s tm, e jste peetli,
-porozumli a budete jednat v souladu s podmnkami tto licence.
-
-
-POVOLEN POUIT
-----------------
-
-Je povoleno pouvat, koprovat, modifikovat a distribuovat Software
-a jeho dokumentaci, v pvodnm i upravovanm tvaru, pro jakkoliv el,
-za pedpokladu, e jsou splnny tyto podmnky:
-
-1. Kopie tto licenn smlouvy mus bt soust distribuce.
-
-2. en zdrojov kd mus zachovat ve uvedenou informaci o autorskch
- prvech ve vech souborech zdrojovho kdu.
-
-3. en binrn tvar mus reprodukovat ve uvedenou informaci o autorskch
- prvech v dokumentaci a/nebo jinch materilech poskytovanch s distribuc.
-
-4. Produkty odvozen od Software mus obsahovat potvrzen, e jsou odvozen
- od "dibi", ve sv dokumentaci a/nebo jinch materilech
- poskytovanch s distribuc.
-
-5. Nzev "dibi" nesm bt pouit pi podpoe nebo propagaci produkt
- odvozenmi ze Software bez pedchozho psemnho souhlasu Autora.
-
-6. Produkty odvozen od Software nesm bt nazvny "dibi",
- ani se nesm "dibi" objevit v jejich nzvu bez pedchozho
- psemnho souhlasu Autora.
-
-
-ZBAVEN ZODPOVDNOSTI
----------------------
-
-Souhlaste se zbavenm zodpovdnosti a krytm Autora a pispvatel vi
-jakmkoliv pmm, nepmm, nhodnm nebo nslednm odjinud pochzejcm kodm,
-alobm nebo sporm, jako i ped vemi souvisejcmi nklady, zvazky,
-odkodnnmi, hradami nebo poplatky vyplvajcch z pouvn nebo
-nesprvnho uit Software, nebo z poruen podmnek tto licence.
-
-
-ZRUKA SE NEPOSKYTUJE
----------------------
-
-TENTO SOFTWARE JE POSKYTOVN DRITELEM LICENCE A JEHO PISPVATELI "JAK STOJ A LE"
-A JAKKOLIV VSLOVN NEBO PEDPOKLDAN ZRUKY VETN, ALE NEJEN, PEDPOKLDANCH
-OBCHODNCH ZRUK A ZRUKY VHODNOSTI PRO JAKKOLIV EL JSOU POPENY.
-DRITEL, ANI PISPVATEL NEBUDOU V DNM PPAD ODPOVDNI ZA JAKKOLIV PM,
-NEPM, NHODN, ZVLTN, PKLADN NEBO VYPLVAJC KODY (VETN, ALE NEJEN,
-KOD VZNIKLCH NARUENM DODVEK ZBO NEBO SLUEB; ZTRTOU POUITELNOSTI,
-DAT NEBO ZISK; NEBO PERUENM OBCHODN INNOSTI) JAKKOLIV ZPSOBEN NA ZKLAD
-JAKKOLIV TEORIE O ZODPOVDNOSTI, A U PLYNOUC Z JINHO SMLUVNHO VZTAHU,
-URIT ZODPOVDNOSTI NEBO PEINU (VETN NEDBALOSTI) NA JAKMKOLIV ZPSOBU POUIT
+----------------------------------------------------------------------------------
+Tento text je NEOFICILNM pekladem "Dibi license". Nevyjaduje prvn podstatu
+podmnek pro en tohoto softwaru - k tomuto elu slou vhradn pvodn
+anglick verze licence.
+----------------------------------------------------------------------------------
+
+
+Dibi Licence, verze 1
+======================
+
+Copyright (c) 2005, 2008 David Grudl (http://davidgrudl.com)
+Vechna prva vyhrazena.
+
+Tato licence je prvn ujednn mezi vmi a Davidem Grudlem (dle Author)
+pro poteby pouit "dibi" (dle "Software"). Zsknm, pouitm
+a/nebo zkoprovnm Software projevujete souhlas s tm, e jste peetli,
+porozumli a budete jednat v souladu s podmnkami tto licence.
+
+
+POVOLEN POUIT
+----------------
+
+Je povoleno pouvat, koprovat, modifikovat a distribuovat Software
+a jeho dokumentaci, v pvodnm i upravovanm tvaru, pro jakkoliv el,
+za pedpokladu, e jsou splnny tyto podmnky:
+
+1. Kopie tto licenn smlouvy mus bt soust distribuce.
+
+2. en zdrojov kd mus zachovat ve uvedenou informaci o autorskch
+ prvech ve vech souborech zdrojovho kdu.
+
+3. en binrn tvar mus reprodukovat ve uvedenou informaci o autorskch
+ prvech v dokumentaci a/nebo jinch materilech poskytovanch s distribuc.
+
+4. Produkty odvozen od Software mus obsahovat potvrzen, e jsou odvozen
+ od "dibi", ve sv dokumentaci a/nebo jinch materilech
+ poskytovanch s distribuc.
+
+5. Nzev "dibi" nesm bt pouit pi podpoe nebo propagaci produkt
+ odvozenmi ze Software bez pedchozho psemnho souhlasu Autora.
+
+6. Produkty odvozen od Software nesm bt nazvny "dibi",
+ ani se nesm "dibi" objevit v jejich nzvu bez pedchozho
+ psemnho souhlasu Autora.
+
+
+ZBAVEN ZODPOVDNOSTI
+---------------------
+
+Souhlaste se zbavenm zodpovdnosti a krytm Autora a pispvatel vi
+jakmkoliv pmm, nepmm, nhodnm nebo nslednm odjinud pochzejcm kodm,
+alobm nebo sporm, jako i ped vemi souvisejcmi nklady, zvazky,
+odkodnnmi, hradami nebo poplatky vyplvajcch z pouvn nebo
+nesprvnho uit Software, nebo z poruen podmnek tto licence.
+
+
+ZRUKA SE NEPOSKYTUJE
+---------------------
+
+TENTO SOFTWARE JE POSKYTOVN DRITELEM LICENCE A JEHO PISPVATELI "JAK STOJ A LE"
+A JAKKOLIV VSLOVN NEBO PEDPOKLDAN ZRUKY VETN, ALE NEJEN, PEDPOKLDANCH
+OBCHODNCH ZRUK A ZRUKY VHODNOSTI PRO JAKKOLIV EL JSOU POPENY.
+DRITEL, ANI PISPVATEL NEBUDOU V DNM PPAD ODPOVDNI ZA JAKKOLIV PM,
+NEPM, NHODN, ZVLTN, PKLADN NEBO VYPLVAJC KODY (VETN, ALE NEJEN,
+KOD VZNIKLCH NARUENM DODVEK ZBO NEBO SLUEB; ZTRTOU POUITELNOSTI,
+DAT NEBO ZISK; NEBO PERUENM OBCHODN INNOSTI) JAKKOLIV ZPSOBEN NA ZKLAD
+JAKKOLIV TEORIE O ZODPOVDNOSTI, A U PLYNOUC Z JINHO SMLUVNHO VZTAHU,
+URIT ZODPOVDNOSTI NEBO PEINU (VETN NEDBALOSTI) NA JAKMKOLIV ZPSOBU POUIT
TOHOTO SOFTWARE, I V PPAD, E DRITEL PRV BYL UPOZORNN NA MONOST TAKOVCH KOD.
\ No newline at end of file
diff --git a/license.txt b/license.txt
index 5d95148f..40e698dd 100644
--- a/license.txt
+++ b/license.txt
@@ -1,62 +1,62 @@
-The Dibi License, Version 1
-============================
-
-Copyright (c) 2005, 2008 David Grudl (http://davidgrudl.com)
-All rights reserved.
-
-This license is a legal agreement between you and David Grudl (the "Author")
-for the use of "dibi" (the "Software"). By obtaining, using and/or
-copying the Software, you agree that you have read, understood, and will
-comply with the terms and conditions of this license.
-
-
-PERMITTED USE
--------------
-
-You are permitted to use, copy, modify, and distribute the Software and its
-documentation, with or without modification, for any purpose, provided that
-the following conditions are met:
-
-1. A copy of this license agreement must be included with the distribution.
-
-2. Redistributions of source code must retain the above copyright notice in
- all source code files.
-
-3. Redistributions in binary form must reproduce the above copyright notice
- in the documentation and/or other materials provided with the distribution.
-
-4. Products derived from the Software must include an acknowledgment that
- they are derived from "dibi" in their documentation and/or other
- materials provided with the distribution.
-
-5. The name "dibi" must not be used to endorse or promote products
- derived from the Software without prior written permission from Author.
-
-6. Products derived from the Software may not be called "dibi",
- nor may "dibi" appear in their name, without prior written
- permission from Author.
-
-
-INDEMNITY
----------
-
-You agree to indemnify and hold harmless the Author and any contributors
-for any direct, indirect, incidental, or consequential third-party claims,
-actions or suits, as well as any related expenses, liabilities, damages,
-settlements or fees arising from your use or misuse of the Software,
-or a violation of any terms of this license.
-
-
-DISCLAIMER OF WARRANTY
-----------------------
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+The Dibi License, Version 1
+============================
+
+Copyright (c) 2005, 2008 David Grudl (http://davidgrudl.com)
+All rights reserved.
+
+This license is a legal agreement between you and David Grudl (the "Author")
+for the use of "dibi" (the "Software"). By obtaining, using and/or
+copying the Software, you agree that you have read, understood, and will
+comply with the terms and conditions of this license.
+
+
+PERMITTED USE
+-------------
+
+You are permitted to use, copy, modify, and distribute the Software and its
+documentation, with or without modification, for any purpose, provided that
+the following conditions are met:
+
+1. A copy of this license agreement must be included with the distribution.
+
+2. Redistributions of source code must retain the above copyright notice in
+ all source code files.
+
+3. Redistributions in binary form must reproduce the above copyright notice
+ in the documentation and/or other materials provided with the distribution.
+
+4. Products derived from the Software must include an acknowledgment that
+ they are derived from "dibi" in their documentation and/or other
+ materials provided with the distribution.
+
+5. The name "dibi" must not be used to endorse or promote products
+ derived from the Software without prior written permission from Author.
+
+6. Products derived from the Software may not be called "dibi",
+ nor may "dibi" appear in their name, without prior written
+ permission from Author.
+
+
+INDEMNITY
+---------
+
+You agree to indemnify and hold harmless the Author and any contributors
+for any direct, indirect, incidental, or consequential third-party claims,
+actions or suits, as well as any related expenses, liabilities, damages,
+settlements or fees arising from your use or misuse of the Software,
+or a violation of any terms of this license.
+
+
+DISCLAIMER OF WARRANTY
+----------------------
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/readme.txt b/readme.txt
index d394c60f..8c55f45d 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,41 +1,41 @@
-Dibi (c) David Grudl, 2005-2008 (http://davidgrudl.com)
-
-
-
-Introduction
-------------
-
-Thank you for downloading Dibi!
-
-Database access functions in PHP are not standardised. This is class library
-to hide the differences between the different databases access.
-
-The files in this archive are released under the Dibi license.
-See license.txt in this directory for a copy of the license.
-
-
-
-Documentation and Examples
---------------------------
-
-Refer to the 'examples' directory for examples. Dibi documentation is
-available on the homepage:
-
-http://dibiphp.com
-
-
-
-Dibi.compact
-------------
-
-This is shrinked single-file version of whole Dibi, useful when you don't
-want to modify library, but just use it.
-
-This is exactly the same as normal version, just only comments and
-whitespaces are removed.
-
-
-
------
-For more information, visit the author's weblog (in czech language):
-http://phpfashion.com
+Dibi (c) David Grudl, 2005-2008 (http://davidgrudl.com)
+
+
+
+Introduction
+------------
+
+Thank you for downloading Dibi!
+
+Database access functions in PHP are not standardised. This is class library
+to hide the differences between the different databases access.
+
+The files in this archive are released under the Dibi license.
+See license.txt in this directory for a copy of the license.
+
+
+
+Documentation and Examples
+--------------------------
+
+Refer to the 'examples' directory for examples. Dibi documentation is
+available on the homepage:
+
+http://dibiphp.com
+
+
+
+Dibi.compact
+------------
+
+This is shrinked single-file version of whole Dibi, useful when you don't
+want to modify library, but just use it.
+
+This is exactly the same as normal version, just only comments and
+whitespaces are removed.
+
+
+
+-----
+For more information, visit the author's weblog (in czech language):
+http://phpfashion.com
diff --git a/version.txt b/version.txt
index a89c6c34..a111776a 100644
--- a/version.txt
+++ b/version.txt
@@ -1,4 +1,3 @@
-Dibi version 0.9
-
-Revision: $WCREV$
-Date: $WCDATE$
+Dibi 0.9 (revision $WCREV$)
+
+Released on $WCDATE$