james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

postgres requires a sequence name to be passed to get_last_insert_id

Browse Source
This commit is contained in:
Shish 2012-03-08 02:55:04 +00:00
parent 58d533ceb9
commit 569e93cd6b
6 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/pools/main.php
View File

@ -340,7 +340,7 @@ class Pools extends Extension {
VALUES (:uid, :public, :title, :desc, now())",
array("uid"=>$user->id, "public"=>$public, "title"=>$_POST["title"], "desc"=>$_POST["description"]));
$result['poolID'] = $database->get_last_insert_id();
$result['poolID'] = $database->get_last_insert_id('pools_id_seq');
log_info("pools", "Pool {$result["poolID"]} created by {$user->name}");

9
core/database.class.php
View File

@ -403,8 +403,13 @@ class Database {
/**
* get the ID of the last inserted row
*/
public function get_last_insert_id() {
return $this->db->lastInsertId();
public function get_last_insert_id($seq) {
if($this->engine->name == "pgsql") {
return $this->db->lastInsertId($seq);
}
else {
return $this->db->lastInsertId();
}
}

2
ext/comment/main.php
View File

@ -500,7 +500,7 @@ class CommentList extends Extension {
"INSERT INTO comments(image_id, owner_id, owner_ip, posted, comment) ".
"VALUES(:image_id, :user_id, :remote_addr, now(), :comment)",
array("image_id"=>$image_id, "user_id"=>$user->id, "remote_addr"=>$_SERVER['REMOTE_ADDR'], "comment"=>$comment));
$cid = $database->get_last_insert_id();
$cid = $database->get_last_insert_id('comments_id_seq');
$snippet = substr($comment, 0, 100);
$snippet = str_replace("\n", " ", $snippet);
$snippet = str_replace("\r", " ", $snippet);

8
ext/image/main.php
View File

@ -328,13 +328,7 @@ class ImageIO extends Extension {
"hash"=>$image->hash, "ext"=>$image->ext, "width"=>$image->width, "height"=>$image->height, "source"=>$image->source
)
);
//$database->Execute("UPDATE users SET image_count = image_count+1 WHERE id = :id ", array("id"=>$user->id));
if($database->engine->name == "pgsql") {
$image->id = $database->get_one("SELECT id FROM images WHERE hash=:hash", array("hash"=>$image->hash));
}
else {
$image->id = $database->get_last_insert_id();
}
$image->id = $database->get_last_insert_id('images_id_seq');
log_info("image", "Uploaded Image #{$image->id} ({$image->hash})");

2
ext/user/main.php
View File

@ -339,7 +339,7 @@ class UserPage extends Extension {
$database->Execute(
"INSERT INTO users (name, pass, joindate, email, class) VALUES (:username, :hash, now(), :email, :class)",
array("username"=>$event->username, "hash"=>$hash, "email"=>$email, "class"=>$class));
$uid = $database->get_last_insert_id();
$uid = $database->get_last_insert_id('users_id_seq');
log_info("user", "Created User #$uid ({$event->username})");
}

2
install.php Executable file → Normal file
View File

@ -354,7 +354,7 @@ function insert_defaults() { // {{{
$db = new Database();
$db->execute("INSERT INTO users(name, pass, joindate, class) VALUES(:name, :pass, now(), :class)", Array("name" => 'Anonymous', "pass" => null, "class" => 'anonymous'));
$db->execute("INSERT INTO config(name, value) VALUES(:name, :value)", Array("name" => 'anon_id', "value" => $db->get_last_insert_id()));
$db->execute("INSERT INTO config(name, value) VALUES(:name, :value)", Array("name" => 'anon_id', "value" => $db->get_last_insert_id('users_id_seq')));
if(check_im_version() > 0) {
$db->execute("INSERT INTO config(name, value) VALUES(:name, :value)", Array("name" => 'thumb_engine', "value" => 'convert'));