Pgsql compatibility

htdocs/core/modules/modOpenSurvey.class.php

@@ -1,7 +1,18 @@
 <?php
-/* Copyright (C) 2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2013 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
- * Licensed under the GNU GPL v3 or higher (See file gpl-3.0.html)
+ * 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; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -184,10 +195,11 @@ class modOpenSurvey extends DolibarrModules
 	 */
 	function init($options='')
 	{
+		// Permissions
+		$this->remove($options);
+		
 		$sql = array();
 
-		$result=$this->load_tables();
-
 		return $this->_init($sql,$options);
 	}
 
@@ -205,20 +217,6 @@ class modOpenSurvey extends DolibarrModules
 
 		return $this->_remove($sql,$options);
 	}
-
-
-	/**
-	 *	Create tables and keys required by module
-	 * 	Files mymodule.sql and mymodule.key.sql with create table and create keys
-	 * 	commands must be stored in directory /mymodule/sql/
-	 *	This function is called by this->init.
-	 *
-	 * 	@return		int		<=0 if KO, >0 if OK
-	 */
-	function load_tables()
-	{
-	    return $this->_load_tables('/opensurvey/sql/');
-	}
 }
 
 ?>

htdocs/install/mysql/migration/3.3.0-3.4.0.sql

@@ -306,3 +306,44 @@ create table llx_projet_task_extrafields
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
 ALTER TABLE llx_projet_task_extrafields ADD INDEX idx_projet_task_extrafields (fk_object);
+
+
+CREATE TABLE llx_opensurvey_comments (
+    id_comment INTEGER unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY,
+    id_sondage CHAR(16) NOT NULL,
+    comment text NOT NULL,
+    tms timestamp,
+    usercomment text
+) ENGINE=InnoDB;
+
+CREATE TABLE llx_opensurvey_sondage (
+       id_sondage VARCHAR(16) PRIMARY KEY,
+       id_sondage_admin CHAR(24),
+       commentaires text,
+       mail_admin VARCHAR(128),
+       nom_admin VARCHAR(64),
+       titre text,
+       date_fin datetime,
+       format VARCHAR(2),
+       mailsonde varchar(2) DEFAULT '0',
+       survey_link_visible integer DEFAULT 1,
+	   canedit integer DEFAULT 0,
+       origin varchar(64),
+       tms timestamp,
+	   sujet TEXT
+) ENGINE=InnoDB;
+CREATE TABLE llx_opensurvey_user_studs (
+    id_users INTEGER NOT NULL AUTO_INCREMENT PRIMARY KEY,
+    nom VARCHAR(64) NOT NULL,
+    id_sondage VARCHAR(16) NOT NULL,
+    reponses VARCHAR(100) NOT NULL,
+    tms timestamp
+) ENGINE=InnoDB;
+
+ALTER TABLE llx_opensurvey_comments ADD INDEX idx_id_comment (id_comment);
+ALTER TABLE llx_opensurvey_comments ADD INDEX idx_id_sondage (id_sondage);
+ALTER TABLE llx_opensurvey_sondage ADD INDEX idx_id_sondage_admin (id_sondage_admin);
+ALTER TABLE llx_opensurvey_sondage ADD INDEX idx_date_fin (date_fin);
+ALTER TABLE llx_opensurvey_user_studs ADD INDEX idx_id_users (id_users);
+ALTER TABLE llx_opensurvey_user_studs ADD INDEX idx_nom (nom);
+ALTER TABLE llx_opensurvey_user_studs ADD INDEX idx_id_sondage (id_sondage);

htdocs/opensurvey/sql/llx_opensurvey_comments.key.sql

@@ -1,22 +0,0 @@
--- ============================================================================
--- Copyright (C) 2013 Laurent Destailleur <eldy@users.sourceforge.net>
---
--- 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; either version 3 of the License, or
--- (at your option) any later version.
---
--- 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, see <http://www.gnu.org/licenses/>.
--- ============================================================================
-
-ALTER TABLE llx_opensurvey_comments ADD INDEX idx_id_comment id_comment;
-ALTER TABLE llx_opensurvey_comments ADD INDEX idx_id_sondage id_sondage;
-
-
-

htdocs/opensurvey/sql/llx_opensurvey_comments.sql

@@ -1,25 +0,0 @@
--- ============================================================================
--- Copyright (C) 2013 Laurent Destailleur <eldy@users.sourceforge.net>
---
--- 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; either version 3 of the License, or
--- (at your option) any later version.
---
--- 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, see <http://www.gnu.org/licenses/>.
--- ============================================================================
-
-CREATE TABLE llx_opensurvey_comments (
-    id_comment INTEGER unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY,
-    id_sondage CHAR(16) NOT NULL,
-    comment text NOT NULL,
-    tms timestamp,
-    usercomment text
-) ENGINE=InnoDB;
-

htdocs/opensurvey/sql/llx_opensurvey_sondage.key.sql

@@ -1,19 +0,0 @@
--- ============================================================================
--- Copyright (C) 2013 Laurent Destailleur <eldy@users.sourceforge.net>
---
--- 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; either version 3 of the License, or
--- (at your option) any later version.
---
--- 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, see <http://www.gnu.org/licenses/>.
--- ============================================================================
-
-ALTER TABLE llx_opensurvey_sondage ADD INDEX idx_id_sondage_admin id_sondage_admin;
-ALTER TABLE llx_opensurvey_sondage ADD INDEX idx_date_fin date_fin;

htdocs/opensurvey/sql/llx_opensurvey_sondage.sql

@@ -1,33 +0,0 @@
--- ============================================================================
--- Copyright (C) 2013 Laurent Destailleur <eldy@users.sourceforge.net>
---
--- 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; either version 3 of the License, or
--- (at your option) any later version.
---
--- 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, see <http://www.gnu.org/licenses/>.
--- ============================================================================
-
-CREATE TABLE llx_opensurvey_sondage (
-       id_sondage VARCHAR(16) PRIMARY KEY,
-       id_sondage_admin CHAR(24),
-       commentaires text,
-       mail_admin VARCHAR(128),
-       nom_admin VARCHAR(64),
-       titre text,
-       date_fin datetime,
-       format VARCHAR(2),
-       mailsonde varchar(2) DEFAULT '0',
-       survey_link_visible integer DEFAULT 1,
-	   canedit integer DEFAULT 0,
-       origin varchar(64),
-       tms timestamp,
-	   sujet TEXT
-) ENGINE=InnoDB;

htdocs/opensurvey/sql/llx_opensurvey_user_studs.key.sql

@@ -1,20 +0,0 @@
--- ============================================================================
--- Copyright (C) 2013 Laurent Destailleur <eldy@users.sourceforge.net>
---
--- 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; either version 3 of the License, or
--- (at your option) any later version.
---
--- 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, see <http://www.gnu.org/licenses/>.
--- ============================================================================
-
-ALTER TABLE llx_opensurvey_user_studs ADD INDEX idx_id_users (id_users);
-ALTER TABLE llx_opensurvey_user_studs ADD INDEX idx_nom (nom);
-ALTER TABLE llx_opensurvey_user_studs ADD INDEX idx_id_sondage (id_sondage);

htdocs/opensurvey/sql/llx_opensurvey_user_studs.sql

@@ -1,24 +0,0 @@
--- ============================================================================
--- Copyright (C) 2013 Laurent Destailleur <eldy@users.sourceforge.net>
---
--- 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; either version 3 of the License, or
--- (at your option) any later version.
---
--- 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, see <http://www.gnu.org/licenses/>.
--- ============================================================================
-
-CREATE TABLE llx_opensurvey_user_studs (
-    id_users INTEGER NOT NULL AUTO_INCREMENT PRIMARY KEY,
-    nom VARCHAR(64) NOT NULL,
-    id_sondage VARCHAR(16) NOT NULL,
-    reponses VARCHAR(100) NOT NULL,
-    tms timestamp
-) ENGINE=InnoDB;