From 63ea2b7c451640910d4190c7c0d904af688a85d5 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Fri, 26 Jun 2009 20:25:52 +1200
Subject: changed to SQL standard of LIMIT 20 OFFSET 1 etc.

---
 classes/Fave.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'classes')

diff --git a/classes/Fave.php b/classes/Fave.php
index c3ec62dcf..4b28d06b4 100644
--- a/classes/Fave.php
+++ b/classes/Fave.php
@@ -79,7 +79,7 @@ class Fave extends Memcached_DataObject
         $qry .= 'ORDER BY modified DESC ';
 
         if (!is_null($offset)) {
-            $qry .= "LIMIT $offset, $limit";
+            $qry .= "LIMIT $limit OFFSET $offset";
         }
 
         $fav->query($qry);
-- 
cgit v1.2.3-54-g00ecf


From 403bb38bcd191d7b4e9c62e7f5f4bbb3968729df Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Sat, 27 Jun 2009 10:29:02 +1200
Subject: used single quotes in SQL

---
 classes/Notice.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'classes')

diff --git a/classes/Notice.php b/classes/Notice.php
index 08125cf7b..4e244c666 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -873,7 +873,7 @@ class Notice extends Memcached_DataObject
                 if ($cnt > 0) {
                     $qry .= ', ';
                 }
-                $qry .= '('.$id.', '.$this->id.', '.$source.', "'.$this->created.'") ';
+                $qry .= '('.$id.', '.$this->id.', '.$source.", '".$this->created. "') ";
                 $cnt++;
                 if ($cnt >= MAX_BOXCARS) {
                     $inbox = new Notice_inbox();
-- 
cgit v1.2.3-54-g00ecf


From 565dec0e213570b2cad3fa11ec42caf5b52ce1c8 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Sat, 27 Jun 2009 10:31:31 +1200
Subject: use quote identifiers on the user table

---
 classes/User_group.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'classes')

diff --git a/classes/User_group.php b/classes/User_group.php
index 27b444705..b1ab1c2d3 100644
--- a/classes/User_group.php
+++ b/classes/User_group.php
@@ -275,11 +275,14 @@ class User_group extends Memcached_DataObject
         // XXX: cache this
 
         $user = new User();
+        if(common_config('db','quote_identifiers'))
+            $user_table = '"user"';
+        else $user_table = 'user';
 
         $qry =
           'SELECT id ' .
-          'FROM user JOIN group_member '.
-          'ON user.id = group_member.profile_id ' .
+          'FROM '. $user_table .' JOIN group_member '.
+          'ON '. $user_table .'.id = group_member.profile_id ' .
           'WHERE group_member.group_id = %d ';
 
         $user->query(sprintf($qry, $this->id));
-- 
cgit v1.2.3-54-g00ecf


From 788dd66dbe75db5d09c0cd5b33bb3347233cbd15 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Wed, 15 Jul 2009 20:23:52 +1200
Subject: add quotes around table named "user" when quote_identifiers is true

---
 classes/Notice.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'classes')

diff --git a/classes/Notice.php b/classes/Notice.php
index 4e244c666..8974e22f8 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -896,10 +896,14 @@ class Notice extends Memcached_DataObject
     {
         $user = new User();
 
+	if(common_config('db','quote_identifiers'))
+	    $user_table = '"user"';
+	else $user_table = 'user';
+
         $qry =
           'SELECT id ' .
-          'FROM user JOIN subscription '.
-          'ON user.id = subscription.subscriber ' .
+	  'FROM '. $user_table .' JOIN subscription '.
+	  'ON '. $user_table .'.id = subscription.subscriber ' .
           'WHERE subscription.subscribed = %d ';
 
         $user->query(sprintf($qry, $this->profile_id));
-- 
cgit v1.2.3-54-g00ecf