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

specify images.id rather than id (could be tags.id)

Browse Source 
git-svn-id: file:///home/shish/svn/shimmie2/trunk@228 7f39781d-f577-437e-ae19-be835c7a54ca
This commit is contained in:
shish 2007-07-05 21:41:13 +00:00
parent b6809c3b0a
commit 4364e5079f
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/database.class.php
View File

@ -27,7 +27,7 @@ class Querylet { // {{{
class Database { class Database {
var $db; var $db;
var $extensions; var $extensions;
var $get_images = "SELECT *,UNIX_TIMESTAMP(posted) AS posted_timestamp FROM images "; var $get_images = "SELECT images.*,UNIX_TIMESTAMP(posted) AS posted_timestamp FROM images ";
public function Database() { public function Database() {
if(is_readable("config.php")) { if(is_readable("config.php")) {
@ -119,7 +119,7 @@ class Database {
$col = $matches[1]; $col = $matches[1];
$cmp = $matches[2]; $cmp = $matches[2];
$val = parse_shorthand_int($matches[3]); $val = parse_shorthand_int($matches[3]);
$img_search->append(new Querylet("AND ($col $cmp $val)")); $img_search->append(new Querylet("AND (images.$col $cmp $val)"));
} }
else if(preg_match("/poster=(.*)/i", $term, $matches)) { else if(preg_match("/poster=(.*)/i", $term, $matches)) {
global $database; global $database;
@ -130,12 +130,12 @@ class Database {
else { else {
$user_id = -1; $user_id = -1;
} }
$img_search->append(new Querylet("AND (owner_id = $user_id)")); $img_search->append(new Querylet("AND (images.owner_id = $user_id)"));
} }
else if(preg_match("/hash=([0-9a-fA-F]*)/i",$term,$matches)) { else if(preg_match("/hash=([0-9a-fA-F]*)/i",$term,$matches)) {
$hash = strtolower($matches[1]); $hash = strtolower($matches[1]);
if(!is_null($hash)) { if(!is_null($hash)) {
$img_search->append(new Querylet("AND (hash = '$hash')")); $img_search->append(new Querylet("AND (images.hash = '$hash')"));
} }
} }
else { else {
@ -161,7 +161,7 @@ class Database {
// MySQL is braindead, and does a full table scan on images, running the subquery once for each row -_- // MySQL is braindead, and does a full table scan on images, running the subquery once for each row -_-
// "{$this->get_images} WHERE images.id IN (SELECT image_id FROM tags WHERE tag LIKE ?) ", // "{$this->get_images} WHERE images.id IN (SELECT image_id FROM tags WHERE tag LIKE ?) ",
" "
SELECT *, UNIX_TIMESTAMP(posted) AS posted_timestamp SELECT images.*, UNIX_TIMESTAMP(posted) AS posted_timestamp
FROM tags, image_tags, images FROM tags, image_tags, images
WHERE WHERE
tag LIKE ? tag LIKE ?
@ -261,13 +261,13 @@ class Database {
} }
if(count($tags) == 0) { if(count($tags) == 0) {
$row = $this->db->GetRow("{$this->get_images} WHERE id $gtlt ? ORDER BY id $dir LIMIT 1", array((int)$id)); $row = $this->db->GetRow("{$this->get_images} WHERE images.id $gtlt ? ORDER BY images.id $dir LIMIT 1", array((int)$id));
} }
else { else {
$tags[] = ($next ? "id<$id" : "id>$id"); $tags[] = ($next ? "images.id<$id" : "images.id>$id");
$dir = ($next ? "DESC" : "ASC"); $dir = ($next ? "DESC" : "ASC");
$querylet = $this->build_search_querylet($tags); $querylet = $this->build_search_querylet($tags);
$querylet->append_sql("ORDER BY id $dir LIMIT 1"); $querylet->append_sql(" ORDER BY images.id $dir LIMIT 1");
$row = $this->db->GetRow($querylet->sql, $querylet->variables); $row = $this->db->GetRow($querylet->sql, $querylet->variables);
} }
@ -280,7 +280,7 @@ class Database {
public function get_image($id) { public function get_image($id) {
$image = null; $image = null;
$row = $this->db->GetRow("{$this->get_images} WHERE id=?", array($id)); $row = $this->db->GetRow("{$this->get_images} WHERE images.id=?", array($id));
return ($row ? new Image($row) : null); return ($row ? new Image($row) : null);
} }