aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authornikrou <nikrou@piwigo.org>2009-11-21 12:15:22 +0000
committernikrou <nikrou@piwigo.org>2009-11-21 12:15:22 +0000
commitf0d0a0952c9889323d60bec249df0fccf286d1a6 (patch)
treecc35359a725297c7995827e0961e270186142c03 /admin
parent8c17d369fadc03d649213f0fbbad625ab285a13a (diff)
Feature 1255 : improve sql
Replace in queries LIMIT N,M by LIMIT N OFFSET M git-svn-id: http://piwigo.org/svn/trunk@4331 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/cat_perm.php2
-rw-r--r--admin/element_set_global.php2
-rw-r--r--admin/element_set_unit.php2
-rw-r--r--admin/include/functions.php4
-rw-r--r--admin/include/functions_history.inc.php2
-rw-r--r--admin/rating.php2
6 files changed, 7 insertions, 7 deletions
diff --git a/admin/cat_perm.php b/admin/cat_perm.php
index 91711ddf1..5ef886e1d 100644
--- a/admin/cat_perm.php
+++ b/admin/cat_perm.php
@@ -59,7 +59,7 @@ if (!isset($page['cat']))
SELECT id
FROM '.CATEGORIES_TABLE.'
WHERE status = \'private\'
- LIMIT 0,1
+ LIMIT 0 OFFSET 1
;';
list($page['cat']) = pwg_db_fetch_row(pwg_query($query));
diff --git a/admin/element_set_global.php b/admin/element_set_global.php
index 3676309e5..79e78e8a2 100644
--- a/admin/element_set_global.php
+++ b/admin/element_set_global.php
@@ -474,7 +474,7 @@ SELECT id,path,tn_ext,file,filesize,level
FROM '.IMAGES_TABLE.'
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>';
$result = pwg_query($query);
diff --git a/admin/element_set_unit.php b/admin/element_set_unit.php
index 65206aba4..cf5409296 100644
--- a/admin/element_set_unit.php
+++ b/admin/element_set_unit.php
@@ -196,7 +196,7 @@ SELECT id,path,tn_ext,name,date_creation,comment,author,file
FROM '.IMAGES_TABLE.'
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);
diff --git a/admin/include/functions.php b/admin/include/functions.php
index 2b6bffa98..16928e9ab 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -596,8 +596,8 @@ function set_random_representant($categories)
SELECT image_id
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));
diff --git a/admin/include/functions_history.inc.php b/admin/include/functions_history.inc.php
index 824caed42..38d3950eb 100644
--- a/admin/include/functions_history.inc.php
+++ b/admin/include/functions_history.inc.php
@@ -161,7 +161,7 @@ SELECT
WHERE '.$where_separator.'
;';
- // LIMIT '.$page['start'].', '.$conf['nb_logs_page'].'
+ // LIMIT '.$page['start'].' OFFSET '.$conf['nb_logs_page'].'
$result = pwg_query($query);
diff --git a/admin/rating.php b/admin/rating.php
index 5f3f93fa3..e5fe48d03 100644
--- a/admin/rating.php
+++ b/admin/rating.php
@@ -176,7 +176,7 @@ SELECT i.id,
WHERE 1 = 1 ' . $page['user_filter'] . '
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.'
;';
$images = array();