From 9331d879ebbc2d655cd56368091b803fb472ab8c Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Sun, 22 Aug 2010 19:06:06 +0000 Subject: [PATCH] MDL-14679 more return types added --- lib/dml/moodle_database.php | 4 +++- lib/dml/mssql_native_moodle_database.php | 3 ++- lib/dml/mysqli_native_moodle_database.php | 3 ++- lib/dml/oci_native_moodle_database.php | 3 ++- lib/dml/pdo_moodle_database.php | 3 ++- lib/dml/pgsql_native_moodle_database.php | 3 ++- lib/dml/sqlsrv_native_moodle_database.php | 3 ++- 7 files changed, 15 insertions(+), 7 deletions(-) diff --git a/lib/dml/moodle_database.php b/lib/dml/moodle_database.php index 1e2643bbb01..675ebca4bfe 100644 --- a/lib/dml/moodle_database.php +++ b/lib/dml/moodle_database.php @@ -296,6 +296,7 @@ abstract class moodle_database { * Close database connection and release all resources * and memory (especially circular memory references). * Do NOT use connect() again, create a new instance if needed. + * @return void */ public function dispose() { if ($this->transactions) { @@ -446,12 +447,13 @@ abstract class moodle_database { /** * Returns supported query parameter types - * @return bitmask + * @return int bitmask */ protected abstract function allowed_param_types(); /** * Returns last error reported by database engine. + * @return string error message */ public abstract function get_last_error(); diff --git a/lib/dml/mssql_native_moodle_database.php b/lib/dml/mssql_native_moodle_database.php index cfbefd98e32..a8d6cbdcd1a 100644 --- a/lib/dml/mssql_native_moodle_database.php +++ b/lib/dml/mssql_native_moodle_database.php @@ -303,7 +303,7 @@ class mssql_native_moodle_database extends moodle_database { /** * Returns supported query parameter types - * @return bitmask + * @return int bitmask */ protected function allowed_param_types() { return SQL_PARAMS_QM; // Not really, but emulated, see emulate_bound_params() @@ -311,6 +311,7 @@ class mssql_native_moodle_database extends moodle_database { /** * Returns last error reported by database engine. + * @return string error message */ public function get_last_error() { return mssql_get_last_message(); diff --git a/lib/dml/mysqli_native_moodle_database.php b/lib/dml/mysqli_native_moodle_database.php index d656abd9466..94b2d258647 100644 --- a/lib/dml/mysqli_native_moodle_database.php +++ b/lib/dml/mysqli_native_moodle_database.php @@ -317,7 +317,7 @@ class mysqli_native_moodle_database extends moodle_database { /** * Returns supported query parameter types - * @return bitmask + * @return int bitmask */ protected function allowed_param_types() { return SQL_PARAMS_QM; @@ -325,6 +325,7 @@ class mysqli_native_moodle_database extends moodle_database { /** * Returns last error reported by database engine. + * @return string error message */ public function get_last_error() { return $this->mysqli->error; diff --git a/lib/dml/oci_native_moodle_database.php b/lib/dml/oci_native_moodle_database.php index 5fcdacfec84..d95bba52d63 100644 --- a/lib/dml/oci_native_moodle_database.php +++ b/lib/dml/oci_native_moodle_database.php @@ -301,7 +301,7 @@ class oci_native_moodle_database extends moodle_database { /** * Returns supported query parameter types - * @return bitmask + * @return int bitmask */ protected function allowed_param_types() { return SQL_PARAMS_NAMED; @@ -309,6 +309,7 @@ class oci_native_moodle_database extends moodle_database { /** * Returns last error reported by database engine. + * @return string error message */ public function get_last_error() { $error = false; diff --git a/lib/dml/pdo_moodle_database.php b/lib/dml/pdo_moodle_database.php index 3f05262af1e..9af61935092 100644 --- a/lib/dml/pdo_moodle_database.php +++ b/lib/dml/pdo_moodle_database.php @@ -153,7 +153,7 @@ abstract class pdo_moodle_database extends moodle_database { /** * Returns supported query parameter types - * @return bitmask + * @return int bitmask */ protected function allowed_param_types() { return SQL_PARAMS_QM | SQL_PARAMS_NAMED; @@ -161,6 +161,7 @@ abstract class pdo_moodle_database extends moodle_database { /** * Returns last error reported by database engine. + * @return string error message */ public function get_last_error() { return $this->lastError; diff --git a/lib/dml/pgsql_native_moodle_database.php b/lib/dml/pgsql_native_moodle_database.php index 27963ac751c..0ee68de2d3f 100644 --- a/lib/dml/pgsql_native_moodle_database.php +++ b/lib/dml/pgsql_native_moodle_database.php @@ -251,7 +251,7 @@ class pgsql_native_moodle_database extends moodle_database { /** * Returns supported query parameter types - * @return bitmask + * @return int bitmask */ protected function allowed_param_types() { return SQL_PARAMS_DOLLAR; @@ -259,6 +259,7 @@ class pgsql_native_moodle_database extends moodle_database { /** * Returns last error reported by database engine. + * @return string error message */ public function get_last_error() { return pg_last_error($this->pgsql); diff --git a/lib/dml/sqlsrv_native_moodle_database.php b/lib/dml/sqlsrv_native_moodle_database.php index dbf104eacde..b8c62aceb10 100644 --- a/lib/dml/sqlsrv_native_moodle_database.php +++ b/lib/dml/sqlsrv_native_moodle_database.php @@ -306,7 +306,7 @@ class sqlsrv_native_moodle_database extends moodle_database { /** * Returns supported query parameter types - * @return bitmask + * @return int bitmask */ protected function allowed_param_types() { return SQL_PARAMS_QM; // sqlsrv 1.1 can bind @@ -314,6 +314,7 @@ class sqlsrv_native_moodle_database extends moodle_database { /** * Returns last error reported by database engine. + * @return string error message */ public function get_last_error() { $retErrors = sqlsrv_errors(SQLSRV_ERR_ALL);