diff --git a/examples/data/sample.sdb b/examples/data/sample.sdb deleted file mode 100644 index 01fa5119..00000000 Binary files a/examples/data/sample.sdb and /dev/null differ diff --git a/tests/dibi/DibiConnection.fetch.phpt b/tests/dibi/DibiConnection.fetch.phpt index c8723e40..5ddd5f97 100644 --- a/tests/dibi/DibiConnection.fetch.phpt +++ b/tests/dibi/DibiConnection.fetch.phpt @@ -12,16 +12,6 @@ $conn = new DibiConnection($config); $conn->loadFile(__DIR__ . "/data/$config[system].sql"); -function num($n) -{ - global $config; - if (substr(@$config['dsn'], 0, 5) === 'odbc:' || $config['driver'] === 'sqlite') { - $n = is_float($n) ? "$n.0" : (string) $n; - } - return $n; -} - - // fetch a single value $res = $conn->query('SELECT [title] FROM [products]'); Assert::same('Chair', $res->fetchSingle()); diff --git a/tests/dibi/DibiFluent.fetch.phpt b/tests/dibi/DibiFluent.fetch.phpt index 088b019a..b6aa4474 100644 --- a/tests/dibi/DibiFluent.fetch.phpt +++ b/tests/dibi/DibiFluent.fetch.phpt @@ -12,16 +12,6 @@ $conn = new DibiConnection($config); $conn->loadFile(__DIR__ . "/data/$config[system].sql"); -function num($n) -{ - global $config; - if (substr(@$config['dsn'], 0, 5) === 'odbc:' || $config['driver'] === 'sqlite') { - $n = is_float($n) ? "$n.0" : (string) $n; - } - return $n; -} - - // fetch a single value $res = $conn->select('title')->from('products')->orderBy('product_id'); Assert::equal('Chair', $res->fetchSingle()); diff --git a/tests/dibi/DibiFluent.select.phpt b/tests/dibi/DibiFluent.select.phpt index dd9a4a7c..b9540dca 100644 --- a/tests/dibi/DibiFluent.select.phpt +++ b/tests/dibi/DibiFluent.select.phpt @@ -80,16 +80,6 @@ Assert::same( ); -try { - $fluent = $conn->select('*')->from('table')->fetch(); -} catch (Exception $e) { -} -Assert::same( - reformat(' SELECT * FROM [table] LIMIT 1'), - dibi::$sql -); - - $fluent = $conn->select('*') ->select( $conn->select('count(*)') diff --git a/tests/dibi/DibiRow.phpt b/tests/dibi/DibiRow.phpt index 8eb80fe6..af66d701 100644 --- a/tests/dibi/DibiRow.phpt +++ b/tests/dibi/DibiRow.phpt @@ -35,8 +35,8 @@ Assert::false(isset($row['missing'])); // to array -Assert::same(array('product_id' => 1, 'title' => 'Chair'), iterator_to_array($row)); -Assert::same(array('product_id' => 1, 'title' => 'Chair'), $row->toArray()); +Assert::same(array('product_id' => num(1), 'title' => 'Chair'), iterator_to_array($row)); +Assert::same(array('product_id' => num(1), 'title' => 'Chair'), $row->toArray()); // counting Assert::same(2, count($row)); diff --git a/tests/dibi/bootstrap.php b/tests/dibi/bootstrap.php index 42dfa906..673aa4ed 100644 --- a/tests/dibi/bootstrap.php +++ b/tests/dibi/bootstrap.php @@ -69,3 +69,13 @@ function reformat($s) trigger_error("Unsupported driver $config[system]", E_USER_WARNING); } } + + +function num($n) +{ + global $config; + if (substr(@$config['dsn'], 0, 5) === 'odbc:' || $config['driver'] === 'sqlite') { + $n = is_float($n) ? "$n.0" : (string) $n; + } + return $n; +} diff --git a/tests/dibi/data/mysql.sql b/tests/dibi/data/mysql.sql index ecfb1560..9c6a456f 100644 --- a/tests/dibi/data/mysql.sql +++ b/tests/dibi/data/mysql.sql @@ -6,22 +6,22 @@ USE dibi_test; DROP TABLE IF EXISTS `products`; CREATE TABLE `products` ( - `product_id` int(11) NOT NULL AUTO_INCREMENT, - `title` varchar(100) NOT NULL, - PRIMARY KEY (`product_id`), - KEY `title` (`title`) + `product_id` int(11) NOT NULL AUTO_INCREMENT, + `title` varchar(100) NOT NULL, + PRIMARY KEY (`product_id`), + KEY `title` (`title`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; INSERT INTO `products` (`product_id`, `title`) VALUES -(1, 'Chair'), -(3, 'Computer'), -(2, 'Table'); +(1, 'Chair'), +(3, 'Computer'), +(2, 'Table'); DROP TABLE IF EXISTS `customers`; CREATE TABLE `customers` ( - `customer_id` int(11) NOT NULL AUTO_INCREMENT, - `name` varchar(100) NOT NULL, - PRIMARY KEY (`customer_id`) + `customer_id` int(11) NOT NULL AUTO_INCREMENT, + `name` varchar(100) NOT NULL, + PRIMARY KEY (`customer_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; INSERT INTO `customers` (`customer_id`, `name`) VALUES @@ -34,15 +34,15 @@ INSERT INTO `customers` (`customer_id`, `name`) VALUES DROP TABLE IF EXISTS `orders`; CREATE TABLE `orders` ( - `order_id` int(11) NOT NULL AUTO_INCREMENT, - `customer_id` int(11) NOT NULL, - `product_id` int(11) NOT NULL, - `amount` float NOT NULL, - PRIMARY KEY (`order_id`), - KEY `customer_id` (`customer_id`), - KEY `product_id` (`product_id`), - CONSTRAINT `orders_ibfk_4` FOREIGN KEY (`product_id`) REFERENCES `products` (`product_id`) ON UPDATE CASCADE, - CONSTRAINT `orders_ibfk_3` FOREIGN KEY (`customer_id`) REFERENCES `customers` (`customer_id`) ON UPDATE CASCADE + `order_id` int(11) NOT NULL AUTO_INCREMENT, + `customer_id` int(11) NOT NULL, + `product_id` int(11) NOT NULL, + `amount` float NOT NULL, + PRIMARY KEY (`order_id`), + KEY `customer_id` (`customer_id`), + KEY `product_id` (`product_id`), + CONSTRAINT `orders_ibfk_4` FOREIGN KEY (`product_id`) REFERENCES `products` (`product_id`) ON UPDATE CASCADE, + CONSTRAINT `orders_ibfk_3` FOREIGN KEY (`customer_id`) REFERENCES `customers` (`customer_id`) ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; INSERT INTO `orders` (`order_id`, `customer_id`, `product_id`, `amount`) VALUES diff --git a/tests/dibi/data/odbc.sql b/tests/dibi/data/odbc.sql index 86669f5c..2cee948a 100644 --- a/tests/dibi/data/odbc.sql +++ b/tests/dibi/data/odbc.sql @@ -1,15 +1,15 @@ CREATE TABLE products ( - product_id COUNTER, - title TEXT(50) + product_id COUNTER, + title TEXT(50) ); -INSERT INTO products (product_id, title) VALUES (1, 'Chair'); -INSERT INTO products (product_id, title) VALUES (2, 'Table'); -INSERT INTO products (product_id, title) VALUES (3, 'Computer'); +INSERT INTO products (product_id, title) VALUES (1, 'Chair'); +INSERT INTO products (product_id, title) VALUES (2, 'Table'); +INSERT INTO products (product_id, title) VALUES (3, 'Computer'); CREATE TABLE [customers] ( - [customer_id] COUNTER, - [name] TEXT(50) + [customer_id] COUNTER, + [name] TEXT(50) ); INSERT INTO `customers` (`customer_id`, `name`) VALUES (1, 'Dave Lister'); @@ -20,10 +20,10 @@ INSERT INTO `customers` (`customer_id`, `name`) VALUES (5, 'Kryten'); INSERT INTO `customers` (`customer_id`, `name`) VALUES (6, 'Kristine Kochanski'); CREATE TABLE [orders] ( - [order_id] INTEGER, - [customer_id] INTEGER, - [product_id] INTEGER, - [amount] FLOAT + [order_id] COUNTER, + [customer_id] INTEGER, + [product_id] INTEGER, + [amount] FLOAT ); INSERT INTO `orders` (`order_id`, `customer_id`, `product_id`, `amount`) VALUES (1, 2, 1, 7); diff --git a/tests/dibi/data/postgre.sql b/tests/dibi/data/postgre.sql index aba69d82..b07663bf 100644 --- a/tests/dibi/data/postgre.sql +++ b/tests/dibi/data/postgre.sql @@ -9,9 +9,9 @@ CREATE TABLE products ( ); INSERT INTO products (product_id, title) VALUES -(1, 'Chair'), -(2, 'Table'), -(3, 'Computer'); +(1, 'Chair'), +(2, 'Table'), +(3, 'Computer'); SELECT setval('products_product_id_seq', 3, TRUE); CREATE INDEX title ON products USING btree (title); diff --git a/tests/dibi/data/sqlite.sql b/tests/dibi/data/sqlite.sql index e73902f5..ddb4165b 100644 --- a/tests/dibi/data/sqlite.sql +++ b/tests/dibi/data/sqlite.sql @@ -5,21 +5,21 @@ CREATE TABLE [products] ( CREATE INDEX "title" ON "products" ("title"); -INSERT INTO "products" ("product_id", "title") VALUES (1, 'Chair'); -INSERT INTO "products" ("product_id", "title") VALUES (2, 'Table'); -INSERT INTO "products" ("product_id", "title") VALUES (3, 'Computer'); +INSERT INTO "products" ("product_id", "title") VALUES (1, 'Chair'); +INSERT INTO "products" ("product_id", "title") VALUES (2, 'Table'); +INSERT INTO "products" ("product_id", "title") VALUES (3, 'Computer'); CREATE TABLE [customers] ( [customer_id] INTEGER PRIMARY KEY NOT NULL, [name] VARCHAR(100) NOT NULL ); -INSERT INTO "customers" ("customer_id", "name") VALUES (1, 'Dave Lister'); -INSERT INTO "customers" ("customer_id", "name") VALUES (2, 'Arnold Rimmer'); -INSERT INTO "customers" ("customer_id", "name") VALUES (3, 'The Cat'); -INSERT INTO "customers" ("customer_id", "name") VALUES (4, 'Holly'); -INSERT INTO "customers" ("customer_id", "name") VALUES (5, 'Kryten'); -INSERT INTO "customers" ("customer_id", "name") VALUES (6, 'Kristine Kochanski'); +INSERT INTO "customers" ("customer_id", "name") VALUES (1, 'Dave Lister'); +INSERT INTO "customers" ("customer_id", "name") VALUES (2, 'Arnold Rimmer'); +INSERT INTO "customers" ("customer_id", "name") VALUES (3, 'The Cat'); +INSERT INTO "customers" ("customer_id", "name") VALUES (4, 'Holly'); +INSERT INTO "customers" ("customer_id", "name") VALUES (5, 'Kryten'); +INSERT INTO "customers" ("customer_id", "name") VALUES (6, 'Kristine Kochanski'); CREATE TABLE [orders] ( [order_id] INTEGER NOT NULL PRIMARY KEY, @@ -30,7 +30,7 @@ CREATE TABLE [orders] ( CONSTRAINT orders_customer FOREIGN KEY (customer_id) REFERENCES customers (customer_id) ); -INSERT INTO "orders" ("order_id", "customer_id", "product_id", "amount") VALUES (1, 2, 1, '7.0'); -INSERT INTO "orders" ("order_id", "customer_id", "product_id", "amount") VALUES (2, 2, 3, '2.0'); -INSERT INTO "orders" ("order_id", "customer_id", "product_id", "amount") VALUES (3, 1, 2, '3.0'); -INSERT INTO "orders" ("order_id", "customer_id", "product_id", "amount") VALUES (4, 6, 3, '5.0'); +INSERT INTO "orders" ("order_id", "customer_id", "product_id", "amount") VALUES (1, 2, 1, '7.0'); +INSERT INTO "orders" ("order_id", "customer_id", "product_id", "amount") VALUES (2, 2, 3, '2.0'); +INSERT INTO "orders" ("order_id", "customer_id", "product_id", "amount") VALUES (3, 1, 2, '3.0'); +INSERT INTO "orders" ("order_id", "customer_id", "product_id", "amount") VALUES (4, 6, 3, '5.0');