Changeset 6653 for branches/2.1/include

Timestamp:

Jul 3, 2010, 2:16:12 PM (14 years ago)

Author:

nikrou

Message:

Bug 1754 fixed : The keyword AS is mandatory for alias in PostgreSQL queries
Merge from trunk

Location:

branches/2.1/include

Files:

• functions_notification.inc.php (modified) (2 diffs)
• functions_tag.inc.php (modified) (2 diffs)
• functions_user.inc.php (modified) (1 diff)
• ws_functions.inc.php (modified) (3 diffs)

branches/2.1/include/functions_notification.inc.php

@@ -477 +477 @@
   $query = '
 SELECT date_available,
-      COUNT(DISTINCT id) nb_elements,
-      COUNT(DISTINCT category_id) nb_cats
+      COUNT(DISTINCT id) AS nb_elements,
+      COUNT(DISTINCT category_id) AS nb_cats
   FROM '.IMAGES_TABLE.' i INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id=image_id
   '.$where_sql.'
@@ -516 +516 @@
     {// get some categories ...
       $query = '
-SELECT c.uppercats, COUNT(DISTINCT i.id) img_count
+SELECT c.uppercats, COUNT(DISTINCT i.id) AS img_count
   FROM '.IMAGES_TABLE.' i INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON i.id=image_id
     INNER JOIN '.CATEGORIES_TABLE.' c ON c.id=category_id

branches/2.1/include/functions_tag.inc.php

@@ -37 +37 @@
   // we can find top fatter tags among reachable images
   $query = '
-SELECT tag_id, COUNT(DISTINCT(it.image_id)) counter
+SELECT tag_id, COUNT(DISTINCT(it.image_id)) AS counter
   FROM '.IMAGE_CATEGORY_TABLE.' ic
     INNER JOIN '.IMAGE_TAG_TABLE.' it ON ic.image_id=it.image_id'.get_sql_condition_FandF
@@ -224 +224 @@
   }
   $query = '
-SELECT t.*, count(*) counter
+SELECT t.*, count(*) AS counter
   FROM '.IMAGE_TAG_TABLE.'
     INNER JOIN '.TAGS_TABLE.' t ON tag_id = id

branches/2.1/include/functions_user.inc.php

@@ -679 +679 @@
 function get_computed_categories($userdata, $filter_days=null)
 {
-  $query = 'SELECT c.id cat_id, global_rank';
+  $query = 'SELECT c.id AS cat_id, global_rank';
   // Count by date_available to avoid count null
   $query .= ',
-  MAX(date_available) date_last, COUNT(date_available) nb_images
+  MAX(date_available) AS date_last, COUNT(date_available) AS nb_images
 FROM '.CATEGORIES_TABLE.' as c
   LEFT JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON ic.category_id = c.id

branches/2.1/include/ws_functions.inc.php

@@ -286 +286 @@
 
     $query = '
-SELECT i.*, GROUP_CONCAT(category_id) cat_ids
+SELECT i.*, GROUP_CONCAT(category_id) AS cat_ids
   FROM '.IMAGES_TABLE.' i
     INNER JOIN '.IMAGE_CATEGORY_TABLE.' ON i.id=image_id
@@ -694 +694 @@
 
   $query = '
-SELECT COUNT(id) nb_comments
+SELECT COUNT(id) AS nb_comments
   FROM '.COMMENTS_TABLE.'
   WHERE '.$where_comments;
@@ -1455 +1455 @@
     {
       $query = '
-SELECT image_id, GROUP_CONCAT(tag_id) tag_ids
+SELECT image_id, GROUP_CONCAT(tag_id) AS tag_ids
   FROM '.IMAGE_TAG_TABLE.'
   WHERE tag_id IN ('.implode(',',$tag_ids).')