Feature 1255 :

- add postgres database engine - change installation process to allow postgres or mysql database git-svn-id: http://piwigo.org/svn/trunk@4410 68402e56-0260-453c-a942-63ccdbb3a9ee
2026-05-05 21:12:52 +02:00 · 2009-12-02 20:27:06 +00:00
parent b8c33dcf20
commit fdfaefd17a
15 changed files with 1438 additions and 83 deletions
--- a/admin/include/functions_install.inc.php
+++ b/admin/include/functions_install.inc.php
@@ -0,0 +1,98 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based picture gallery                                  |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+/**
+ * loads an sql file and executes all queries
+ *
+ * Before executing a query, $replaced is... replaced by $replacing. This is
+ * useful when the SQL file contains generic words. Drop table queries are
+ * not executed.
+ *
+ * @param string filepath
+ * @param string replaced
+ * @param string replacing
+ * @return void
+ */
+function execute_sqlfile($filepath, $replaced, $replacing)
+{
+  $sql_lines = file($filepath);
+  $query = '';
+  foreach ($sql_lines as $sql_line)
+  {
+    $sql_line = trim($sql_line);
+    if (preg_match('/(^--|^$)/', $sql_line))
+    {
+      continue;
+    }
+    $query.= ' '.$sql_line;
+    // if we reached the end of query, we execute it and reinitialize the
+    // variable "query"
+    if (preg_match('/;$/', $sql_line))
+    {
+      $query = trim($query);
+      $query = str_replace($replaced, $replacing, $query);
+      // we don't execute "DROP TABLE" queries
+      if (!preg_match('/^DROP TABLE/i', $query))
+      {
+        global $install_charset_collate;
+        if ( !empty($install_charset_collate) )
+        {
+          if ( preg_match('/^(CREATE TABLE .*)[\s]*;[\s]*/im', $query, $matches) )
+          {
+            $query = $matches[1].' '.$install_charset_collate.';';
+          }
+        }
+        pwg_query($query);
+      }
+      $query = '';
+    }
+  }
+}
+
+/**
+ * Search for database engines available
+ *
+ * We search for functions_DATABASE_ENGINE.inc.php 
+ * and we check if the connect function for that database exists 
+ *
+ * @return array
+ */
+function available_engines()
+{
+  $engines = array();
+
+  $pattern = PHPWG_ROOT_PATH. 'include/dblayer/functions_%s.inc.php';
+  include_once PHPWG_ROOT_PATH. 'include/dblayer/dblayers.inc.php';
+
+  foreach ($dblayers as $engine_name => $engine)
+  {
+    if (file_exists(sprintf($pattern, $engine_name)) 
+	&& function_exists($engine['function_available']))
+    {
+      $engines[$engine_name] = $engine['engine'];
+    }
+  }
+  
+  return $engines;
+}
+?>
--- a/admin/template/goto/install.tpl
+++ b/admin/template/goto/install.tpl
@@ -84,6 +84,21 @@ TD {
    <tr class="throw">
      <th colspan="3">{'step1_title'|@translate}</th>
    </tr>
+    {if count($F_DB_ENGINES)>1}
+    <tr>
+      <td style="width: 30%;">{'step1_dbengine'|@translate}</td>
+      <td>
+	<select name="dblayer">
+	  {html_options options=$F_DB_ENGINES selected=$F_DB_LAYER}
+	</select>    
+      </td>
+      <td>{'step1_dbengine_info'|@translate}</td>
+    {else}
+    <td colspan="3">
+    <input type="hidden" name="dbengine" value="{$F_DB_LAYER}">
+    </td>
+    {/if}
+    </tr>
    <tr>
      <td style="width: 30%;">{'step1_host'|@translate}</td>
      <td align=center><input type="text" name="dbhost" value="{$F_DB_HOST}"></td>
--- a/include/dblayer/dblayers.inc.php
+++ b/include/dblayer/dblayers.inc.php
@@ -0,0 +1,32 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based picture gallery                                  |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+$dblayers = array();
+$dblayers['mysql'] = array('engine' => 'MySQL',
+			   'function_available' => 'mysql_connect'
+			   );
+
+$dblayers['pgsql'] = array('engine' => 'PostgreSQL',
+			   'function_available' => 'pg_connect'
+			   );
+?>
--- a/include/dblayer/functions_pgsql.inc.php
+++ b/include/dblayer/functions_pgsql.inc.php
@@ -0,0 +1,581 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based picture gallery                                  |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+define('REQUIRED_PGSQL_VERSION', '8.0');
+define('DB_ENGINE', 'PostgreSQL');
+
+define('DB_REGEX_OPERATOR', '~');
+define('DB_RANDOM_FUNCTION', 'RANDOM');
+
+/**
+ *
+ * simple functions
+ *
+ */
+
+function pwg_db_connect($host, $user, $password, $database)
+{
+  $connection_string = '';
+  if (strpos($host,':') !== false) 
+  {
+    list($host, $port) = explode(':', $host);
+  }
+  $connection_string = sprintf('host=%s', $host);
+  if (!empty($port))
+  {
+    $connection_string .= sprintf(' port=%d', $port);
+  }
+  $connection_string .= sprintf(' user=%s password=%s dbname=%s', 
+				$user, 
+				$password,
+				$database);
+  $link = pg_connect($connection_string) or my_error('pg_connect', true);  
+
+  return $link;
+}
+
+function pwg_db_check_charset() 
+{
+  return true;
+}
+
+function pwg_get_db_version() 
+{
+  list($pg_version) = pwg_db_fetch_row(pwg_query('SHOW SERVER_VERSION;'));
+  
+  return $pg_version;
+}
+
+function pwg_query($query)
+{
+  global $conf,$page,$debug,$t2;
+
+  //  Log::getInstance()->debug($query);
+
+  $start = get_moment();
+  ($result = pg_query($query)) or die($query."\n<br>".pg_last_error());
+
+  $time = get_moment() - $start;
+
+  if (!isset($page['count_queries']))
+  {
+    $page['count_queries'] = 0;
+    $page['queries_time'] = 0;
+  }
+
+  $page['count_queries']++;
+  $page['queries_time']+= $time;
+
+  if ($conf['show_queries'])
+  {
+    $output = '';
+    $output.= '<pre>['.$page['count_queries'].'] ';
+    $output.= "\n".$query;
+    $output.= "\n".'(this query time : ';
+    $output.= '<b>'.number_format($time, 3, '.', ' ').' s)</b>';
+    $output.= "\n".'(total SQL time  : ';
+    $output.= number_format($page['queries_time'], 3, '.', ' ').' s)';
+    $output.= "\n".'(total time      : ';
+    $output.= number_format( ($time+$start-$t2), 3, '.', ' ').' s)';
+    if ( $result!=null and preg_match('/\s*SELECT\s+/i',$query) )
+    {
+      $output.= "\n".'(num rows        : ';
+      $output.= pwg_db_num_rows($result).' )';
+    }
+    elseif ( $result!=null
+      and preg_match('/\s*INSERT|UPDATE|REPLACE|DELETE\s+/i',$query) )
+    {
+      $output.= "\n".'(affected rows   : ';
+      $output.= pwg_db_changes($result).' )';
+    }
+    $output.= "</pre>\n";
+
+    $debug .= $output;
+  }
+
+  return $result;
+}
+
+function pwg_db_nextval($column, $table)
+{
+  $query = '
+SELECT nextval(\''.$table.'_'.$column.'_seq\')';
+  list($next) = pwg_db_fetch_row(pwg_query($query));
+
+  return $next;
+}
+
+/**
+ *
+ * complex functions
+ *
+ */
+
+function pwg_db_changes($result) 
+{
+  return pg_affected_rows($result);
+}
+
+function pwg_db_num_rows($result) 
+{
+  return pg_num_rows($result);
+}
+
+function pwg_db_fetch_assoc($result)
+{
+  return pg_fetch_assoc($result);
+}
+
+function pwg_db_fetch_row($result)
+{
+  return pg_fetch_row($result);
+}
+
+function pwg_db_fetch_object($result)
+{
+  return pg_fetch_object($result);
+}
+
+function pwg_db_free_result($result) 
+{
+  return pg_free_result($result);
+}
+
+function pwg_db_real_escape_string($s)
+{
+  return pg_escape_string($s);
+}
+
+function pwg_db_insert_id()
+{
+  // select currval('piwigo_user_id_seq');
+}
+
+/**
+ *
+ * complex functions
+ *
+ */
+
+/**
+ * creates an array based on a query, this function is a very common pattern
+ * used here
+ *
+ * @param string $query
+ * @param string $fieldname
+ * @return array
+ */
+function array_from_query($query, $fieldname)
+{
+  $array = array();
+
+  $result = pwg_query($query);
+  while ($row = pg_fetch_assoc($result))
+  {
+    array_push($array, $row[$fieldname]);
+  }
+
+  return $array;
+}
+
+define('MASS_UPDATES_SKIP_EMPTY', 1);
+/**
+ * updates multiple lines in a table
+ *
+ * @param string table_name
+ * @param array dbfields
+ * @param array datas
+ * @param int flags - if MASS_UPDATES_SKIP_EMPTY - empty values do not overwrite existing ones
+ * @return void
+ */
+function mass_updates($tablename, $dbfields, $datas, $flags=0)
+{
+  if (count($datas) == 0)
+    return;
+  // depending on the MySQL version, we use the multi table update or N update queries
+  if (count($datas) < 10)
+  { // MySQL is prior to version 4.0.4, multi table update feature is not available
+    foreach ($datas as $data)
+    {
+      $query = '
+UPDATE '.$tablename.'
+  SET ';
+      $is_first = true;
+      foreach ($dbfields['update'] as $key)
+      {
+        $separator = $is_first ? '' : ",\n    ";
+
+        if (isset($data[$key]) and $data[$key] != '')
+        {
+          $query.= $separator.$key.' = \''.$data[$key].'\'';
+        }
+        else
+        {
+          if ($flags & MASS_UPDATES_SKIP_EMPTY )
+            continue; // next field
+          $query.= "$separator$key = NULL";
+        }
+        $is_first = false;
+      }
+      if (!$is_first)
+      {// only if one field at least updated
+        $query.= '
+  WHERE ';
+        $is_first = true;
+        foreach ($dbfields['primary'] as $key)
+        {
+          if (!$is_first)
+          {
+            $query.= ' AND ';
+          }
+          if ( isset($data[$key]) )
+          {
+            $query.= $key.' = \''.$data[$key].'\'';
+          }
+          else
+          {
+            $query.= $key.' IS NULL';
+          }
+          $is_first = false;
+        }
+        pwg_query($query);
+      }
+    } // foreach update
+  } // if mysql_ver or count<X
+  else
+  {
+    $all_fields = array_merge($dbfields['primary'], $dbfields['update']);
+    $temporary_tablename = $tablename.'_'.micro_seconds();
+    $query = '
+CREATE TABLE '.$temporary_tablename.' 
+  AS SELECT * FROM '.$tablename.' WHERE 1=2';
+
+    pwg_query($query);
+    mass_inserts($temporary_tablename, $all_fields, $datas);
+    if ( $flags & MASS_UPDATES_SKIP_EMPTY )
+      $func_set = create_function('$s, $t', 'return "$s = IFNULL(t2.$s, '.$tablename.'.$s)";');
+    else
+      $func_set = create_function('$s', 'return "$s = t2.$s";');
+
+    // update of images table by joining with temporary table
+    $query = '
+UPDATE '.$tablename.'
+  SET '.
+      implode(
+        "\n    , ",
+        array_map($func_set, $dbfields['update'])
+        ).'
+FROM '.$temporary_tablename.' AS t2
+  WHERE '.
+      implode(
+        "\n    AND ",
+        array_map(
+          create_function('$s, $t', 'return "'.$tablename.'.$s = t2.$s";'),
+          $dbfields['primary']
+          )
+        );
+    pwg_query($query);
+    $query = '
+DROP TABLE '.$temporary_tablename;
+    pwg_query($query);
+  }
+}
+
+
+/**
+ * inserts multiple lines in a table
+ *
+ * @param string table_name
+ * @param array dbfields
+ * @param array inserts
+ * @return void
+ */
+
+function mass_inserts($table_name, $dbfields, $datas)
+{
+  if (count($datas) != 0)
+  {
+    $first = true;
+
+    $packet_size = 16777216;
+    $packet_size = $packet_size - 2000; // The last list of values MUST not exceed 2000 character*/
+    $query = '';
+
+    foreach ($datas as $insert)
+    {
+      if (strlen($query) >= $packet_size)
+      {
+        pwg_query($query);
+        $first = true;
+      }
+
+      if ($first)
+      {
+        $query = '
+INSERT INTO '.$table_name.'
+  ('.implode(',', $dbfields).')
+  VALUES';
+        $first = false;
+      }
+      else
+      {
+        $query .= '
+  , ';
+      }
+
+      $query .= '(';
+      foreach ($dbfields as $field_id => $dbfield)
+      {
+        if ($field_id > 0)
+        {
+          $query .= ',';
+        }
+
+        if (!isset($insert[$dbfield]) or $insert[$dbfield] === '')
+        {
+          $query .= 'NULL';
+        }
+        else
+        {
+          $query .= "'".$insert[$dbfield]."'";
+        }
+      }
+      $query .= ')';
+    }
+    pwg_query($query);
+  }
+}
+
+/**
+ * Do maintenance on all PWG tables
+ *
+ * @return none
+ */
+function do_maintenance_all_tables()
+{
+  global $prefixeTable, $page;
+
+  $all_tables = array();
+
+  // List all tables
+  $query = 'SHOW TABLES LIKE \''.$prefixeTable.'%\'';
+  $result = pwg_query($query);
+  while ($row = pwg_db_fetch_assoc($result))
+  {
+    array_push($all_tables, $row[0]);
+  }
+
+  // Repair all tables
+  $query = 'REPAIR TABLE '.implode(', ', $all_tables);
+  $mysql_rc = pwg_query($query);
+
+  // Re-Order all tables
+  foreach ($all_tables as $table_name)
+  {
+    $all_primary_key = array();
+
+    $query = 'DESC '.$table_name.';';
+    $result = pwg_query($query);
+    while ($row = pwg_db_fetch_assoc($result))
+    {
+      if ($row['Key'] == 'PRI')
+      {
+        array_push($all_primary_key, $row['Field']);
+      }
+    }
+
+    if (count($all_primary_key) != 0)
+    {
+      $query = 'ALTER TABLE '.$table_name.' ORDER BY '.implode(', ', $all_primary_key).';';
+      $mysql_rc = $mysql_rc && pwg_query($query);
+    }
+  }
+
+  // Optimize all tables
+  $query = 'OPTIMIZE TABLE '.implode(', ', $all_tables);
+  $mysql_rc = $mysql_rc && pwg_query($query);
+  if ($mysql_rc)
+  {
+    array_push(
+          $page['infos'],
+          l10n('Optimizations completed')
+          );
+  }
+  else
+  {
+    array_push(
+          $page['errors'],
+          l10n('Optimizations errors')
+          );
+  }
+}
+
+function pwg_db_concat_ws($string, $separaor)
+{
+  return 'ARRAY_TO_STRING(ARRAY['.$string.'],\''.$separaor.'\')';
+}
+
+function pwg_db_cast_to_text($string)
+{
+  return 'CAST('.$string.' AS TEXT)';
+}
+
+/**
+ * returns an array containing the possible values of an enum field
+ *
+ * @param string tablename
+ * @param string fieldname
+ */
+function get_enums($table, $field)
+{
+  $typname = preg_replace('/'.$GLOBALS['prefixeTable'].'/', '', $table); 
+  Log::getInstance()->debug($typname);
+  $typname .= '_' . $field;
+
+  $query = 'SELECT 
+enumlabel FROM pg_enum JOIN pg_type
+  ON pg_enum.enumtypid=pg_type.oid 
+  WHERE typname=\''.$typname.'\'
+';
+  $result = pwg_query($query);
+  while ($row = pwg_db_fetch_assoc($result))
+  {
+    $options[] = $row['enumlabel'];
+  }
+
+  return $options;
+}
+
+// get_boolean transforms a string to a boolean value. If the string is
+// "false" (case insensitive), then the boolean value false is returned. In
+// any other case, true is returned.
+function get_boolean( $string )
+{
+  $boolean = true;
+  if ('f' == $string || 'false' == $string)
+  {
+    $boolean = false;
+  }
+  return $boolean;
+}
+
+/**
+ * returns boolean string 'true' or 'false' if the given var is boolean
+ *
+ * @param mixed $var
+ * @return mixed
+ */
+function boolean_to_string($var)
+{
+  if (!empty($var) && ($var == 't'))
+  {
+    return 'true';
+  }
+  else
+  {
+    return 'false';
+  }
+}
+
+/**
+ *
+ * interval and date functions 
+ *
+ */
+
+function pwg_db_get_recent_period_expression($period, $date='CURRENT_DATE')
+{
+  if ($date!='CURRENT_DATE')
+  {
+    $date = '\''.$date.'\'::date';
+  }
+
+  return '('.$date.' - \''.$period.' DAY\'::interval)::date';
+}
+
+function pwg_db_get_recent_period($period, $date='CURRENT_DATE')
+{
+  $query = 'select '.pwg_db_get_recent_period_expression($period, $date);
+  list($d) = pwg_db_fetch_row(pwg_query($query));
+
+  return $d;
+}
+
+function pwg_db_get_date_YYYYMM($date)
+{
+  return 'TO_CHAR('.$date.', \'YYYYMM\')';
+}
+
+function pwg_db_get_date_MMDD($date)
+{
+  return 'TO_CHAR('.$date.', \'MMDD\')';
+}
+
+function pwg_db_get_year($date)
+{
+  return 'EXTRACT(YEAR FROM '.$date.')';
+}
+
+function pwg_db_get_month($date)
+{
+  return 'EXTRACT(MONTH FROM '.$date.')';
+}
+
+function pwg_db_get_week($date, $mode=null)
+{
+  return 'EXTRACT(WEEK FROM '.$date.')';
+}
+
+function pwg_db_get_dayofmonth($date)
+{
+  return 'EXTRACT(DAY FROM '.$date.')';
+}
+
+function pwg_db_get_dayofweek($date)
+{
+  return 'EXTRACT(DOW FROM '.$date.')::INTEGER - 1';
+}
+
+function pwg_db_get_weekday($date)
+{
+  return 'EXTRACT(ISODOW FROM '.$date.')::INTEGER - 1';
+}
+
+// my_error returns (or send to standard output) the message concerning the
+// error occured for the last mysql query.
+function my_error($header, $die)
+{
+  $error = '[pgsql error]'.pg_last_error()."\n";
+  $error .= $header;
+
+  if ($die)
+  {
+    fatal_error($error);
+  }
+  echo("<pre>");
+  trigger_error($error, E_USER_WARNING);
+  echo("</pre>");
+}
+
+
+?>
--- a/install.php
+++ b/install.php
@@ -24,53 +24,7 @@
 //----------------------------------------------------------- include
 define('PHPWG_ROOT_PATH','./');

-/**
- * loads an sql file and executes all queries
- *
- * Before executing a query, $replaced is... replaced by $replacing. This is
- * useful when the SQL file contains generic words. Drop table queries are
- * not executed.
- *
- * @param string filepath
- * @param string replaced
- * @param string replacing
- * @return void
- */
-function execute_sqlfile($filepath, $replaced, $replacing)
-{
-  $sql_lines = file($filepath);
-  $query = '';
-  foreach ($sql_lines as $sql_line)
-  {
-    $sql_line = trim($sql_line);
-    if (preg_match('/(^--|^$)/', $sql_line))
-    {
-      continue;
-    }
-    $query.= ' '.$sql_line;
-    // if we reached the end of query, we execute it and reinitialize the
-    // variable "query"
-    if (preg_match('/;$/', $sql_line))
-    {
-      $query = trim($query);
-      $query = str_replace($replaced, $replacing, $query);
-      // we don't execute "DROP TABLE" queries
-      if (!preg_match('/^DROP TABLE/i', $query))
-      {
-        global $install_charset_collate;
-        if ( !empty($install_charset_collate) )
-        {
-          if ( preg_match('/^(CREATE TABLE .*)[\s]*;[\s]*/im', $query, $matches) )
-          {
-            $query = $matches[1].' '.$install_charset_collate.';';
-          }
-        }
-        pwg_query($query);
-      }
-      $query = '';
-    }
-  }
-}
+include(PHPWG_ROOT_PATH . 'admin/include/functions_install.inc.php');

@set_magic_quotes_runtime(0); // Disable magic_quotes_runtime
 //
@@ -149,6 +103,7 @@ $dbhost = (!empty($_POST['dbhost'])) ? $_POST['dbhost'] : 'localhost';
 $dbuser = (!empty($_POST['dbuser'])) ? $_POST['dbuser'] : '';
 $dbpasswd = (!empty($_POST['dbpasswd'])) ? $_POST['dbpasswd'] : '';
 $dbname = (!empty($_POST['dbname'])) ? $_POST['dbname'] : '';
+$dblayer = (!empty($_POST['dblayer'])) ? $_POST['dblayer'] : 'mysql';

 if (isset($_POST['install']))
 {
@@ -182,7 +137,7 @@ if (@file_exists($config_file))
 $prefixeTable = $table_prefix;
 include(PHPWG_ROOT_PATH . 'include/config_default.inc.php');
@include(PHPWG_ROOT_PATH. 'include/config_local.inc.php');
-include(PHPWG_ROOT_PATH . 'include/dblayer/functions_mysql.inc.php');
+include(PHPWG_ROOT_PATH .'include/dblayer/functions_'.$dblayer.'.inc.php');
 include(PHPWG_ROOT_PATH . 'include/constants.php');
 include(PHPWG_ROOT_PATH . 'include/functions.inc.php');
 include(PHPWG_ROOT_PATH . 'admin/include/functions.php');
@@ -232,34 +187,36 @@ if (version_compare(PHP_VERSION, REQUIRED_PHP_VERSION, '<'))

 //----------------------------------------------------- template initialization
 include( PHPWG_ROOT_PATH .'include/template.class.php');
-$template=new Template(PHPWG_ROOT_PATH.'admin/template/goto', 'roma');
+$template = new Template(PHPWG_ROOT_PATH.'admin/template/goto', 'roma');
 $template->set_filenames( array('install'=>'install.tpl') );
 $step = 1;
 //---------------------------------------------------------------- form analyze
 if ( isset( $_POST['install'] ))
 {
-  if ( @mysql_connect( $_POST['dbhost'],
-                       $_POST['dbuser'],
-                       $_POST['dbpasswd'] ) )
+  if (($pwg_db_link = pwg_db_connect($_POST['dbhost'], $_POST['dbuser'], 
+				     $_POST['dbpasswd'], $_POST['dbname']))!==false) 
  {
-    if ( @mysql_select_db($_POST['dbname'] ) )
+
+    array_push( $infos, l10n('step1_confirmation') );
+
+    $required_version = constant('REQUIRED_'.strtoupper($conf['dblayer']).'_VERSION');
+    if ( version_compare(pwg_get_db_version(), $required_version, '>=') )
    {
-      array_push( $infos, l10n('step1_confirmation') );
+      $pwg_charset = 'utf-8';
+      $pwg_db_charset = 'utf8';
+      if ($dblayer=='mysql')
+      {
+	$install_charset_collate = "DEFAULT CHARACTER SET $pwg_db_charset";
+      }
+      else 
+      {
+	$install_charset_collate = '';
+      }
    }
    else
    {
-      array_push( $errors, l10n('step1_err_db') );
-    }
-    if ( version_compare(mysql_get_server_info(), '4.1.0', '>=') )
-    {
-      $pwg_charset='utf-8';
-      $pwg_db_charset='utf8';
-      $install_charset_collate = "DEFAULT CHARACTER SET $pwg_db_charset";
-    }
-    else
-    {
-      $pwg_charset='iso-8859-1';
-      $pwg_db_charset='latin1';
+      $pwg_charset = 'iso-8859-1';
+      $pwg_db_charset = 'latin1';
      $install_charset_collate = '';
      if ( !array_key_exists($language, get_languages($pwg_charset) ) )
      {
@@ -292,7 +249,7 @@ if ( isset( $_POST['install'] ))
  {
    $step = 2;
    $file_content = '<?php
-$conf[\'dblayer\'] = \'mysql\';
+$conf[\'dblayer\'] = \''.$dblayer.'\';
 $conf[\'db_base\'] = \''.$dbname.'\';
 $conf[\'db_user\'] = \''.$dbuser.'\';
 $conf[\'db_password\'] = \''.$dbpasswd.'\';
@@ -326,7 +283,7 @@ define(\'DB_COLLATE\', \'\');

    // tables creation, based on piwigo_structure.sql
    execute_sqlfile(
-      PHPWG_ROOT_PATH.'install/piwigo_structure.sql',
+      PHPWG_ROOT_PATH.'install/piwigo_structure-'.$dblayer.'.sql',
      DEFAULT_PREFIX_TABLE,
      $table_prefix
      );
@@ -337,6 +294,12 @@ define(\'DB_COLLATE\', \'\');
      $table_prefix
      );

+    $query = '
+INSERT INTO piwigo_config (param,value,comment) 
+   VALUES (\'secret_key\',\'md5('.pwg_db_cast_to_text(DB_RANDOM_FUNCTION.'()').')\',
+   \'a secret key specific to the gallery for internal use\');';
+    pwg_query($query);
+
    // fill $conf global array
    load_conf_from_db();

@@ -389,6 +352,8 @@ define(\'DB_COLLATE\', \'\');
 }

 //------------------------------------------------------ start template output
+$dbengines = available_engines();
+
 foreach (get_languages('utf-8') as $language_code => $language_name)
 {
  if ($language == $language_code)
@@ -402,15 +367,17 @@ $template->assign('language_options', $languages_options);
 $template->assign(
  array(
    'T_CONTENT_ENCODING' => 'utf-8',
-    'RELEASE'=>PHPWG_VERSION,
+    'RELEASE' => PHPWG_VERSION,
    'F_ACTION' => 'install.php?language=' . $language,
-    'F_DB_HOST'=>$dbhost,
-    'F_DB_USER'=>$dbuser,
-    'F_DB_NAME'=>$dbname,
+    'F_DB_ENGINES' => $dbengines,
+    'F_DB_LAYER' => $dblayer,
+    'F_DB_HOST' => $dbhost,
+    'F_DB_USER' => $dbuser,
+    'F_DB_NAME' => $dbname,
    'F_DB_PREFIX' => $table_prefix,
-    'F_ADMIN'=>$admin_name,
-    'F_ADMIN_EMAIL'=>$admin_mail,
-    'L_INSTALL_HELP'=>sprintf(l10n('install_help'), PHPWG_URL.'/forum'),
+    'F_ADMIN' => $admin_name,
+    'F_ADMIN_EMAIL' => $admin_mail,
+    'L_INSTALL_HELP' => sprintf(l10n('install_help'), PHPWG_URL.'/forum'),
    ));

 //------------------------------------------------------ errors & infos display
--- a/install/config.sql
+++ b/install/config.sql
@@ -17,7 +17,6 @@ INSERT INTO piwigo_config (param,value,comment) VALUES ('page_banner','<h1>Piwig
 INSERT INTO piwigo_config (param,value,comment) VALUES ('history_admin','false','keep a history of administrator visits on your website');
 INSERT INTO piwigo_config (param,value,comment) VALUES ('history_guest','true','keep a history of guest visits on your website');
 INSERT INTO piwigo_config (param,value,comment) VALUES ('allow_user_registration','true','allow visitors to register?');
-INSERT INTO piwigo_config (param,value,comment) VALUES ('secret_key', MD5(RAND()), 'a secret key specific to the gallery for internal use');
 INSERT INTO piwigo_config (param,value,comment) VALUES ('nbm_send_html_mail','true','Send mail on HTML format for notification by mail');
 INSERT INTO piwigo_config (param,value,comment) VALUES ('nbm_send_mail_as','','Send mail as param value for notification by mail');
 INSERT INTO piwigo_config (param,value,comment) VALUES ('nbm_send_detailed_content','true','Send detailed content for notification by mail');
--- a/install/piwigo_structure-mysql.sql
+++ b/install/piwigo_structure-mysql.sql
--- a/install/piwigo_structure-pgsql.sql
+++ b/install/piwigo_structure-pgsql.sql
@@ -0,0 +1,649 @@
+-----------------------------------------------------------------------------
+-- piwigo_caddie
+-----------------------------------------------------------------------------
+
+DROP TABLE IF EXISTS piwigo_caddie;
+CREATE TABLE "piwigo_caddie"
+(
+  "user_id" INTEGER default 0 NOT NULL,
+  "element_id" INTEGER default 0 NOT NULL,
+  PRIMARY KEY ("user_id","element_id")
+);
+
+COMMENT ON TABLE "piwigo_caddie" IS '';
+
+
+SET search_path TO public;
+-----------------------------------------------------------------------------
+-- piwigo_categories
+-----------------------------------------------------------------------------
+
+DROP TYPE IF EXISTS CATEGORIES_STATUS;
+CREATE TYPE CATEGORIES_STATUS AS ENUM('public', 'private');
+
+DROP TABLE IF EXISTS "piwigo_categories" CASCADE;
+CREATE TABLE "piwigo_categories"
+(
+  "id" serial  NOT NULL,
+  "name" VARCHAR(255) default '' NOT NULL,
+  "id_uppercat" INTEGER,
+  "comment" TEXT,
+  "dir" VARCHAR(255),
+  "rank" INTEGER,
+  "status" CATEGORIES_STATUS default 'public'::CATEGORIES_STATUS,
+  "site_id" INTEGER default 1,
+  "visible" BOOLEAN default true,
+  "uploadable" BOOLEAN default false,
+  "representative_picture_id" INTEGER,
+  "uppercats" TEXT,
+  "commentable" BOOLEAN default true,
+  "global_rank" VARCHAR(255),
+  "image_order" VARCHAR(128),
+  "permalink" VARCHAR(64),
+  PRIMARY KEY ("id"),
+  CONSTRAINT "categories_i3" UNIQUE ("permalink")
+);
+
+COMMENT ON TABLE "piwigo_categories" IS '';
+
+
+SET search_path TO public;
+CREATE INDEX "categories_i2" ON "piwigo_categories" ("id_uppercat");
+
+-----------------------------------------------------------------------------
+-- piwigo_config
+-----------------------------------------------------------------------------
+
+DROP TABLE IF EXISTS "piwigo_config" CASCADE;
+CREATE TABLE "piwigo_config"
+(
+  "param" VARCHAR(40) default '' NOT NULL,
+  "value" TEXT,
+  "comment" VARCHAR(255),
+  PRIMARY KEY ("param")
+);
+
+COMMENT ON TABLE "piwigo_config" IS '';
+
+
+SET search_path TO public;
+-----------------------------------------------------------------------------
+-- piwigo_favorites
+-----------------------------------------------------------------------------
+
+DROP TABLE IF EXISTS "piwigo_favorites" CASCADE;
+CREATE TABLE "piwigo_favorites"
+(
+  "user_id" INTEGER default 0 NOT NULL,
+  "image_id" INTEGER default 0 NOT NULL,
+  PRIMARY KEY ("user_id","image_id")
+);
+
+COMMENT ON TABLE "piwigo_favorites" IS '';
+
+
+SET search_path TO public;
+-----------------------------------------------------------------------------
+-- piwigo_group_access
+-----------------------------------------------------------------------------
+
+DROP TABLE IF EXISTS "piwigo_group_access" CASCADE;
+CREATE TABLE "piwigo_group_access"
+(
+  "group_id" INTEGER default 0 NOT NULL,
+  "cat_id" INTEGER default 0 NOT NULL,
+  PRIMARY KEY ("group_id","cat_id")
+);
+
+COMMENT ON TABLE "piwigo_group_access" IS '';
+
+
+SET search_path TO public;
+-----------------------------------------------------------------------------
+-- piwigo_groups
+-----------------------------------------------------------------------------
+
+DROP TABLE IF EXISTS "piwigo_groups" CASCADE;
+CREATE TABLE "piwigo_groups"
+(
+  "id" serial  NOT NULL,
+  "name" VARCHAR(255) default '' NOT NULL,
+  "is_default" BOOLEAN default false,
+  PRIMARY KEY ("id"),
+  CONSTRAINT "groups_ui1" UNIQUE ("name")
+);
+
+COMMENT ON TABLE "piwigo_groups" IS '';
+
+
+SET search_path TO public;
+-----------------------------------------------------------------------------
+-- piwigo_history
+-----------------------------------------------------------------------------
+
+DROP TYPE IF EXISTS HISTORY_SECTION;
+CREATE TYPE HISTORY_SECTION AS ENUM('categories','tags','search','list','favorites','most_visited','best_rated','recent_pics','recent_cats');
+DROP TYPE IF EXISTS HISTORY_IMAGE_TYPE;
+CREATE TYPE HISTORY_IMAGE_TYPE AS ENUM('picture','high','other');
+
+DROP TABLE IF EXISTS "piwigo_history" CASCADE;
+CREATE TABLE "piwigo_history"
+(
+  "id" serial  NOT NULL,
+  "date" DATE NOT NULL,
+  "time" TIME NOT NULL,
+  "user_id" INTEGER default 0 NOT NULL,
+  "ip" VARCHAR(15) default '' NOT NULL,
+  "section" HISTORY_SECTION default NULL,
+  "category_id" INTEGER,
+  "tag_ids" VARCHAR(50),
+  "image_id" INTEGER,
+  "summarized" BOOLEAN default false,
+  "image_type" HISTORY_IMAGE_TYPE default NULL,
+  PRIMARY KEY ("id")
+);
+
+COMMENT ON TABLE "piwigo_history" IS '';
+
+
+SET search_path TO public;
+CREATE INDEX "history_i1" ON "piwigo_history" ("summarized");
+
+-----------------------------------------------------------------------------
+-- piwigo_history_summary
+-----------------------------------------------------------------------------
+
+DROP TABLE IF EXISTS "piwigo_history_summary" CASCADE;
+CREATE TABLE "piwigo_history_summary"
+(
+  "year" INTEGER default 0 NOT NULL,
+  "month" INTEGER,
+  "day" INTEGER,
+  "hour" INTEGER,
+  "nb_pages" INTEGER,
+  "id" serial  NOT NULL,
+  PRIMARY KEY ("id"),
+  CONSTRAINT "history_summary_ymdh" UNIQUE ("year","month","day","hour")
+);
+
+COMMENT ON TABLE "piwigo_history_summary" IS '';
+
+
+SET search_path TO public;
+-----------------------------------------------------------------------------
+-- piwigo_image_category
+-----------------------------------------------------------------------------
+
+DROP TABLE IF EXISTS "piwigo_image_category" CASCADE;
+CREATE TABLE "piwigo_image_category"
+(
+  "image_id" INTEGER default 0 NOT NULL,
+  "category_id" INTEGER default 0 NOT NULL,
+  "rank" INTEGER,
+  PRIMARY KEY ("image_id","category_id")
+);
+
+COMMENT ON TABLE "piwigo_image_category" IS '';
+
+
+SET search_path TO public;
+CREATE INDEX "image_category_i1" ON "piwigo_image_category" ("category_id");
+
+-----------------------------------------------------------------------------
+-- piwigo_image_tag
+-----------------------------------------------------------------------------
+
+DROP TABLE IF EXISTS "piwigo_image_tag" CASCADE;
+CREATE TABLE "piwigo_image_tag"
+(
+  "image_id" INTEGER default 0 NOT NULL,
+  "tag_id" INTEGER default 0 NOT NULL,
+  PRIMARY KEY ("image_id","tag_id")
+);
+
+COMMENT ON TABLE "piwigo_image_tag" IS '';
+
+
+SET search_path TO public;
+CREATE INDEX "image_tag_i1" ON "piwigo_image_tag" ("tag_id");
+
+-----------------------------------------------------------------------------
+-- piwigo_images
+-----------------------------------------------------------------------------
+
+DROP TABLE IF EXISTS "piwigo_images" CASCADE;
+CREATE TABLE "piwigo_images"
+(
+  "id" serial  NOT NULL,
+  "file" VARCHAR(255) default '' NOT NULL,
+  "date_available" TIMESTAMP NOT NULL,
+  "date_creation" TIMESTAMP,
+  "tn_ext" VARCHAR(4) default '',
+  "name" VARCHAR(255),
+  "comment" TEXT,
+  "author" VARCHAR(255),
+  "hit" INTEGER default 0 NOT NULL,
+  "filesize" INTEGER,
+  "width" INTEGER,
+  "height" INTEGER,
+  "representative_ext" VARCHAR(4),
+  "date_metadata_update" DATE,
+  "average_rate" FLOAT,
+  "has_high" BOOLEAN default false,
+  "path" VARCHAR(255) default '' NOT NULL,
+  "storage_category_id" INTEGER,
+  "high_filesize" INTEGER,
+  "level" INTEGER default 0 NOT NULL,
+  "md5sum" CHAR(32),
+  PRIMARY KEY ("id")
+);
+
+COMMENT ON TABLE "piwigo_images" IS '';
+
+
+SET search_path TO public;
+CREATE INDEX "images_i2" ON "piwigo_images" ("date_available");
+
+CREATE INDEX "images_i3" ON "piwigo_images" ("average_rate");
+
+CREATE INDEX "images_i4" ON "piwigo_images" ("hit");
+
+CREATE INDEX "images_i5" ON "piwigo_images" ("date_creation");
+
+CREATE INDEX "images_i1" ON "piwigo_images" ("storage_category_id");
+
+-----------------------------------------------------------------------------
+-- piwigo_old_permalinks
+-----------------------------------------------------------------------------
+
+DROP TABLE IF EXISTS "piwigo_old_permalinks" CASCADE;
+CREATE TABLE "piwigo_old_permalinks"
+(
+  "cat_id" INTEGER default 0 NOT NULL,
+  "permalink" VARCHAR(64) default '' NOT NULL,
+  "date_deleted" TIMESTAMP NOT NULL,
+  "last_hit" TIMESTAMP,
+  "hit" INTEGER default 0 NOT NULL,
+  PRIMARY KEY ("permalink")
+);
+
+COMMENT ON TABLE "piwigo_old_permalinks" IS '';
+
+
+SET search_path TO public;
+-----------------------------------------------------------------------------
+-- piwigo_plugins
+-----------------------------------------------------------------------------
+
+DROP TYPE IF EXISTS PLUGINS_STATE;
+CREATE TYPE PLUGINS_STATE AS ENUM('active', 'inactive');
+
+DROP TABLE IF EXISTS "piwigo_plugins" CASCADE;
+CREATE TABLE "piwigo_plugins"
+(
+  "id" VARCHAR(64) default '' NOT NULL,
+  "state" PLUGINS_STATE default 'inactive'::PLUGINS_STATE,
+  "version" VARCHAR(64) default '0' NOT NULL,
+  PRIMARY KEY ("id")
+);
+
+COMMENT ON TABLE "piwigo_plugins" IS '';
+
+
+SET search_path TO public;
+-----------------------------------------------------------------------------
+-- piwigo_rate
+-----------------------------------------------------------------------------
+
+DROP TABLE IF EXISTS "piwigo_rate" CASCADE;
+CREATE TABLE "piwigo_rate"
+(
+  "user_id" INTEGER default 0 NOT NULL,
+  "element_id" INTEGER default 0 NOT NULL,
+  "anonymous_id" VARCHAR(45) default '' NOT NULL,
+  "rate" INTEGER default 0 NOT NULL,
+  "date" DATE  NOT NULL,
+  PRIMARY KEY ("user_id","element_id","anonymous_id")
+);
+
+COMMENT ON TABLE "piwigo_rate" IS '';
+
+
+SET search_path TO public;
+-----------------------------------------------------------------------------
+-- piwigo_search
+-----------------------------------------------------------------------------
+
+DROP TABLE IF EXISTS "piwigo_search" CASCADE;
+CREATE TABLE "piwigo_search"
+(
+  "id" serial  NOT NULL,
+  "last_seen" DATE,
+  "rules" TEXT,
+  PRIMARY KEY ("id")
+);
+
+COMMENT ON TABLE "piwigo_search" IS '';
+
+
+SET search_path TO public;
+-----------------------------------------------------------------------------
+-- piwigo_sessions
+-----------------------------------------------------------------------------
+
+DROP TABLE IF EXISTS "piwigo_sessions" CASCADE;
+CREATE TABLE "piwigo_sessions"
+(
+  "id" VARCHAR(255) default '' NOT NULL,
+  "data" TEXT  NOT NULL,
+  "expiration" TIMESTAMP NOT NULL,
+  PRIMARY KEY ("id")
+);
+
+COMMENT ON TABLE "piwigo_sessions" IS '';
+
+
+SET search_path TO public;
+-----------------------------------------------------------------------------
+-- piwigo_sites
+-----------------------------------------------------------------------------
+
+DROP TABLE IF EXISTS "piwigo_sites" CASCADE;
+CREATE TABLE "piwigo_sites"
+(
+  "id" serial  NOT NULL,
+  "galleries_url" VARCHAR(255) default '' NOT NULL,
+  PRIMARY KEY ("id"),
+  CONSTRAINT "sites_ui1" UNIQUE ("galleries_url")
+);
+
+COMMENT ON TABLE "piwigo_sites" IS '';
+
+
+SET search_path TO public;
+-----------------------------------------------------------------------------
+-- piwigo_stuffs
+-----------------------------------------------------------------------------
+
+DROP TABLE IF EXISTS "piwigo_stuffs" CASCADE;
+CREATE TABLE "piwigo_stuffs"
+(
+  "id" INTEGER  NOT NULL,
+  "pos" INTEGER  NOT NULL,
+  "name" TEXT  NOT NULL,
+  "descr" VARCHAR(255),
+  "type" VARCHAR(255)  NOT NULL,
+  "datas" TEXT,
+  "users" VARCHAR(255),
+  "groups" VARCHAR(255),
+  "show_title" CHAR  NOT NULL,
+  "on_home" CHAR  NOT NULL,
+  "on_cats" CHAR  NOT NULL,
+  "on_picture" CHAR  NOT NULL,
+  "id_line" VARCHAR(1),
+  "width" INTEGER,
+  PRIMARY KEY ("id")
+);
+
+COMMENT ON TABLE "piwigo_stuffs" IS '';
+
+
+SET search_path TO public;
+CREATE INDEX "on_home" ON "piwigo_stuffs" ("on_home");
+
+CREATE INDEX "on_cats" ON "piwigo_stuffs" ("on_cats");
+
+CREATE INDEX "on_picture" ON "piwigo_stuffs" ("on_picture");
+
+-----------------------------------------------------------------------------
+-- piwigo_tags
+-----------------------------------------------------------------------------
+
+DROP TABLE IF EXISTS "piwigo_tags" CASCADE;
+CREATE TABLE "piwigo_tags"
+(
+  "id" serial  NOT NULL,
+  "name" VARCHAR(255) default '' NOT NULL,
+  "url_name" VARCHAR(255) default '' NOT NULL,
+  PRIMARY KEY ("id")
+);
+
+COMMENT ON TABLE "piwigo_tags" IS '';
+
+
+SET search_path TO public;
+CREATE INDEX "tags_i1" ON "piwigo_tags" ("url_name");
+
+-----------------------------------------------------------------------------
+-- piwigo_upgrade
+-----------------------------------------------------------------------------
+
+DROP TABLE IF EXISTS "piwigo_upgrade" CASCADE;
+CREATE TABLE "piwigo_upgrade"
+(
+  "id" VARCHAR(20) default '' NOT NULL,
+  "applied" TIMESTAMP NOT NULL,
+  "description" VARCHAR(255),
+  PRIMARY KEY ("id")
+);
+
+COMMENT ON TABLE "piwigo_upgrade" IS '';
+
+
+SET search_path TO public;
+-----------------------------------------------------------------------------
+-- piwigo_user_access
+-----------------------------------------------------------------------------
+
+DROP TABLE IF EXISTS "piwigo_user_access" CASCADE;
+CREATE TABLE "piwigo_user_access"
+(
+  "user_id" INTEGER default 0 NOT NULL,
+  "cat_id" INTEGER default 0 NOT NULL,
+  PRIMARY KEY ("user_id","cat_id")
+);
+
+COMMENT ON TABLE "piwigo_user_access" IS '';
+
+
+SET search_path TO public;
+-----------------------------------------------------------------------------
+-- piwigo_user_cache
+-----------------------------------------------------------------------------
+
+DROP TYPE IF EXISTS USER_CACHE_IMAGE_ACCESS_TYPE;
+CREATE TYPE USER_CACHE_IMAGE_ACCESS_TYPE AS ENUM('NOT IN','IN');
+
+DROP TABLE IF EXISTS "piwigo_user_cache" CASCADE;
+CREATE TABLE "piwigo_user_cache"
+(
+  "user_id" INTEGER default 0 NOT NULL,
+  "need_update" BOOLEAN default true,
+  "cache_update_time" INTEGER default 0 NOT NULL,
+  "forbidden_categories" TEXT,
+  "nb_total_images" INTEGER,
+  "image_access_type" USER_CACHE_IMAGE_ACCESS_TYPE default 'NOT IN'::USER_CACHE_IMAGE_ACCESS_TYPE,
+  "image_access_list" TEXT,
+  PRIMARY KEY ("user_id")
+);
+
+COMMENT ON TABLE "piwigo_user_cache" IS '';
+
+
+SET search_path TO public;
+-----------------------------------------------------------------------------
+-- piwigo_user_cache_categories
+-----------------------------------------------------------------------------
+
+DROP TABLE IF EXISTS "piwigo_user_cache_categories" CASCADE;
+CREATE TABLE "piwigo_user_cache_categories"
+(
+  "user_id" INTEGER default 0 NOT NULL,
+  "cat_id" INTEGER default 0 NOT NULL,
+  "date_last" TIMESTAMP,
+  "max_date_last" TIMESTAMP,
+  "nb_images" INTEGER default 0 NOT NULL,
+  "count_images" INTEGER default 0,
+  "count_categories" INTEGER default 0,
+  PRIMARY KEY ("user_id","cat_id")
+);
+
+COMMENT ON TABLE "piwigo_user_cache_categories" IS '';
+
+
+SET search_path TO public;
+-----------------------------------------------------------------------------
+-- piwigo_user_feed
+-----------------------------------------------------------------------------
+
+DROP TABLE IF EXISTS "piwigo_user_feed" CASCADE;
+CREATE TABLE "piwigo_user_feed"
+(
+  "id" VARCHAR(50) default '' NOT NULL,
+  "user_id" INTEGER default 0 NOT NULL,
+  "last_check" TIMESTAMP,
+  PRIMARY KEY ("id")
+);
+
+COMMENT ON TABLE "piwigo_user_feed" IS '';
+
+
+SET search_path TO public;
+-----------------------------------------------------------------------------
+-- piwigo_user_group
+-----------------------------------------------------------------------------
+
+DROP TABLE IF EXISTS "piwigo_user_group" CASCADE;
+CREATE TABLE "piwigo_user_group"
+(
+  "user_id" INTEGER default 0 NOT NULL,
+  "group_id" INTEGER default 0 NOT NULL,
+  PRIMARY KEY ("user_id","group_id")
+);
+
+COMMENT ON TABLE "piwigo_user_group" IS '';
+
+
+SET search_path TO public;
+-----------------------------------------------------------------------------
+-- piwigo_user_infos
+-----------------------------------------------------------------------------
+
+DROP TYPE IF EXISTS USER_INFOS_STATUS;
+CREATE TYPE USER_INFOS_STATUS AS ENUM('webmaster','admin','normal','generic','guest');
+
+DROP TABLE IF EXISTS "piwigo_user_infos" CASCADE;
+CREATE TABLE "piwigo_user_infos"
+(
+  "user_id" INTEGER default 0 NOT NULL,
+  "nb_image_line" INTEGER default 5 NOT NULL,
+  "nb_line_page" INTEGER default 3 NOT NULL,
+  "status" USER_INFOS_STATUS default 'guest'::USER_INFOS_STATUS,
+  "adviser" BOOLEAN default false,
+  "language" VARCHAR(50) default 'en_UK' NOT NULL,
+  "maxwidth" INTEGER,
+  "maxheight" INTEGER,
+  "expand" BOOLEAN default false,
+  "show_nb_comments" BOOLEAN default false,
+  "show_nb_hits" BOOLEAN default false,
+  "recent_period" INTEGER default 7 NOT NULL,
+  "template" VARCHAR(255) default 'yoga/Sylvia' NOT NULL,
+  "registration_date" TIMESTAMP NOT NULL,
+  "enabled_high" BOOLEAN default true,
+  "level" INTEGER default 0 NOT NULL,
+  PRIMARY KEY ("user_id"),
+  CONSTRAINT "user_infos_ui1" UNIQUE ("user_id")
+);
+
+COMMENT ON TABLE "piwigo_user_infos" IS '';
+
+
+SET search_path TO public;
+-----------------------------------------------------------------------------
+-- piwigo_user_mail_notification
+-----------------------------------------------------------------------------
+
+DROP TABLE IF EXISTS "piwigo_user_mail_notification" CASCADE;
+CREATE TABLE "piwigo_user_mail_notification"
+(
+  "user_id" INTEGER default 0 NOT NULL,
+  "check_key" VARCHAR(16) default '' NOT NULL,
+  "enabled" BOOLEAN default false,
+  "last_send" TIMESTAMP,
+  PRIMARY KEY ("user_id"),
+  CONSTRAINT "user_mail_notification_ui1" UNIQUE ("check_key")
+);
+
+COMMENT ON TABLE "piwigo_user_mail_notification" IS '';
+
+
+SET search_path TO public;
+-----------------------------------------------------------------------------
+-- piwigo_users
+-----------------------------------------------------------------------------
+
+DROP TABLE IF EXISTS "piwigo_users" CASCADE;
+CREATE TABLE "piwigo_users"
+(
+  "id" serial  NOT NULL,
+  "username" VARCHAR(100) default '' NOT NULL,
+  "password" VARCHAR(32),
+  "mail_address" VARCHAR(255),
+  PRIMARY KEY ("id"),
+  CONSTRAINT "users_ui1" UNIQUE ("username")
+);
+
+COMMENT ON TABLE "piwigo_users" IS '';
+
+
+SET search_path TO public;
+
+-----------------------------------------------------------------------------
+-- piwigo_comments
+-----------------------------------------------------------------------------
+
+DROP TABLE IF EXISTS "piwigo_comments" CASCADE;
+CREATE TABLE "piwigo_comments"
+(
+  "id" serial  NOT NULL,
+  "image_id" INTEGER default 0 NOT NULL,
+  "date" TIMESTAMP  NOT NULL,
+  "author" VARCHAR(255),
+  "content" TEXT,
+  "validated" BOOLEAN default false,
+  "validation_date" TIMESTAMP,
+  "author_id" INTEGER REFERENCES "piwigo_users" (id),
+  PRIMARY KEY ("id")
+);
+
+COMMENT ON TABLE "piwigo_comments" IS '';
+
+
+SET search_path TO public;
+CREATE INDEX "comments_i2" ON "piwigo_comments" ("validation_date");
+
+CREATE INDEX "comments_i1" ON "piwigo_comments" ("image_id");
+
+-----------------------------------------------------------------------------
+-- piwigo_waiting
+-----------------------------------------------------------------------------
+
+DROP TABLE IF EXISTS "piwigo_waiting" CASCADE;
+CREATE TABLE "piwigo_waiting"
+(
+  "id" serial  NOT NULL,
+  "storage_category_id" INTEGER default 0 NOT NULL,
+  "file" VARCHAR(255) default '' NOT NULL,
+  "username" VARCHAR(255) default '' NOT NULL,
+  "mail_address" VARCHAR(255) default '' NOT NULL,
+  "date" INTEGER default 0 NOT NULL,
+  "tn_ext" CHAR(3),
+  "validated" BOOLEAN default false,
+  "infos" TEXT,
+  PRIMARY KEY ("id")
+);
+
+COMMENT ON TABLE "piwigo_waiting" IS '';
+
+
+SET search_path TO public;
--- a/language/de_DE/install.lang.php
+++ b/language/de_DE/install.lang.php
@@ -36,7 +36,9 @@ $lang['step1_confirmation'] = 'Die Parameter sind korrekt ausgefüllt';
 $lang['step1_err_db'] = 'Die Verbindung zum Server ist OK, aber nicht die Verbindung zu dieser Datenbank';
 $lang['step1_err_server'] = 'Es konnte keine Verbindung zum Datenbankserver aufgebaut werden';

-$lang['step1_host'] = 'MySQL Host';
+$lang['step1_dbengine'] = 'Database type';
+$lang['step1_dbengine_info'] = 'The type of database your piwigo data will be store in';
+$lang['step1_host'] = 'Host';
 $lang['step1_host_info'] = 'localhost, sql.multimania.com, toto.freesurf.fr';
 $lang['step1_user'] = 'Benutzer';
 $lang['step1_user_info'] = 'Benutzernamen für die MySQL Datenbank';
--- a/language/en_UK/install.lang.php
+++ b/language/en_UK/install.lang.php
@@ -39,7 +39,9 @@ $lang['step1_err_copy_2'] = 'The next step of the installation is now possible';
 $lang['step1_err_copy_next'] = 'next step';
 $lang['step1_err_copy'] = 'Copy the text in pink between hyphens and paste it into the file "include/config_database.inc.php"(Warning : config_database.inc.php must only contain what is in pink, no line return or space character)';

-$lang['step1_host'] = 'MySQL host';
+$lang['step1_dbengine'] = 'Database type';
+$lang['step1_dbengine_info'] = 'The type of database your piwigo data will be store in';
+$lang['step1_host'] = 'Host';
 $lang['step1_host_info'] = 'localhost, sql.multimania.com, toto.freesurf.fr';
 $lang['step1_user'] = 'User';
 $lang['step1_user_info'] = 'user login given by your host provider';
--- a/language/es_ES/install.lang.php
+++ b/language/es_ES/install.lang.php
@@ -36,7 +36,9 @@ $lang['step1_confirmation'] = 'Los parámetros entrados son correctos';
 $lang['step1_err_db'] = 'La conexión al camarero(servidor) es O.K., pero imposible conectarse a esta base de datos';
 $lang['step1_err_server'] = 'Imposible conectarse al servidor';

-$lang['step1_host'] = 'Huésped MySQL';
+$lang['step1_dbengine'] = 'Database type';
+$lang['step1_dbengine_info'] = 'The type of database your piwigo data will be store in';
+$lang['step1_host'] = 'Huésped';
 $lang['step1_host_info'] = 'localhost, sql.multimania.com, toto.freesurf.fr';
 $lang['step1_user'] = 'Utilizador';
 $lang['step1_user_info'] = 'Nombre de utilizador para su hébergeur';
--- a/language/fr_FR/install.lang.php
+++ b/language/fr_FR/install.lang.php
@@ -36,7 +36,9 @@ $lang['step1_confirmation'] = 'Les paramètres rentrés sont corrects';
 $lang['step1_err_db'] = 'La connexion au serveur est OK, mais impossible de se connecter à cette base de données';
 $lang['step1_err_server'] = 'Impossible de se connecter au serveur';

-$lang['step1_host'] = 'Hôte MySQL';
+$lang['step1_dbengine'] = 'Type de base de données';
+$lang['step1_dbengine_info'] = 'La base de données à utiliser pour installer piwigo';
+$lang['step1_host'] = 'Hôte';
 $lang['step1_host_info'] = 'localhost, sql.multimania.com, toto.freesurf.fr';
 $lang['step1_user'] = 'Utilisateur';
 $lang['step1_user_info'] = 'nom d\'utilisateur pour votre hébergeur';
--- a/language/it_IT/install.lang.php
+++ b/language/it_IT/install.lang.php
@@ -36,7 +36,9 @@ $lang['step1_confirmation'] = 'I parametri sono corretti';
 $lang['step1_err_db'] = 'Connessione al server riuscita. Non è stato però possibile connettersi alla base dati';
 $lang['step1_err_server'] = 'Non è stato possibile connettersi al server';

-$lang['step1_host'] = 'MySQL host';
+$lang['step1_dbengine'] = 'Database type';
+$lang['step1_dbengine_info'] = 'The type of database your piwigo data will be store in';
+$lang['step1_host'] = 'Host';
 $lang['step1_host_info'] = 'localhost, sql.multimania.com, pluto.libero.it';
 $lang['step1_user'] = 'Utente';
 $lang['step1_user_info'] = 'nome utente di login alla base dati fornito dal tuo provider';
--- a/language/nl_NL/install.lang.php
+++ b/language/nl_NL/install.lang.php
@@ -39,7 +39,9 @@ $lang['step1_err_copy_2'] = 'Het is nu mogelijk om verder te gaan met de volgend
 $lang['step1_err_copy_next'] = 'volgende stap';
 $lang['step1_err_copy'] = 'Kopieer de tekst tussen de lijnen en plak deze in het bestand "include/config_database.inc.php"(Waarschuwing: config_database.inc.php mag alleen het roze gedeelte bevatten, geen return of extra spatie). Dit moet alleen wanneer dit bestand geen schrijfrechten';

-$lang['step1_host'] = 'MySQL host';
+$lang['step1_dbengine'] = 'Database type';
+$lang['step1_dbengine_info'] = 'The type of database your piwigo data will be store in';
+$lang['step1_host'] = 'Host';
 $lang['step1_host_info'] = 'localhost, sql.multimania.com, toto.freesurf.fr';
 $lang['step1_user'] = 'Gebruiker';
 $lang['step1_user_info'] = 'De gebruikersnaam welke door uw provider is gegeven';
--- a/language/pl_PL/install.lang.php
+++ b/language/pl_PL/install.lang.php
@@ -39,7 +39,9 @@ $lang['step1_err_copy_2'] = 'Teraz mozliwy jest następny krok instalacji';
 $lang['step1_err_copy_next'] = 'następny krok';
 $lang['step1_err_copy'] = 'Skopiuj tekst zaznaczony na różowo pomiędzy cudzysłowiami i wklej do pliku "include/config_database.inc.php"(Uwaga : config_database.inc.php musi zawierać tylko to co jest na różowo bez żadnych znaków końca linii czy spacji)';

-$lang['step1_host'] = 'MySQL host';
+$lang['step1_dbengine'] = 'Database type';
+$lang['step1_dbengine_info'] = 'The type of database your piwigo data will be store in';
+$lang['step1_host'] = 'Host';
 $lang['step1_host_info'] = 'localhost, sql.multimania.com, toto.freesurf.fr';
 $lang['step1_user'] = 'Uzytkownik';
 $lang['step1_user_info'] = 'login użytkownika dostarczona przez provider\'a';