L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-23568 parameters of DML function insert_record are not modified any more < improved coding style, now using cast to array consistently

Browse Source
This commit is contained in:
Petr Skoda
2010-07-31 20:51:22 +00:00
parent 97c65be564
commit d8fa8e406e
6 changed files with 45 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/dml/mssql_native_moodle_database.php
+8 -14
View File
@@ -831,16 +831,15 @@ class mssql_native_moodle_database extends moodle_database {
* @throws dml_exception if error
*/
public function insert_record($table, $dataobject, $returnid=true, $bulk=false) {
if (!is_object($dataobject)) {
$dataobject = (object)$dataobject;
}
unset($dataobject->id);
$dataobject = (array)$dataobject;
$columns = $this->get_columns($table);
$cleaned = array();
foreach ($dataobject as $field => $value) {
if ($field === 'id') {
continue;
}
if (!isset($columns[$field])) {
continue;
}
@@ -861,9 +860,7 @@ class mssql_native_moodle_database extends moodle_database {
* @throws dml_exception if error
*/
public function import_record($table, $dataobject) {
if (!is_object($dataobject)) {
$dataobject = (object)$dataobject;
}
$dataobject = (array)$dataobject;
$columns = $this->get_columns($table);
$cleaned = array();
@@ -912,9 +909,8 @@ class mssql_native_moodle_database extends moodle_database {
* @throws dml_exception if error
*/
public function update_record_raw($table, $params, $bulk=false) {
if (!is_array($params)) {
$params = (array)$params;
}
$params = (array)$params;
if (!isset($params['id'])) {
throw new coding_exception('moodle_database::update_record_raw() id field must be specified.');
}
@@ -960,9 +956,7 @@ class mssql_native_moodle_database extends moodle_database {
* @throws dml_exception if error
*/
public function update_record($table, $dataobject, $bulk=false) {
if (!is_object($dataobject)) {
$dataobject = (object)$dataobject;
}
$dataobject = (array)$dataobject;
$columns = $this->get_columns($table);
$cleaned = array();
lib/dml/mysqli_native_moodle_database.php
+8 -12
View File
@@ -741,16 +741,15 @@ class mysqli_native_moodle_database extends moodle_database {
* @throws dml_exception if error
*/
public function insert_record($table, $dataobject, $returnid=true, $bulk=false) {
if (!is_object($dataobject)) {
$dataobject = (object)$dataobject;
}
$dataobject = (array)$dataobject;
$columns = $this->get_columns($table);
unset($dataobject->id);
$cleaned = array();
foreach ($dataobject as $field=>$value) {
if ($field === 'id') {
continue;
}
if (!isset($columns[$field])) {
continue;
}
@@ -771,7 +770,7 @@ class mysqli_native_moodle_database extends moodle_database {
* @throws dml_exception if error
*/
public function import_record($table, $dataobject) {
$dataobject = (object)$dataobject;
$dataobject = (array)$dataobject;
$columns = $this->get_columns($table);
$cleaned = array();
@@ -795,9 +794,8 @@ class mysqli_native_moodle_database extends moodle_database {
* @throws dml_exception if error
*/
public function update_record_raw($table, $params, $bulk=false) {
if (!is_array($params)) {
$params = (array)$params;
}
$params = (array)$params;
if (!isset($params['id'])) {
throw new coding_exception('moodle_database::update_record_raw() id field must be specified.');
}
@@ -842,9 +840,7 @@ class mysqli_native_moodle_database extends moodle_database {
* @throws dml_exception if error
*/
public function update_record($table, $dataobject, $bulk=false) {
if (!is_object($dataobject)) {
$dataobject = (object)$dataobject;
}
$dataobject = (array)$dataobject;
$columns = $this->get_columns($table);
$cleaned = array();
lib/dml/oci_native_moodle_database.php
+8 -14
View File
@@ -1156,16 +1156,15 @@ class oci_native_moodle_database extends moodle_database {
* @throws dml_exception if error
*/
public function insert_record($table, $dataobject, $returnid=true, $bulk=false) {
if (!is_object($dataobject)) {
$dataobject = (object)$dataobject;
}
unset($dataobject->id);
$dataobject = (array)$dataobject;
$columns = $this->get_columns($table);
$cleaned = array();
foreach ($dataobject as $field=>$value) {
if ($field === 'id') {
continue;
}
if (!isset($columns[$field])) { // Non-existing table field, skip it
continue;
}
@@ -1186,9 +1185,7 @@ class oci_native_moodle_database extends moodle_database {
* @throws dml_exception if error
*/
public function import_record($table, $dataobject) {
if (!is_object($dataobject)) {
$dataobject = (object)$dataobject;
}
$dataobject = (array)$dataobject;
$columns = $this->get_columns($table);
$cleaned = array();
@@ -1213,9 +1210,8 @@ class oci_native_moodle_database extends moodle_database {
* @throws dml_exception if error
*/
public function update_record_raw($table, $params, $bulk=false) {
if (!is_array($params)) {
$params = (array)$params;
}
$params = (array)$params;
if (!isset($params['id'])) {
throw new coding_exception('moodle_database::update_record_raw() id field must be specified.');
}
@@ -1261,9 +1257,7 @@ class oci_native_moodle_database extends moodle_database {
* @throws dml_exception if error
*/
public function update_record($table, $dataobject, $bulk=false) {
if (!is_object($dataobject)) {
$dataobject = (object)$dataobject;
}
$dataobject = (array)$dataobject;
$columns = $this->get_columns($table);
$cleaned = array();
lib/dml/pdo_moodle_database.php
+7 -11
View File
@@ -383,16 +383,15 @@ abstract class pdo_moodle_database extends moodle_database {
* @return true or new id
*/
public function insert_record($table, $dataobject, $returnid=true, $bulk=false) {
if (!is_object($dataobject)) {
$dataobject = (object)$dataobject;
}
$dataobject = (array)$dataobject;
$columns = $this->get_columns($table);
unset($dataobject->id);
$cleaned = array();
foreach ($dataobject as $field=>$value) {
if ($field === 'id') {
continue;
}
if (!isset($columns[$field])) {
continue;
}
@@ -429,9 +428,8 @@ abstract class pdo_moodle_database extends moodle_database {
* @return bool success
*/
public function update_record_raw($table, $params, $bulk=false) {
if (!is_array($params)) {
$params = (array)$params;
}
$params = (array)$params;
if (!isset($params['id'])) {
throw new coding_exception('moodle_database::update_record_raw() id field must be specified.');
}
@@ -467,9 +465,7 @@ abstract class pdo_moodle_database extends moodle_database {
* @return bool success
*/
public function update_record($table, $dataobject, $bulk=false) {
if (!is_object($dataobject)) {
$dataobject = (object)$dataobject;
}
$dataobject = (array)$dataobject;
if (!isset($dataobject->id) ) {
return false;
lib/dml/pgsql_native_moodle_database.php
+8 -12
View File
@@ -795,17 +795,16 @@ class pgsql_native_moodle_database extends moodle_database {
* @throws dml_exception if error
*/
public function insert_record($table, $dataobject, $returnid=true, $bulk=false) {
if (!is_object($dataobject)) {
$dataobject = (object)$dataobject;
}
$dataobject = (array)$dataobject;
$columns = $this->get_columns($table);
unset($dataobject->id);
$cleaned = array();
$blobs = array();
foreach ($dataobject as $field=>$value) {
if ($field === 'id') {
continue;
}
if (!isset($columns[$field])) {
continue;
}
@@ -850,7 +849,7 @@ class pgsql_native_moodle_database extends moodle_database {
* @throws dml_exception if error
*/
public function import_record($table, $dataobject) {
$dataobject = (object)$dataobject;
$dataobject = (array)$dataobject;
$columns = $this->get_columns($table);
$cleaned = array();
@@ -874,9 +873,8 @@ class pgsql_native_moodle_database extends moodle_database {
* @throws dml_exception if error
*/
public function update_record_raw($table, $params, $bulk=false) {
if (!is_array($params)) {
$params = (array)$params;
}
$params = (array)$params;
if (!isset($params['id'])) {
throw new coding_exception('moodle_database::update_record_raw() id field must be specified.');
}
@@ -921,9 +919,7 @@ class pgsql_native_moodle_database extends moodle_database {
* @throws dml_exception if error
*/
public function update_record($table, $dataobject, $bulk=false) {
if (!is_object($dataobject)) {
$dataobject = (object)$dataobject;
}
$dataobject = (array)$dataobject;
$columns = $this->get_columns($table);
$cleaned = array();
lib/dml/sqlsrv_native_moodle_database.php
+6 -11
View File
@@ -986,16 +986,15 @@ class sqlsrv_native_moodle_database extends moodle_database {
* @throws dml_exception if error
*/
public function insert_record($table, $dataobject, $returnid = true, $bulk = false) {
if (!is_object($dataobject)) {
$dataobject = (object)$dataobject;
}
unset($dataobject->id);
$dataobject = (array)$dataobject;
$columns = $this->get_columns($table);
$cleaned = array ();
foreach ($dataobject as $field => $value) {
if ($field === 'id') {
continue;
}
if (!isset($columns[$field])) {
continue;
}
@@ -1054,9 +1053,7 @@ class sqlsrv_native_moodle_database extends moodle_database {
* @throws dml_exception if error
*/
public function update_record_raw($table, $params, $bulk = false) {
if (!is_array($params)) {
$params = (array)$params;
}
$params = (array)$params;
if (!isset($params['id'])) {
throw new coding_exception('moodle_database::update_record_raw() id field must be specified.');
@@ -1098,9 +1095,7 @@ class sqlsrv_native_moodle_database extends moodle_database {
* @throws dml_exception if error
*/
public function update_record($table, $dataobject, $bulk = false) {
if (!is_object($dataobject)) {
$dataobject = (object)$dataobject;
}
$dataobject = (array)$dataobject;
$columns = $this->get_columns($table);
$cleaned = array ();