From 44015c8d91ecea78ee4a10de579c36a859c2fcb6 Mon Sep 17 00:00:00 2001
From: Taufan Aditya <toopay@taufanaditya.com>
Date: Wed, 4 Apr 2012 19:38:16 +0700
Subject: Set up PDO constant and configuration

---
 .travis.yml                                |  6 ++---
 tests/mocks/database/config/pdo/mysql.php  | 37 ++++++++++++++++++++++++++++++
 tests/mocks/database/config/pdo/pgsql.php  | 37 ++++++++++++++++++++++++++++++
 tests/mocks/database/config/pdo/sqlite.php | 22 ++++++++++++++++++
 tests/mocks/database/config/sqlite.php     |  7 +++---
 tests/travis/pdo/mysql.phpunit.xml         |  2 +-
 tests/travis/pdo/pgsql.phpunit.xml         |  2 +-
 tests/travis/pdo/sqlite.phpunit.xml        |  2 +-
 8 files changed, 105 insertions(+), 10 deletions(-)
 create mode 100644 tests/mocks/database/config/pdo/mysql.php
 create mode 100644 tests/mocks/database/config/pdo/pgsql.php
 create mode 100644 tests/mocks/database/config/pdo/sqlite.php

diff --git a/.travis.yml b/.travis.yml
index 033fd6ab0..97ea0422d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,9 +16,9 @@ before_script:
   - pyrus channel-discover pear.php-tools.net
   - pyrus install http://pear.php-tools.net/get/vfsStream-0.11.2.tgz
   - phpenv rehash
-  - sh -c "if [ '$DB' = 'pgsql' | '$DB' = 'pdo/pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS ci_test;' -U postgres; fi"
-  - sh -c "if [ '$DB' = 'pgsql' | '$DB' = 'pdo/pgsql' ]; then psql -c 'create database ci_test;' -U postgres; fi"
-  - sh -c "if [ '$DB' = 'mysql' | '$DB' = 'pdo/mysql' ]; then mysql -e 'create database IF NOT EXISTS ci_test;'; fi"
+  - sh -c "if [ '$DB' = 'pgsql' ] || [ '$DB' = 'pdo/pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS ci_test;' -U postgres; fi"
+  - sh -c "if [ '$DB' = 'pgsql' ] || [ '$DB' = 'pdo/pgsql' ]; then psql -c 'create database ci_test;' -U postgres; fi"
+  - sh -c "if [ '$DB' = 'mysql' ] || [ '$DB' = 'pdo/mysql' ]; then mysql -e 'create database IF NOT EXISTS ci_test;'; fi"
 
 script: phpunit --configuration tests/travis/$DB.phpunit.xml
 
diff --git a/tests/mocks/database/config/pdo/mysql.php b/tests/mocks/database/config/pdo/mysql.php
new file mode 100644
index 000000000..cefb6b008
--- /dev/null
+++ b/tests/mocks/database/config/pdo/mysql.php
@@ -0,0 +1,37 @@
+<?php
+
+return array(
+	
+	// Typical Database configuration
+	'pdo/mysql' => array(
+		'dsn' => '',
+		'hostname' => 'localhost',
+		'username' => 'travis',
+		'password' => '',
+		'database' => 'ci_test',
+		'dbdriver' => 'pdo',
+		'pdodriver' => 'mysql',
+	),
+
+	// Database configuration with failover
+	'pdo/mysql_failover' => array(
+		'dsn' => '',
+		'hostname' => 'localhost',
+		'username' => 'not_travis',
+		'password' => 'wrong password',
+		'database' => 'not_ci_test',
+		'dbdriver' => 'pdo',
+		'pdodriver' => 'mysql',
+		'failover' => array(
+			array(
+				'dsn' => '',
+				'hostname' => 'localhost',
+				'username' => 'travis',
+				'password' => '',
+				'database' => 'ci_test',
+				'dbdriver' => 'pdo',
+				'pdodriver' => 'mysql',
+			),
+		),
+	),
+);
\ No newline at end of file
diff --git a/tests/mocks/database/config/pdo/pgsql.php b/tests/mocks/database/config/pdo/pgsql.php
new file mode 100644
index 000000000..b2f409d8d
--- /dev/null
+++ b/tests/mocks/database/config/pdo/pgsql.php
@@ -0,0 +1,37 @@
+<?php
+
+return array(
+	
+	// Typical Database configuration
+	'pdo/pgsql' => array(
+		'dsn' => '',
+		'hostname' => 'localhost',
+		'username' => 'postgres',
+		'password' => '',
+		'database' => 'ci_test',
+		'dbdriver' => 'pdo',
+		'pdodriver' => 'pgsql',
+	),
+
+	// Database configuration with failover
+	'pdo/pgsql_failover' => array(
+		'dsn' => '',
+		'hostname' => 'localhost',
+		'username' => 'not_travis',
+		'password' => 'wrong password',
+		'database' => 'not_ci_test',
+		'dbdriver' => 'pdo',
+		'pdodriver' => 'pgsql',
+		'failover' => array(
+			array(
+				'dsn' => '',
+				'hostname' => 'localhost',
+				'username' => 'postgres',
+				'password' => '',
+				'database' => 'ci_test',
+				'dbdriver' => 'pdo',
+				'pdodriver' => 'pgsql',
+			),
+		),
+	),
+);
\ No newline at end of file
diff --git a/tests/mocks/database/config/pdo/sqlite.php b/tests/mocks/database/config/pdo/sqlite.php
new file mode 100644
index 000000000..c6827b41c
--- /dev/null
+++ b/tests/mocks/database/config/pdo/sqlite.php
@@ -0,0 +1,22 @@
+<?php
+
+return array(
+
+	// Typical Database configuration
+	'pdo/sqlite' => array(
+		'dsn' => 'sqlite:/'.realpath(__DIR__.'/..').'/ci_test.sqlite',
+		'dbdriver' => 'pdo',
+	),
+
+	// Database configuration with failover
+	'pdo/sqlite_failover' => array(
+		'dsn' => 'sqlite:/'.realpath(__DIR__.'/..').'/not_exists.sqlite',
+		'dbdriver' => 'pdo',
+		'failover' => array(
+			array(
+				'dsn' => 'sqlite:/'.realpath(__DIR__.'/..').'/ci_test.sqlite',
+				'dbdriver' => 'pdo',
+			),
+		),
+	),
+);
\ No newline at end of file
diff --git a/tests/mocks/database/config/sqlite.php b/tests/mocks/database/config/sqlite.php
index 8665e208d..c70986e7c 100644
--- a/tests/mocks/database/config/sqlite.php
+++ b/tests/mocks/database/config/sqlite.php
@@ -1,5 +1,4 @@
 <?php
-$dbdriver = is_php('5.4') ? 'sqlite3' : 'sqlite';
 
 return array(
 
@@ -10,7 +9,7 @@ return array(
 		'username' => 'sqlite',
 		'password' => 'sqlite',
 		'database' => realpath(__DIR__.'/..').'/ci_test.sqlite',
-		'dbdriver' => $dbdriver,
+		'dbdriver' => is_php('5.4') ? 'sqlite3' : 'sqlite',
 	),
 
 	// Database configuration with failover
@@ -20,7 +19,7 @@ return array(
 		'username' => 'sqlite',
 		'password' => 'sqlite',
 		'database' => '../not_exists.sqlite',
-		'dbdriver' => $dbdriver,
+		'dbdriver' => is_php('5.4') ? 'sqlite3' : 'sqlite',
 		'failover' => array(
 			array(
 				'dsn' => '',
@@ -28,7 +27,7 @@ return array(
 				'username' => 'sqlite',
 				'password' => 'sqlite',
 				'database' => realpath(__DIR__.'/..').'/ci_testf.sqlite',
-				'dbdriver' => $dbdriver,
+				'dbdriver' => is_php('5.4') ? 'sqlite3' : 'sqlite',
 			),
 		),
 	),
diff --git a/tests/travis/pdo/mysql.phpunit.xml b/tests/travis/pdo/mysql.phpunit.xml
index eb650fa1e..69eece24f 100644
--- a/tests/travis/pdo/mysql.phpunit.xml
+++ b/tests/travis/pdo/mysql.phpunit.xml
@@ -10,7 +10,7 @@
 	stopOnIncomplete="false"
 	stopOnSkipped="false">
 	<php>
-        <const name="DB_DRIVER" value="mysql"/>
+        <const name="DB_DRIVER" value="pdo/mysql"/>
     </php>
 	<testsuites>
 		<testsuite name="CodeIgniter Core Test Suite">
diff --git a/tests/travis/pdo/pgsql.phpunit.xml b/tests/travis/pdo/pgsql.phpunit.xml
index 351f690d5..e68c3e028 100644
--- a/tests/travis/pdo/pgsql.phpunit.xml
+++ b/tests/travis/pdo/pgsql.phpunit.xml
@@ -10,7 +10,7 @@
 	stopOnIncomplete="false"
 	stopOnSkipped="false">
 	<php>
-        <const name="DB_DRIVER" value="pgsql"/>
+        <const name="DB_DRIVER" value="pdo/pgsql"/>
     </php>
 	<testsuites>
 		<testsuite name="CodeIgniter Core Test Suite">
diff --git a/tests/travis/pdo/sqlite.phpunit.xml b/tests/travis/pdo/sqlite.phpunit.xml
index ae139b7a9..1871f6221 100644
--- a/tests/travis/pdo/sqlite.phpunit.xml
+++ b/tests/travis/pdo/sqlite.phpunit.xml
@@ -10,7 +10,7 @@
 	stopOnIncomplete="false"
 	stopOnSkipped="false">
 	<php>
-        <const name="DB_DRIVER" value="sqlite"/>
+        <const name="DB_DRIVER" value="pdo/sqlite"/>
     </php>
 	<testsuites>
 		<testsuite name="CodeIgniter Core Test Suite">
-- 
cgit v1.2.3-24-g4f1b