From 53274a6d9347c256430187a22347ca4a0910a395 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Mon, 26 Jan 2009 21:10:32 +0000 Subject: PostgreSQL - code changes to avoid problems where user table is referenced in ad-hoc queries --- classes/User.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'classes/User.php') diff --git a/classes/User.php b/classes/User.php index b1bae8835..b1c061c18 100644 --- a/classes/User.php +++ b/classes/User.php @@ -338,11 +338,12 @@ class User extends Memcached_DataObject { # 3-way join; probably should get cached - $qry = 'SELECT user.* ' . - 'FROM subscription sub1 JOIN user ON sub1.subscribed = user.id ' . - 'JOIN subscription sub2 ON user.id = sub2.subscriber ' . + $UT = common_config('db','type')=='pgsql'?'"user"':'user'; + $qry = "SELECT $UT.* " . + "FROM subscription sub1 JOIN $UT ON sub1.subscribed = $UT.id " . + "JOIN subscription sub2 ON $UT.id = sub2.subscriber " . 'WHERE sub1.subscriber = %d and sub2.subscribed = %d ' . - 'ORDER BY user.nickname'; + "ORDER BY $UT.nickname"; $user = new User(); $user->query(sprintf($qry, $this->id, $this->id)); -- cgit v1.2.3-54-g00ecf