c1209dad3 WIP: merlin
95c9e3823 WIP: Merlin
7560d5e57 Merlin plugin now activated.
c1209dad3
WIP: merlinc1209dad336e098f1664fbaa16b4c412e26c0af8
diff --git a/plugins/org.projectforge.plugins.merlin/src/main/resources/flyway/merlin/init/common/V1.0.0__Merlin_Base_version.sql b/plugins/org.projectforge.plugins.merlin/src/main/resources/flyway/merlin/init/common/V1.0.0__Merlin_Base_version.sql
index 8d72c4e61..889ac36fc 100644
--- a/plugins/org.projectforge.plugins.merlin/src/main/resources/flyway/merlin/init/common/V1.0.0__Merlin_Base_version.sql
+++ b/plugins/org.projectforge.plugins.merlin/src/main/resources/flyway/merlin/init/common/V1.0.0__Merlin_Base_version.sql
@@ -15,9 +15,6 @@ CREATE TABLE t_plugin_merlin_template
filename_pattern CHARACTER VARYING(1000) NOT NULL,
strongly_restricted_filenames BOOLEAN,
- variables CHARACTER VARYING(100000),
- dependent_variables CHARACTER VARYING(100000),
-
attachments_names CHARACTER VARYING(10000),
attachments_ids CHARACTER VARYING(10000),
attachments_counter SMALLINT, 95c9e3823
WIP: Merlin95c9e38238113612b37c071b242388402a8c5c54
diff --git a/plugins/org.projectforge.plugins.merlin/src/main/resources/flyway/merlin/init/common/V1.0.0__Merlin_Base_version.sql b/plugins/org.projectforge.plugins.merlin/src/main/resources/flyway/merlin/init/common/V1.0.0__Merlin_Base_version.sql
index 30377375d..8d72c4e61 100644
--- a/plugins/org.projectforge.plugins.merlin/src/main/resources/flyway/merlin/init/common/V1.0.0__Merlin_Base_version.sql
+++ b/plugins/org.projectforge.plugins.merlin/src/main/resources/flyway/merlin/init/common/V1.0.0__Merlin_Base_version.sql
@@ -3,16 +3,16 @@
CREATE TABLE t_plugin_merlin_template
(
- pk INTEGER NOT NULL,
+ pk INTEGER NOT NULL,
created TIMESTAMP WITHOUT TIME ZONE,
- deleted BOOLEAN NOT NULL,
+ deleted BOOLEAN NOT NULL,
last_update TIMESTAMP WITHOUT TIME ZONE,
- name CHARACTER VARYING(100) NOT NULL,
+ name CHARACTER VARYING(100) NOT NULL,
admin_ids CHARACTER VARYING(4000),
access_group_ids CHARACTER VARYING(4000),
access_user_ids CHARACTER VARYING(4000),
description CHARACTER VARYING(4000),
- fileNamePattern CHARACTER VARYING(1000),
+ filename_pattern CHARACTER VARYING(1000) NOT NULL,
strongly_restricted_filenames BOOLEAN,
variables CHARACTER VARYING(100000),
@@ -20,8 +20,9 @@ CREATE TABLE t_plugin_merlin_template
attachments_names CHARACTER VARYING(10000),
attachments_ids CHARACTER VARYING(10000),
- attachments_size SMALLINT,
- attachments_last_user_action CHARACTER VARYING(10000)
+ attachments_counter SMALLINT,
+ attachments_last_user_action CHARACTER VARYING(10000),
+ attachments_size BIGINT
);
ALTER TABLE t_plugin_merlin_template 7560d5e57
Merlin plugin now activated.7560d5e57e747dbe6392a099d3d9f4d0cf4bc73e
diff --git a/plugins/org.projectforge.plugins.merlin/src/main/resources/flyway/merlin/init/common/V1.0.0__Merlin_Base_version.sql b/plugins/org.projectforge.plugins.merlin/src/main/resources/flyway/merlin/init/common/V1.0.0__Merlin_Base_version.sql
new file mode 100644
index 000000000..30377375d
--- /dev/null
+++ b/plugins/org.projectforge.plugins.merlin/src/main/resources/flyway/merlin/init/common/V1.0.0__Merlin_Base_version.sql
@@ -0,0 +1,28 @@
+-- This is the initial script for setting up the data base for this plugin.
+-- For specific data base dialects, place sql scripts in the sub directory init/{vendor}
+
+CREATE TABLE t_plugin_merlin_template
+(
+ pk INTEGER NOT NULL,
+ created TIMESTAMP WITHOUT TIME ZONE,
+ deleted BOOLEAN NOT NULL,
+ last_update TIMESTAMP WITHOUT TIME ZONE,
+ name CHARACTER VARYING(100) NOT NULL,
+ admin_ids CHARACTER VARYING(4000),
+ access_group_ids CHARACTER VARYING(4000),
+ access_user_ids CHARACTER VARYING(4000),
+ description CHARACTER VARYING(4000),
+ fileNamePattern CHARACTER VARYING(1000),
+ strongly_restricted_filenames BOOLEAN,
+
+ variables CHARACTER VARYING(100000),
+ dependent_variables CHARACTER VARYING(100000),
+
+ attachments_names CHARACTER VARYING(10000),
+ attachments_ids CHARACTER VARYING(10000),
+ attachments_size SMALLINT,
+ attachments_last_user_action CHARACTER VARYING(10000)
+);
+
+ALTER TABLE t_plugin_merlin_template
+ ADD CONSTRAINT t_plugin_merlin_template_pkey PRIMARY KEY (pk);