From 9ddab65bc00961315ebdfa5978d42dca550e35db Mon Sep 17 00:00:00 2001 From: Timothy Warren Date: Tue, 7 Feb 2012 16:23:41 -0500 Subject: [PATCH] Fixed create_database function signature, fixed typo in README --- README.md | 2 +- src/common/db_pdo.php | 2 +- src/databases/firebird_manip.php | 2 +- src/databases/mysql_manip.php | 2 +- src/databases/odbc_manip.php | 2 +- src/databases/pgsql_manip.php | 2 +- src/databases/sqlite_manip.php | 2 +- tests/test_dbs/FB_TEST_DB.FDB | Bin 802816 -> 802816 bytes 8 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 6b4f720..c31d2de 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Because php-gtk is such a pain to compile on Windows, I've put together this pac ## PHP Requirements * Version 5.2 - 5.3.* -* PHP-Cario PECL extension +* PHP-Cairo PECL extension * [PHP-GTK](http://gtk.php.net) PHP Extension * Curl * OpenSSL diff --git a/src/common/db_pdo.php b/src/common/db_pdo.php index d2a51f8..e22b440 100644 --- a/src/common/db_pdo.php +++ b/src/common/db_pdo.php @@ -159,6 +159,6 @@ abstract class db_manip { * * @return string */ - abstract function create_table($name, $columns, $constraints, $indexes); + abstract function create_table($name, $columns, $constraints=array(), $indexes=array()); } // End of db_pdo.php \ No newline at end of file diff --git a/src/databases/firebird_manip.php b/src/databases/firebird_manip.php index f55b834..931786c 100644 --- a/src/databases/firebird_manip.php +++ b/src/databases/firebird_manip.php @@ -19,7 +19,7 @@ */ class firebird_manip extends db_manip{ - function create_table($name, $fields, $constraints=array()) + function create_table($name, $fields, $constraints=array(), $indexes=array()) { $sql = "CREATE TABLE {$name}"; } diff --git a/src/databases/mysql_manip.php b/src/databases/mysql_manip.php index 3561247..3820c51 100644 --- a/src/databases/mysql_manip.php +++ b/src/databases/mysql_manip.php @@ -17,7 +17,7 @@ */ class MySQL_manip extends db_manip{ - function create_table($name, $columns, $constraints, $indexes) + function create_table($name, $columns, $constraints=array(), $indexes=array()) { //TODO: implement } diff --git a/src/databases/odbc_manip.php b/src/databases/odbc_manip.php index 0f55e4f..f6d6f65 100644 --- a/src/databases/odbc_manip.php +++ b/src/databases/odbc_manip.php @@ -19,7 +19,7 @@ */ class ODBC_manip extends db_manip { - function create_table() + function create_table($name, $columns, $constraints=array(), $indexes=array()) { //ODBC can't know how to create a table return FALSE; diff --git a/src/databases/pgsql_manip.php b/src/databases/pgsql_manip.php index ace0c62..008246a 100644 --- a/src/databases/pgsql_manip.php +++ b/src/databases/pgsql_manip.php @@ -19,7 +19,7 @@ */ class pgSQL_manip extends db_manip { - function create_table($name, $columns, $constraints, $indexes) + function create_table($name, $columns, $constraints=array(), $indexes=array()) { //TODO: implement } diff --git a/src/databases/sqlite_manip.php b/src/databases/sqlite_manip.php index 3200663..c996881 100644 --- a/src/databases/sqlite_manip.php +++ b/src/databases/sqlite_manip.php @@ -26,7 +26,7 @@ class SQLite_manip extends db_manip { * @param array $indexes // column => index pairs * @return string */ - function create_table($name, $columns, $constraints, $indexes) + function create_table($name, $columns, $constraints=array(), $indexes=array()) { $column_array = array(); diff --git a/tests/test_dbs/FB_TEST_DB.FDB b/tests/test_dbs/FB_TEST_DB.FDB index a57eef14bdda24e92050e36c3cfd155e9f8d5ce0..cc2d286fdc2b14746e1f03dc2168a12fd3426e0f 100755 GIT binary patch delta 57 zcmV~$%N0N{6hJ{i{NiYZEbhWeYtP~qpcqwX%1lI!s5v#~u|0WDv#Q{Uk;}L delta 57 zcmV~$u>n9Z6aY~{5V8v?u25O+D{cV8n8H%ti)axor|vxJllN3^BuOuWjFM%NSr#d> J%Jx#f>j#;!4x<17