From 7cd71cf7f6a1d6cd04a2e052ea38ba823023078f Mon Sep 17 00:00:00 2001 From: Jerome Despatis Date: Thu, 1 Dec 2011 14:00:14 +0100 Subject: [PATCH 1/3] name can contain 255 instead of 50 chars, command is text instead of varchar(255 --- share/db_schema.dba | 5 ++--- sql/mysql/schema.sql | 4 ++-- sql/oracle/schema.sql | 2 +- sql/postgresql/schema.sql | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/share/db_schema.dba b/share/db_schema.dba index cbc11d3..941cee9 100644 --- a/share/db_schema.dba +++ b/share/db_schema.dba @@ -8,8 +8,7 @@ $schema = array ( array ( 'command' => array ( - 'length' => 255, - 'type' => 'varchar', + 'type' => 'text', 'not_null' => '1', 'default' => '', ), @@ -27,7 +26,7 @@ $schema = array ( ), 'name' => array ( - 'length' => 50, + 'length' => 255, 'type' => 'varchar', 'not_null' => '1', 'default' => '', diff --git a/sql/mysql/schema.sql b/sql/mysql/schema.sql index bb83b42..8409b05 100644 --- a/sql/mysql/schema.sql +++ b/sql/mysql/schema.sql @@ -1,8 +1,8 @@ CREATE TABLE ezscheduled_script ( - command varchar(255) NOT NULL default '', + command text NOT NULL default '', id int(11) NOT NULL auto_increment, last_report_timestamp int(11) NOT NULL default '0', - name varchar(50) NOT NULL default '', + name varchar(255) NOT NULL default '', process_id int(11) NOT NULL default '0', progress int(3) default '0', user_id int(11) NOT NULL default '0', diff --git a/sql/oracle/schema.sql b/sql/oracle/schema.sql index 4f47549..a9a6875 100644 --- a/sql/oracle/schema.sql +++ b/sql/oracle/schema.sql @@ -4,7 +4,7 @@ CREATE TABLE ezscheduled_script ( command VARCHAR2(255) NOT NULL, id INTEGER NOT NULL, last_report_timestamp INTEGER DEFAULT 0 NOT NULL, - name VARCHAR2(50) NOT NULL, + name VARCHAR2(255) NOT NULL, process_id INTEGER DEFAULT 0 NOT NULL, progress INTEGER DEFAULT 0, user_id INTEGER DEFAULT 0 NOT NULL, diff --git a/sql/postgresql/schema.sql b/sql/postgresql/schema.sql index df80870..748f311 100644 --- a/sql/postgresql/schema.sql +++ b/sql/postgresql/schema.sql @@ -26,7 +26,7 @@ CREATE TABLE ezscheduled_script ( command character varying(255) DEFAULT ''::character varying NOT NULL, id integer DEFAULT nextval('ezscheduled_script_s'::text) NOT NULL, last_report_timestamp integer DEFAULT 0 NOT NULL, - name character varying(50) DEFAULT ''::character varying NOT NULL, + name character varying(255) DEFAULT ''::character varying NOT NULL, process_id integer DEFAULT 0 NOT NULL, progress integer DEFAULT 0, user_id integer DEFAULT 0 NOT NULL From 6f5f23a266dcd1d609e36587eb28c0c713c344db Mon Sep 17 00:00:00 2001 From: Jerome Despatis Date: Thu, 1 Dec 2011 17:23:30 +0100 Subject: [PATCH 2/3] change TEXT to VARCHAR(2000) for all dbms --- share/db_schema.dba | 3 ++- sql/mysql/schema.sql | 2 +- sql/oracle/schema.sql | 2 +- sql/postgresql/schema.sql | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/share/db_schema.dba b/share/db_schema.dba index 941cee9..5d42216 100644 --- a/share/db_schema.dba +++ b/share/db_schema.dba @@ -8,7 +8,8 @@ $schema = array ( array ( 'command' => array ( - 'type' => 'text', + 'length' => 2000, + 'type' => 'varchar', 'not_null' => '1', 'default' => '', ), diff --git a/sql/mysql/schema.sql b/sql/mysql/schema.sql index 8409b05..53b8215 100644 --- a/sql/mysql/schema.sql +++ b/sql/mysql/schema.sql @@ -1,5 +1,5 @@ CREATE TABLE ezscheduled_script ( - command text NOT NULL default '', + command varchar(2000) NOT NULL default '', id int(11) NOT NULL auto_increment, last_report_timestamp int(11) NOT NULL default '0', name varchar(255) NOT NULL default '', diff --git a/sql/oracle/schema.sql b/sql/oracle/schema.sql index a9a6875..2ef6808 100644 --- a/sql/oracle/schema.sql +++ b/sql/oracle/schema.sql @@ -1,7 +1,7 @@ CREATE SEQUENCE s_scheduled_script; CREATE TABLE ezscheduled_script ( - command VARCHAR2(255) NOT NULL, + command VARCHAR2(2000) NOT NULL, id INTEGER NOT NULL, last_report_timestamp INTEGER DEFAULT 0 NOT NULL, name VARCHAR2(255) NOT NULL, diff --git a/sql/postgresql/schema.sql b/sql/postgresql/schema.sql index 748f311..f7e3c27 100644 --- a/sql/postgresql/schema.sql +++ b/sql/postgresql/schema.sql @@ -23,7 +23,7 @@ CREATE SEQUENCE ezscheduled_script_s CREATE TABLE ezscheduled_script ( - command character varying(255) DEFAULT ''::character varying NOT NULL, + command character varying(2000) DEFAULT ''::character varying NOT NULL, id integer DEFAULT nextval('ezscheduled_script_s'::text) NOT NULL, last_report_timestamp integer DEFAULT 0 NOT NULL, name character varying(255) DEFAULT ''::character varying NOT NULL, From c4b3ad351ec0f8c1731461653824ea32dd79b1db Mon Sep 17 00:00:00 2001 From: Jerome Despatis Date: Mon, 12 Dec 2011 12:38:03 +0100 Subject: [PATCH 3/3] mysql db upgrade added --- .../mysql/1.4/unstable/dbupdate-1.3.0-to-1.4.0alpha1.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 update/database/mysql/1.4/unstable/dbupdate-1.3.0-to-1.4.0alpha1.sql diff --git a/update/database/mysql/1.4/unstable/dbupdate-1.3.0-to-1.4.0alpha1.sql b/update/database/mysql/1.4/unstable/dbupdate-1.3.0-to-1.4.0alpha1.sql new file mode 100644 index 0000000..7bf71a4 --- /dev/null +++ b/update/database/mysql/1.4/unstable/dbupdate-1.3.0-to-1.4.0alpha1.sql @@ -0,0 +1 @@ +ALTER TABLE `ezscheduled_script` CHANGE `name` `name` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '', CHANGE `command` `command` VARCHAR( 2000 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL \ No newline at end of file