Changeset 4331

Timestamp:

Nov 21, 2009, 1:15:22 PM (14 years ago)

Author:

nikrou

Message:

Feature 1255 : improve sql
Replace in queries LIMIT N,M by LIMIT N OFFSET M

Location:

trunk

Files:

• admin/cat_perm.php (modified) (1 diff)
• admin/element_set_global.php (modified) (1 diff)
• admin/element_set_unit.php (modified) (1 diff)
• admin/include/functions.php (modified) (1 diff)
• admin/include/functions_history.inc.php (modified) (1 diff)
• admin/rating.php (modified) (1 diff)
• comments.php (modified) (1 diff)
• include/calendar_monthly.class.php (modified) (1 diff)
• include/functions_notification.inc.php (modified) (3 diffs)
• include/picture_comment.inc.php (modified) (1 diff)
• include/ws_functions.inc.php (modified) (3 diffs)

trunk/admin/cat_perm.php

@@ -60 +60 @@
   FROM '.CATEGORIES_TABLE.'
   WHERE status = \'private\'
-  LIMIT 0,1
+  LIMIT 0 OFFSET 1
 ;';
 

trunk/admin/element_set_global.php

@@ -475 +475 @@
   WHERE id IN ('.implode(',', $page['cat_elements_id']).')
   '.$conf['order_by'].'
-  LIMIT '.$page['start'].', '.$page['nb_images'].'
+  LIMIT '.$page['start'].' OFFSET '.$page['nb_images'].'
 ;';
   //echo '<pre>'.$query.'</pre>';

trunk/admin/element_set_unit.php

@@ -197 +197 @@
   WHERE id IN ('.implode(',', $page['cat_elements_id']).')
   '.$conf['order_by'].'
-  LIMIT '.$page['start'].', '.$page['nb_images'].'
+  LIMIT '.$page['start'].' OFFSET '.$page['nb_images'].'
 ;';
   $result = pwg_query($query);

trunk/admin/include/functions.php

@@ -597 +597 @@
   FROM '.IMAGE_CATEGORY_TABLE.'
   WHERE category_id = '.$category_id.'
-  ORDER BY RAND()
-  LIMIT 0,1
+  ORDER BY '.DB_RANDOM_FUNCTION.'()
+  LIMIT 0 OFFSET 1
 ;';
     list($representative) = pwg_db_fetch_row(pwg_query($query));

trunk/admin/include/functions_history.inc.php

@@ -162 +162 @@
 ;';
 
-  // LIMIT '.$page['start'].', '.$conf['nb_logs_page'].'
+  // LIMIT '.$page['start'].' OFFSET '.$conf['nb_logs_page'].'
 
   $result = pwg_query($query);

trunk/admin/rating.php

@@ -177 +177 @@
   GROUP BY r.element_id
   ORDER BY ' . $available_order_by[$order_by_index][1] .'
-  LIMIT '.$start.','.$elements_per_page.'
+  LIMIT '.$start.' OFFSET '.$elements_per_page.'
 ;';
 

trunk/comments.php

@@ -327 +327 @@
 {
   $query.= '
-  LIMIT '.$start.','.$page['items_number'];
+  LIMIT '.$start.' OFFSET '.$page['items_number'];
 }
 $query.= '

trunk/include/calendar_monthly.class.php

@@ -349 +349 @@
     $query.= '
   ORDER BY RAND()
-  LIMIT 0,1';
+  LIMIT 0 OFFSET 1';
     unset ( $page['chronology_date'][CDAY] );
 

trunk/include/functions_notification.inc.php

@@ -445 +445 @@
   GROUP BY date_available
   ORDER BY date_available DESC
-  LIMIT 0,'.$max_dates.'
+  LIMIT 0 OFFSET '.$max_dates.'
 ;';
   $result = pwg_query($query);
@@ -465 +465 @@
     AND tn_ext IS NOT NULL
   ORDER BY RAND(NOW())
-  LIMIT 0,'.$max_elements.'
+  LIMIT 0 OFFSET '.$max_elements.'
 ;';
       $dates[$i]['elements'] = array();
@@ -485 +485 @@
   GROUP BY category_id
   ORDER BY img_count DESC
-  LIMIT 0,'.$max_cats.'
+  LIMIT 0 OFFSET '.$max_cats.'
 ;';
       $dates[$i]['categories'] = array();

trunk/include/picture_comment.inc.php

@@ -137 +137 @@
 $validated_clause.'
   ORDER BY date ASC
-  LIMIT '.$page['start'].', '.$conf['nb_comment_page'].'
+  LIMIT '.$page['start'].' OFFSET '.$conf['nb_comment_page'].'
 ;';
     $result = pwg_query( $query );

trunk/include/ws_functions.inc.php

@@ -293 +293 @@
 GROUP BY i.id
 '.$order_by.'
-LIMIT '.(int)($params['per_page']*$params['page']).','.(int)$params['per_page'];
+LIMIT '.(int)($params['per_page']*$params['page']).' OFFSET '.(int)$params['per_page'];
 
     $result = pwg_query($query);
@@ -684 +684 @@
   ORDER BY date
   LIMIT '.(int)($params['comments_per_page']*$params['comments_page']).
-    ','.(int)$params['comments_per_page'];
+    ' OFFSET '.(int)$params['comments_per_page'];
 
     $result = pwg_query($query);
@@ -1399 +1399 @@
     AND ', $where_clauses).'
 '.$order_by.'
-LIMIT '.(int)($params['per_page']*$params['page']).','.(int)$params['per_page'];
+LIMIT '.(int)($params['per_page']*$params['page']).' OFFSET '.(int)$params['per_page'];
 
     $result = pwg_query($query);