aviat
/
Query
1
1
Fork 0
Code Issues 1 Pull Requests Releases 2 Activity

Fix some docblocks, and update test files to 2014

This commit is contained in:
Timothy Warren 2014-02-18 15:18:01 -05:00
parent 46e5502278
commit 1095e85762
25 changed files with 30 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -13,7 +13,7 @@ before_script:
- sh -c "psql -c 'create database test;' -U postgres" - sh -c "psql -c 'create database test;' -U postgres"
- sh -c "mysql -e 'create database IF NOT EXISTS test;'" - sh -c "mysql -e 'create database IF NOT EXISTS test;'"
script: cd tests && phpunit script: cd tests && phpunit --coverage-text
matrix: matrix:
allow_failures: allow_failures:

8
classes/db_pdo.php
View File

@ -134,16 +134,10 @@ abstract class DB_PDO extends PDO {
/** /**
* Returns number of rows affected by an INSERT, UPDATE, DELETE type query * Returns number of rows affected by an INSERT, UPDATE, DELETE type query
* *
* @param PDOStatement $statement
* @return int * @return int
*/ */
public function affected_rows($statement='') public function affected_rows()
{ {
if ( ! empty($statement))
{
$this->statement = $statement;
}
// Return number of rows affected // Return number of rows affected
return $this->statement->rowCount(); return $this->statement->rowCount();
} }

2
classes/idb_sql.php
View File

@ -115,7 +115,7 @@ interface iDB_SQL {
* Get information about the columns in the * Get information about the columns in the
* specified table * specified table
* *
* @param string * @param string $table
* @return string * @return string
*/ */
public function column_list($table); public function column_list($table);

2
classes/iquery_builder.php
View File

@ -190,7 +190,7 @@ interface iQuery_Builder {
* *
* @param mixed $key * @param mixed $key
* @param mixed $val * @param mixed $val
@ @param bool $escape * @param bool $escape
* @return $this * @return $this
*/ */
public function where($key, $val=array(), $escape = NULL); public function where($key, $val=array(), $escape = NULL);

6
classes/query_parser.php
View File

@ -47,7 +47,7 @@ class Query_Parser {
/** /**
* Constructor/entry point into parser * Constructor/entry point into parser
* *
* @param string * @param string $sql
*/ */
public function __construct($sql = '') public function __construct($sql = '')
{ {
@ -69,7 +69,7 @@ class Query_Parser {
/** /**
* Public parser method for seting the parse string * Public parser method for seting the parse string
* *
* @param string * @param string $sql
*/ */
public function parse_join($sql) public function parse_join($sql)
{ {
@ -82,7 +82,7 @@ class Query_Parser {
/** /**
* Returns a more useful match array * Returns a more useful match array
* *
* @param array * @param array $array
* @return array * @return array
*/ */
private function filter_array($array) private function filter_array($array)

10
drivers/firebird/firebird_result.php
View File

@ -77,7 +77,7 @@ class Firebird_Result extends PDOStatement {
* Invalidate method for data consistency * Invalidate method for data consistency
* *
* @param mixed $column * @param mixed $column
* @param mixed &$param * @param mixed $param
* @param int $type * @param int $type
* @param mixed $maxlen * @param mixed $maxlen
* @param array $driverdata * @param array $driverdata
@ -94,7 +94,7 @@ class Firebird_Result extends PDOStatement {
* Invalidate method for data consistency * Invalidate method for data consistency
* *
* @param mixed $parameter * @param mixed $parameter
* @param mixed &$variable * @param mixed $variable
* @param int $data_type * @param int $data_type
* @param mixed $maxlen * @param mixed $maxlen
* @param array $driverdata * @param array $driverdata
@ -111,7 +111,7 @@ class Firebird_Result extends PDOStatement {
* Invalidate method for data consistency * Invalidate method for data consistency
* *
* @param mixed $parameter * @param mixed $parameter
* @param mixed &$variable * @param mixed $variable
* @param int $data_type * @param int $data_type
* @return NULL * @return NULL
*/ */
@ -147,8 +147,8 @@ class Firebird_Result extends PDOStatement {
* Emulate PDO fetch public function * Emulate PDO fetch public function
* *
* @param int $fetch_style * @param int $fetch_style
* @param mixed $statement * @param mixed $cursor_orientation
* @param mixed $offset * @param mixed $cursor_offset
* @return mixed * @return mixed
*/ */
public function fetch($fetch_style=PDO::FETCH_ASSOC, $cursor_orientation = PDO::FETCH_ORI_NEXT, $cursor_offset=NULL) public function fetch($fetch_style=PDO::FETCH_ASSOC, $cursor_orientation = PDO::FETCH_ORI_NEXT, $cursor_offset=NULL)

2
drivers/firebird/firebird_util.php
View File

@ -24,7 +24,7 @@ class Firebird_Util extends DB_Util {
/** /**
* Save a reference to the current connection object * Save a reference to the current connection object
* *
* @param object &$conn * @param object $conn
* @return void * @return void
*/ */
public function __construct(&$conn) public function __construct(&$conn)

2
drivers/mysql/mysql_util.php
View File

@ -24,7 +24,7 @@ class MySQL_Util extends DB_Util {
/** /**
* Save a reference to the current connection object * Save a reference to the current connection object
* *
* @param object &$conn * @param object $conn
* @return void * @return void
*/ */
public function __construct(&$conn) public function __construct(&$conn)

2
drivers/odbc/odbc_util.php
View File

@ -24,7 +24,7 @@ class ODBC_Util extends DB_Util {
/** /**
* Save a reference to the current connection object * Save a reference to the current connection object
* *
* @param object &$conn * @param object $conn
* @return void * @return void
*/ */
public function __construct(&$conn) public function __construct(&$conn)

2
drivers/pgsql/pgsql_util.php
View File

@ -24,7 +24,7 @@ class PgSQL_Util extends DB_Util {
/** /**
* Save a reference to the current connection object * Save a reference to the current connection object
* *
* @param object &$conn * @param object $conn
* @return void * @return void
*/ */
public function __construct(&$conn) public function __construct(&$conn)

2
drivers/sqlite/sqlite_util.php
View File

@ -24,7 +24,7 @@ class SQLite_Util extends DB_Util {
/** /**
* Save a reference to the current connection object * Save a reference to the current connection object
* *
* @param object &$conn * @param object $conn
* @return void * @return void
*/ */
public function __construct(&$conn) public function __construct(&$conn)

2
tests/bootstrap.php
View File

@ -6,7 +6,7 @@
* *
* @package Query * @package Query
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2012 - 2013 * @copyright Copyright (c) 2012 - 2014
* @link https://github.com/aviat4ion/Query * @link https://github.com/aviat4ion/Query
* @license http://philsturgeon.co.uk/code/dbad-license * @license http://philsturgeon.co.uk/code/dbad-license
*/ */

2
tests/core/core.php
View File

@ -5,7 +5,7 @@
* Free Database manager for Open Source Databases * Free Database manager for Open Source Databases
* *
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2012 - 2013 * @copyright Copyright (c) 2012 - 2014
* @link https://github.com/aviat4ion/OpenSQLManager * @link https://github.com/aviat4ion/OpenSQLManager
* @license http://philsturgeon.co.uk/code/dbad-license * @license http://philsturgeon.co.uk/code/dbad-license
*/ */

2
tests/core/db_qb_test.php
View File

@ -6,7 +6,7 @@
* *
* @package Query * @package Query
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2012 - 2013 * @copyright Copyright (c) 2012 - 2014
* @link https://github.com/aviat4ion/Query * @link https://github.com/aviat4ion/Query
* @license http://philsturgeon.co.uk/code/dbad-license * @license http://philsturgeon.co.uk/code/dbad-license
*/ */

2
tests/core/db_qp_test.php
View File

@ -6,7 +6,7 @@
* *
* @package Query * @package Query
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2012 - 2013 * @copyright Copyright (c) 2012 - 2014
* @link https://github.com/aviat4ion/Query * @link https://github.com/aviat4ion/Query
* @license http://philsturgeon.co.uk/code/dbad-license * @license http://philsturgeon.co.uk/code/dbad-license
*/ */

2
tests/core/db_test.php
View File

@ -6,7 +6,7 @@
* *
* @package Query * @package Query
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2012 - 2013 * @copyright Copyright (c) 2012 - 2014
* @link https://github.com/aviat4ion/Query * @link https://github.com/aviat4ion/Query
* @license http://philsturgeon.co.uk/code/dbad-license * @license http://philsturgeon.co.uk/code/dbad-license
*/ */

2
tests/databases/firebird/FirebirdQBTest.php
View File

@ -6,7 +6,7 @@
* *
* @package Query * @package Query
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2012 - 2013 * @copyright Copyright (c) 2012 - 2014
* @link https://github.com/aviat4ion/Query * @link https://github.com/aviat4ion/Query
* @license http://philsturgeon.co.uk/code/dbad-license * @license http://philsturgeon.co.uk/code/dbad-license
*/ */

2
tests/databases/firebird/FirebirdTest.php
View File

@ -6,7 +6,7 @@
* *
* @package Query * @package Query
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2012 - 2013 * @copyright Copyright (c) 2012 - 2014
* @link https://github.com/aviat4ion/Query * @link https://github.com/aviat4ion/Query
* @license http://philsturgeon.co.uk/code/dbad-license * @license http://philsturgeon.co.uk/code/dbad-license
*/ */

2
tests/databases/mysql/MySQLQBTest.php
View File

@ -6,7 +6,7 @@
* *
* @package Query * @package Query
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2012 - 2013 * @copyright Copyright (c) 2012 - 2014
* @link https://github.com/aviat4ion/Query * @link https://github.com/aviat4ion/Query
* @license http://philsturgeon.co.uk/code/dbad-license * @license http://philsturgeon.co.uk/code/dbad-license
*/ */

2
tests/databases/mysql/MySQLTest.php
View File

@ -6,7 +6,7 @@
* *
* @package Query * @package Query
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2012 - 2013 * @copyright Copyright (c) 2012 - 2014
* @link https://github.com/aviat4ion/Query * @link https://github.com/aviat4ion/Query
* @license http://philsturgeon.co.uk/code/dbad-license * @license http://philsturgeon.co.uk/code/dbad-license
*/ */

2
tests/databases/pgsql/PgSQLQBTest.php
View File

@ -5,7 +5,7 @@
* Free Database manager for Open Source Databases * Free Database manager for Open Source Databases
* *
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2012 - 2013 * @copyright Copyright (c) 2012 - 2014
* @link https://github.com/aviat4ion/OpenSQLManager * @link https://github.com/aviat4ion/OpenSQLManager
* @license http://philsturgeon.co.uk/code/dbad-license * @license http://philsturgeon.co.uk/code/dbad-license
*/ */

2
tests/databases/pgsql/PgSQLTest.php
View File

@ -5,7 +5,7 @@
* Free Database manager for Open Source Databases * Free Database manager for Open Source Databases
* *
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2012 - 2013 * @copyright Copyright (c) 2012 - 2014
* @link https://github.com/aviat4ion/OpenSQLManager * @link https://github.com/aviat4ion/OpenSQLManager
* @license http://philsturgeon.co.uk/code/dbad-license * @license http://philsturgeon.co.uk/code/dbad-license
*/ */

2
tests/databases/sqlite/SqliteQBTest.php
View File

@ -5,7 +5,7 @@
* Free Database manager for Open Source Databases * Free Database manager for Open Source Databases
* *
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2012 - 2013 * @copyright Copyright (c) 2012 - 2014
* @link https://github.com/aviat4ion/OpenSQLManager * @link https://github.com/aviat4ion/OpenSQLManager
* @license http://philsturgeon.co.uk/code/dbad-license * @license http://philsturgeon.co.uk/code/dbad-license
*/ */

2
tests/databases/sqlite/SqliteTest.php
View File

@ -5,7 +5,7 @@
* Free Database manager for Open Source Databases * Free Database manager for Open Source Databases
* *
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2012 - 2013 * @copyright Copyright (c) 2012 - 2014
* @link https://github.com/aviat4ion/OpenSQLManager * @link https://github.com/aviat4ion/OpenSQLManager
* @license http://philsturgeon.co.uk/code/dbad-license * @license http://philsturgeon.co.uk/code/dbad-license
*/ */

28
tests/index.php
View File

@ -1,28 +0,0 @@
<?php
/**
* Query
*
* Free Query Builder / Database Abstraction Layer
*
* @package Query
* @author Timothy J. Warren
* @copyright Copyright (c) 2012 - 2013
* @link https://github.com/aviat4ion/Query
* @license http://philsturgeon.co.uk/code/dbad-license
*/
// --------------------------------------------------------------------------
/**
* Unit test bootstrap - Using php simpletest
*/
define('QTEST_DIR', dirname(__FILE__));
define('QBASE_DIR', str_replace(basename(QTEST_DIR), '', QTEST_DIR));
define('QDS', DIRECTORY_SEPARATOR);
// Include simpletest
// it has to be in the tests folder
//require_once('simpletest/autorun.php');