rlkollman/meekrodb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

on second thought, we won't have insertMany() and replaceMany(), but insert() and replace()

Browse Source 
will figure out which one you mean

this means that a minor undocumented feature, being able to insert an array and have it
automatically serialized, can't exist anymore
This commit is contained in:
Sergey Tsalkov
2011-04-29 01:48:27 -04:00
parent 65cae974c5
commit 0ed2837f3d
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
db.class.php
View File

@@ -145,10 +145,16 @@ class DB
call_user_func_array('DB::queryNull', $args); call_user_func_array('DB::queryNull', $args);
} }
public static function insertOrReplace($which, $table, $datas, $many) { public static function insertOrReplace($which, $table, $datas) {
$datas = unserialize(serialize($datas)); // break references within array $datas = unserialize(serialize($datas)); // break references within array
$keys = null; $keys = null;
if (! $many) $datas = array($datas);
if (isset($datas[0]) && is_array($datas[0])) {
$many = true;
} else {
$datas = array($datas);
$many = false;
}
foreach ($datas as $data) { foreach ($datas as $data) {
if (! $keys) { if (! $keys) {
@@ -165,7 +171,6 @@ class DB
if (is_object($datum) && ($datum instanceof MeekroDBEval)) { if (is_object($datum) && ($datum instanceof MeekroDBEval)) {
$datum = $datum->text; $datum = $datum->text;
} else { } else {
if (is_array($datum)) $datum = serialize($datum);
$datum = (is_int($datum) ? $datum : "'" . DB::escape($datum) . "'"); $datum = (is_int($datum) ? $datum : "'" . DB::escape($datum) . "'");
} }
$insert_values[] = $datum; $insert_values[] = $datum;
@@ -183,19 +188,11 @@ class DB
} }
public static function insert($table, $data) { public static function insert($table, $data) {
return DB::insertOrReplace('INSERT', $table, $data, false); return DB::insertOrReplace('INSERT', $table, $data);
}
public static function insertMany($table, $data) {
return DB::insertOrReplace('INSERT', $table, $data, true);
} }
public static function replace($table, $data) { public static function replace($table, $data) {
return DB::insertOrReplace('REPLACE', $table, $data, false); return DB::insertOrReplace('REPLACE', $table, $data);
}
public static function replaceMany($table, $data) {
return DB::insertOrReplace('REPLACE', $table, $data, true);
} }
public static function delete() { public static function delete() {

2
simpletest/BasicTest.php
View File

@@ -190,7 +190,7 @@ class BasicTest extends SimpleTest {
'height' => 190.194 'height' => 190.194
); );
DB::insertMany('accounts', $ins); DB::insert('accounts', $ins);
$this->assert(DB::affectedRows() === 2); $this->assert(DB::affectedRows() === 2);
$rows = DB::query("SELECT * FROM accounts WHERE height=%d ORDER BY age ASC", 190.194); $rows = DB::query("SELECT * FROM accounts WHERE height=%d ORDER BY age ASC", 190.194);