Changeset 5192

Timestamp:

Mar 19, 2010, 8:39:15 PM (14 years ago)

Author:

nikrou

Message:

Fix some sql issues :

• permalink that use if() syntax
• add tables themes for other database engines that mysql

Location:

trunk

Files:

• admin/permalinks.php (modified) (2 diffs)
• include/dblayer/functions_mysql.inc.php (modified) (2 diffs)
• include/functions_category.inc.php (modified) (1 diff)
• install/piwigo_structure-pdo-sqlite.sql (modified) (1 diff)
• install/piwigo_structure-pgsql.sql (modified) (1 diff)
• install/piwigo_structure-sqlite.sql (modified) (1 diff)

trunk/admin/permalinks.php

@@ -99 +99 @@
   WHERE permalink="'.$_GET['delete_permanent'].'"
   LIMIT 1';
-  pwg_query($query);
-  if (pwg_db_affected_rows()==0)
+  $result = pwg_query($query);
+  if (pwg_db_changes($result)==0)
     array_push($page['errors'], l10n('Cannot delete the old permalink !'));
 }
@@ -109 +109 @@
 $query = '
 SELECT
-  id,
-  '.pwg_db_concat(array('id', '\' - \'', 'name', 'IF(permalink IS NULL, \'\', \' √\')')).' AS name,
+  id, permalink,
+  '.pwg_db_concat(array('id', '\' - \'', 'name')).' AS name,
   uppercats, global_rank
 FROM '.CATEGORIES_TABLE;

trunk/include/dblayer/functions_mysql.inc.php

@@ -125 +125 @@
 function pwg_db_changes($result) 
 {
-  return mysql_affected_rows($result);
+  return mysql_affected_rows();
 }
 
@@ -462 +462 @@
 {
   $string = implode($array, ',');
-  return 'CONCAT(\''. $string.'\')';
+  return 'CONCAT('. $string.')';
 }
 

trunk/include/functions_category.inc.php

@@ -312 +312 @@
   foreach ($categories as $category)
   {
+    if (!empty($category['permalink']))
+    {
+      $category['name'] .= ' √';
+    }
     if ($fullname)
     {

trunk/install/piwigo_structure-pdo-sqlite.sql

@@ -342 +342 @@
 
 -----------------------------------------------------------------------------
+-- piwigo_themes
+-----------------------------------------------------------------------------
+
+DROP TABLE IF EXISTS "piwigo_themes" CASCADE;
+CREATE TABLE "piwigo_themes"
+(
+  "id" varchar(64) default '' NOT NULL,
+  "version" varchar(64) NOT NULL default '0',
+  "name" varchar(64) default NULL,
+  PRIMARY KEY  ("id")
+);
+
+-----------------------------------------------------------------------------
 -- piwigo_upgrade
 -----------------------------------------------------------------------------

trunk/install/piwigo_structure-pgsql.sql

@@ -416 +416 @@
 
 -----------------------------------------------------------------------------
+-- piwigo_themes
+-----------------------------------------------------------------------------
+
+DROP TABLE IF EXISTS "piwigo_themes" CASCADE;
+CREATE TABLE "piwigo_themes"
+(
+  "id" varchar(64) default '' NOT NULL,
+  "version" varchar(64) NOT NULL default '0',
+  "name" varchar(64) default NULL,
+  PRIMARY KEY  ("id")
+);
+
+COMMENT ON TABLE "piwigo_themes" IS '';
+
+-----------------------------------------------------------------------------
 -- piwigo_upgrade
 -----------------------------------------------------------------------------

trunk/install/piwigo_structure-sqlite.sql

@@ -342 +342 @@
 
 -----------------------------------------------------------------------------
+-- piwigo_themes
+-----------------------------------------------------------------------------
+
+DROP TABLE IF EXISTS "piwigo_themes" CASCADE;
+CREATE TABLE "piwigo_themes"
+(
+  "id" varchar(64) default '' NOT NULL,
+  "version" varchar(64) NOT NULL default '0',
+  "name" varchar(64) default NULL,
+  PRIMARY KEY  ("id")
+);
+
+-----------------------------------------------------------------------------
 -- piwigo_upgrade
 -----------------------------------------------------------------------------