aboutsummaryrefslogtreecommitdiffstats
path: root/install
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--install/db/101-database.php65
-rw-r--r--install/piwigo_structure-mysql.sql3
-rw-r--r--install/piwigo_structure-pdo-sqlite.sql3
-rw-r--r--install/piwigo_structure-pgsql.sql3
-rw-r--r--install/piwigo_structure-sqlite.sql3
5 files changed, 69 insertions, 8 deletions
diff --git a/install/db/101-database.php b/install/db/101-database.php
new file mode 100644
index 000000000..8348a0f86
--- /dev/null
+++ b/install/db/101-database.php
@@ -0,0 +1,65 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2011 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. |
+// +-----------------------------------------------------------------------+
+
+if (!defined('PHPWG_ROOT_PATH'))
+{
+ die('Hacking attempt!');
+}
+
+$upgrade_description = 'merge nb_line_page and nb_image_line into nb_image_page';
+
+// add column
+if ('mysql' == $conf['dblayer'])
+{
+ pwg_query('
+ ALTER TABLE '.USER_INFOS_TABLE.'
+ ADD COLUMN `nb_image_page` tinyint(3) unsigned NOT NULL default \'15\'
+ ;');
+}
+else if (in_array($conf['dblayer'], array('pgsql', 'sqlite', 'pdo-sqlite')))
+{
+ pwg_query('
+ ALTER TABLE '.IMAGES_TABLE.'
+ ADD COLUMN "nb_image_page" INTEGER default 15 NOT NULL
+ ;');
+}
+
+// merge datas
+pwg_query('
+ UPDATE '.USER_INFOS_TABLE.'
+ SET nb_image_page = nb_line_page*nb_image_line
+;');
+
+// delete old columns
+pwg_query('
+ ALTER TABLE '.USER_INFOS_TABLE.'
+ DROP `nb_line_page`,
+ DROP `nb_image_line`
+;');
+
+echo
+"\n"
+. $upgrade_description
+."\n"
+;
+?> \ No newline at end of file
diff --git a/install/piwigo_structure-mysql.sql b/install/piwigo_structure-mysql.sql
index 31b5183ce..42e94d367 100644
--- a/install/piwigo_structure-mysql.sql
+++ b/install/piwigo_structure-mysql.sql
@@ -404,8 +404,7 @@ CREATE TABLE `piwigo_user_group` (
DROP TABLE IF EXISTS `piwigo_user_infos`;
CREATE TABLE `piwigo_user_infos` (
`user_id` smallint(5) NOT NULL default '0',
- `nb_image_line` tinyint(1) unsigned NOT NULL default '5',
- `nb_line_page` tinyint(3) unsigned NOT NULL default '3',
+ `nb_image_page` tinyint(3) unsigned NOT NULL default '15',
`status` enum('webmaster','admin','normal','generic','guest') NOT NULL default 'guest',
`language` varchar(50) NOT NULL default 'en_UK',
`maxwidth` smallint(6) default NULL,
diff --git a/install/piwigo_structure-pdo-sqlite.sql b/install/piwigo_structure-pdo-sqlite.sql
index f89fd160f..a0b502fc8 100644
--- a/install/piwigo_structure-pdo-sqlite.sql
+++ b/install/piwigo_structure-pdo-sqlite.sql
@@ -467,8 +467,7 @@ DROP TABLE IF EXISTS piwigo_user_infos;
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,
+ "nb_image_page" INTEGER default 15 NOT NULL,
"status" VARCHAR(50) default 'guest',
"language" VARCHAR(50) default 'en_UK' NOT NULL,
"maxwidth" INTEGER,
diff --git a/install/piwigo_structure-pgsql.sql b/install/piwigo_structure-pgsql.sql
index 940768e85..cf55dea0c 100644
--- a/install/piwigo_structure-pgsql.sql
+++ b/install/piwigo_structure-pgsql.sql
@@ -568,8 +568,7 @@ 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,
+ "nb_image_page" INTEGER default 15 NOT NULL,
"status" USER_INFOS_STATUS default 'guest'::USER_INFOS_STATUS,
"language" VARCHAR(50) default 'en_UK' NOT NULL,
"maxwidth" INTEGER,
diff --git a/install/piwigo_structure-sqlite.sql b/install/piwigo_structure-sqlite.sql
index f89fd160f..a0b502fc8 100644
--- a/install/piwigo_structure-sqlite.sql
+++ b/install/piwigo_structure-sqlite.sql
@@ -467,8 +467,7 @@ DROP TABLE IF EXISTS piwigo_user_infos;
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,
+ "nb_image_page" INTEGER default 15 NOT NULL,
"status" VARCHAR(50) default 'guest',
"language" VARCHAR(50) default 'en_UK' NOT NULL,
"maxwidth" INTEGER,