Fix some issues with database engines :

- insert into syntax not correct for posgresql or sqlite
- add languages table
- incorrect function for row count (sqlite)

git-svn-id: http://piwigo.org/svn/trunk@5452 68402e56-0260-453c-a942-63ccdbb3a9ee

5 files changed, 45 insertions, 2 deletions

diff --git a/install.php b/install.php
index 289a32bf0..92c8d7a0b 100644
--- a/install.php
+++ b/install.php
@@ -380,7 +380,10 @@ INSERT INTO '.$prefixeTable.'config (param,value,comment)
 
     // PWG_CHARSET is required for building the fs_themes array in the
     // themes class
-    define('PWG_CHARSET', $pwg_charset);
+    if (!defined('PWG_CHARSET'))
+    {
+      define('PWG_CHARSET', $pwg_charset);
+    }
     activate_all_themes();
 
     $insert = array(
diff --git a/install/db/86-database.php b/install/db/86-database.php
index 5ff78a033..3a736e3e2 100644
--- a/install/db/86-database.php
+++ b/install/db/86-database.php
@@ -56,7 +56,7 @@ foreach ($themes_to_activate as $theme)
 {
   $query = '
 INSERT INTO '.PREFIX_TABLE.'themes
-  SET id = "'.$theme.'"
+  (id) VALUES(\''.$theme.'\'
 ;';
   pwg_query($query);
 }
diff --git a/install/piwigo_structure-pdo-sqlite.sql b/install/piwigo_structure-pdo-sqlite.sql
index 34d4fa0c4..6b48218c8 100644
--- a/install/piwigo_structure-pdo-sqlite.sql
+++ b/install/piwigo_structure-pdo-sqlite.sql
@@ -206,6 +206,19 @@ CREATE INDEX "images_i5" ON "piwigo_images" ("date_creation");
 CREATE INDEX "images_i1" ON "piwigo_images" ("storage_category_id");
 
 -----------------------------------------------------------------------------
+-- Table structure for table `piwigo_languages`
+-----------------------------------------------------------------------------
+
+DROP TABLE IF EXISTS piwigo_languages;
+CREATE TABLE piwigo_languages 
+(
+  "id" varchar(64) NOT NULL default '',
+  "version" varchar(64) NOT NULL default '0',
+  "name" varchar(64) default NULL,
+  PRIMARY KEY  ("id")
+);
+
+-----------------------------------------------------------------------------
 -- piwigo_old_permalinks
 -----------------------------------------------------------------------------
 
diff --git a/install/piwigo_structure-pgsql.sql b/install/piwigo_structure-pgsql.sql
index e3b830eb0..719497ba7 100644
--- a/install/piwigo_structure-pgsql.sql
+++ b/install/piwigo_structure-pgsql.sql
@@ -253,6 +253,20 @@ CREATE INDEX "images_i5" ON "piwigo_images" ("date_creation");
 CREATE INDEX "images_i1" ON "piwigo_images" ("storage_category_id");
 
 -----------------------------------------------------------------------------
+-- Table structure for table `piwigo_languages`
+-----------------------------------------------------------------------------
+
+DROP TABLE IF EXISTS "piwigo_languages";
+CREATE TABLE "piwigo_languages" (
+  "id" varchar(64) NOT NULL default '',
+  "version" varchar(64) NOT NULL default '0',
+  "name" varchar(64) default NULL,
+  PRIMARY KEY  ("id")
+);
+
+COMMENT ON TABLE "piwigo_languages" IS '';
+
+-----------------------------------------------------------------------------
 -- piwigo_old_permalinks
 -----------------------------------------------------------------------------
 
diff --git a/install/piwigo_structure-sqlite.sql b/install/piwigo_structure-sqlite.sql
index 34d4fa0c4..6b48218c8 100644
--- a/install/piwigo_structure-sqlite.sql
+++ b/install/piwigo_structure-sqlite.sql
@@ -206,6 +206,19 @@ CREATE INDEX "images_i5" ON "piwigo_images" ("date_creation");
 CREATE INDEX "images_i1" ON "piwigo_images" ("storage_category_id");
 
 -----------------------------------------------------------------------------
+-- Table structure for table `piwigo_languages`
+-----------------------------------------------------------------------------
+
+DROP TABLE IF EXISTS piwigo_languages;
+CREATE TABLE piwigo_languages 
+(
+  "id" varchar(64) NOT NULL default '',
+  "version" varchar(64) NOT NULL default '0',
+  "name" varchar(64) default NULL,
+  PRIMARY KEY  ("id")
+);
+
+-----------------------------------------------------------------------------
 -- piwigo_old_permalinks
 -----------------------------------------------------------------------------