Update sql scripts for pg and sqlite, and build script to make sure to include them correctly.

Author: cdujeu

dist/phing/build-pydio.xml

@@ -236,14 +236,26 @@
 			<available type="file" file="${git.local_repository}/dist/php/${build.version}.sql"/>
 			<then>
 				<copy file="${git.local_repository}/dist/php/${build.version}.sql" toFile="${upgrade_export}/UPGRADE/DB-UPGRADE.sql"/>
-                <if>
-              			<available type="file" file="${git.local_repository}/dist/php/${build.version}.sqlite"/>
-              			<then>
-              				<copy file="${git.local_repository}/dist/php/${build.version}.sqlite" toFile="${upgrade_export}/UPGRADE/DB-UPGRADE.sqlite"/>
-              			</then>
-              		</if>
 			</then>
 		</if>
+		<if>
+			<available type="file" file="${git.local_repository}/dist/php/${build.version}.mysql"/>
+			<then>
+				<copy file="${git.local_repository}/dist/php/${build.version}.mysql" toFile="${upgrade_export}/UPGRADE/DB-UPGRADE.mysql"/>
+			</then>
+		</if>
+		<if>
+			<available type="file" file="${git.local_repository}/dist/php/${build.version}.sql"/>
+			<then>
+				<copy file="${git.local_repository}/dist/php/${build.version}.sql" toFile="${upgrade_export}/UPGRADE/DB-UPGRADE.sql"/>
+			</then>
+		</if>
+        <if>
+            <available type="file" file="${git.local_repository}/dist/php/${build.version}.sqlite"/>
+            <then>
+                <copy file="${git.local_repository}/dist/php/${build.version}.sqlite" toFile="${upgrade_export}/UPGRADE/DB-UPGRADE.sqlite"/>
+            </then>
+        </if>
 
     </target>
 

dist/php/6.1.0.sql renamed to dist/php/6.1.0.mysql

@@ -1,18 +1,18 @@
 /* SEPARATOR */
 ALTER TABLE  `ajxp_log`
-  ADD COLUMN `repository_id` VARCHAR( 32 ) NOT NULL ,
-  ADD COLUMN `device` VARCHAR( 255 ) NOT NULL ,
+  ADD COLUMN `repository_id` VARCHAR(32),
+  ADD COLUMN `device` VARCHAR( 255 ),
   ADD COLUMN `dirname`		VARCHAR(255),
   ADD COLUMN `basename`  VARCHAR(255),
   ADD INDEX (  `source` ),
   ADD INDEX (  `logdate` ),
   ADD INDEX (  `severity` ),
   ADD INDEX (  `basename` ),
   ADD INDEX (  `repository_id` ),
-  ADD INDEX (  `dirname` ),
-  ADD INDEX (  `basename` )
+  ADD INDEX (  `dirname` )
 ;
 /* SEPARATOR */
 ALTER TABLE `ajxp_roles`
     ADD COLUMN `last_updated` INT(11) NOT NULL DEFAULT 0,
     ADD INDEX (`last_updated`)
+;

dist/php/6.1.0.pgsql

@@ -0,0 +1,24 @@
+/* SEPARATOR */
+ALTER TABLE  ajxp_log
+  ADD COLUMN repository_id VARCHAR( 32 ) DEFAULT NULL ,
+  ADD COLUMN device VARCHAR( 255 ) DEFAULT NULL ,
+  ADD COLUMN dirname	VARCHAR(255),
+  ADD COLUMN basename  VARCHAR(255)
+;
+/* SEPARATOR */
+CREATE INDEX log_date_idx ON ajxp_log(logdate);
+/* SEPARATOR */
+CREATE INDEX log_severity_idx ON ajxp_log(severity);
+/* SEPARATOR */
+CREATE INDEX log_repository_id_idx ON ajxp_log(repository_id);
+/* SEPARATOR */
+CREATE INDEX log_dirname_idx ON ajxp_log(dirname);
+/* SEPARATOR */
+CREATE INDEX log_basename_idx ON ajxp_log(basename);
+/* SEPARATOR */
+CREATE INDEX log_source_idx ON ajxp_log(source);
+
+/* SEPARATOR */
+ALTER TABLE ajxp_roles ADD COLUMN last_updated INTEGER NOT NULL DEFAULT 0;
+/* SEPARATOR */
+CREATE INDEX roles_updated_idx ON ajxp_roles(last_updated);

dist/php/6.1.0.sqlite

@@ -0,0 +1,24 @@
+/* SEPARATOR */
+ALTER TABLE  ajxp_log ADD COLUMN repository_id text DEFAULT NULL;
+/* SEPARATOR */
+ALTER TABLE  ajxp_log ADD COLUMN device text;
+/* SEPARATOR */
+ALTER TABLE  ajxp_log ADD COLUMN dirname		text;
+/* SEPARATOR */
+ALTER TABLE  ajxp_log ADD COLUMN basename  text;
+/* SEPARATOR */
+CREATE INDEX log_date_idx ON ajxp_log(logdate);
+/* SEPARATOR */
+CREATE INDEX log_severity_idx ON ajxp_log(severity);
+/* SEPARATOR */
+CREATE INDEX log_repository_id_idx ON ajxp_log(repository_id);
+/* SEPARATOR */
+CREATE INDEX log_dirname_idx ON ajxp_log(dirname);
+/* SEPARATOR */
+CREATE INDEX log_basename_idx ON ajxp_log(basename);
+/* SEPARATOR */
+CREATE INDEX log_source_idx ON ajxp_log(source);
+/* SEPARATOR */
+ALTER TABLE ajxp_roles ADD COLUMN last_updated INT(11) NOT NULL DEFAULT 0;
+/* SEPARATOR */
+CREATE INDEX roles_updated_idx ON ajxp_roles(last_updated);