Skip to content

Commit 6637d0e

Browse files
committed
#2244 update db script, read me, and version numbers
1 parent 3b019b7 commit 6637d0e

File tree

6 files changed

+108
-9
lines changed

6 files changed

+108
-9
lines changed

Components/Utils/BExIS.Utils.Data/Helpers/ShellSeedDataGenerator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ public void GenerateSeedData()
4040

4141
var o12 = operationManager.Find("Shell", "Settings", "*") ?? operationManager.Create("Shell", "Settings", "*", settings);
4242

43-
if (!versionManager.Exists("Shell", "4.1.0"))
43+
if (!versionManager.Exists("Shell", "4.2.0"))
4444
{
45-
versionManager.Create("Shell", "4.1.0");
45+
versionManager.Create("Shell", "4.2.0");
4646
}
4747
}
4848
}

Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EntityReference/_create.cshtml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
@using (Ajax.BeginForm("Create", "EntityReference", new AjaxOptions { HttpMethod = "POST", UpdateTargetId = "content_createEnityReference", OnSuccess = "createEntityReference_OnSuccess" }))
2828
{
29+
2930
@Html.ValidationSummary(true)
3031

3132
@Html.HiddenFor(m => m.SourceId);

Console/BExIS.Web.Shell/General.Settings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
<!-- landing page for users , when they logged in successfuly -->
1515
<entry key="faq" value="https://github.com/BEXIS2/Core/wiki/FAQ" type="string" />
1616

17-
<entry key="version" value="4.1.0" type="string" />
17+
<entry key="version" value="4.2.0" type="string" />
1818
</settings>

Console/BExIS.Web.Shell/Web.config.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<add key="UseSchemaInDatabaseGeneration" value="False" />
2323
<add key="ThrowErrorWhenParialContentNotFound" value="False" />
2424
<add key="ApplicationName" value="{APPLICATIONNAME}" />
25-
<add key="ApplicationVersion" value="4.1.0" />
25+
<add key="ApplicationVersion" value="4.2.0" />
2626
<add key="SessionWarningDelaySecond" value="30" />
2727
<!-- Keep it as false, there are some test data in the database-->
2828
<add key="CreateDatabase" value="false" />

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ BEXIS2 is published under a GNU LESSER GENERAL PUBLIC LICENSE Version 3
88

99
> In the release notes, you will find a list of all changes to the current version and updated scripts.
1010
11-
[RELEASE NOTES](https://github.com/BEXIS2/Core/blob/4.1.0/Release%20Notes/Release_Notes.md)
11+
[RELEASE NOTES](https://github.com/BEXIS2/Core/blob/4.2.0/Release%20Notes/Release_Notes.md)
1212

1313
# Installation
1414

1515
A guide for the preparation of BEXIS2 on a server is available here.
1616

17-
[Installation Manual](https://github.com/BEXIS2/Documents/blob/4.1.0/Guides/Installation/installation.md)
17+
[Installation Manual](https://github.com/BEXIS2/Documents/blob/4.2.0/Guides/Installation/installation.md)
1818

1919

2020
# Help for Users/Admins/Developers
@@ -36,9 +36,9 @@ The page is divided into:
3636
3737
The initial version of the workspace can be found here:
3838

39-
- [Workspace 4.1.0 Repo](https://github.com/BEXIS2/Workspace/tree/4.1.0)
40-
- [Workspace 4.1.0 Release](https://github.com/BEXIS2/Workspace/releases/tag/4.1.0)
39+
- [Workspace 4.2.0 Repo](https://github.com/BEXIS2/Workspace/tree/4.2.0)
40+
- [Workspace 4.2.0 Release](https://github.com/BEXIS2/Workspace/releases/tag/4.2.0)
4141

4242
# List of Modules
4343

44-
- [Modules Overview](https://github.com/BEXIS2/Core/blob/4.1.0/MODULES.md)
44+
- [Modules Overview](https://github.com/BEXIS2/Core/blob/4.2.0/MODULES.md)

database update scripts/4.1.0-4.2.0.sql

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,104 @@ externallink NOT LIKE 'http%';
1111
ALTER TABLE public.dim_linkelements
1212
ALTER COLUMN xpath TYPE text COLLATE pg_catalog."default";
1313

14+
-- curation
15+
CREATE SEQUENCE IF NOT EXISTS public.curationentries_id_seq
16+
INCREMENT 1
17+
START 1
18+
MINVALUE 1
19+
MAXVALUE 9223372036854775807
20+
CACHE 1;
21+
22+
ALTER SEQUENCE public.curationentries_id_seq
23+
OWNED BY public.curationentries.id;
24+
25+
ALTER SEQUENCE public.curationentries_id_seq
26+
OWNER TO postgres;
27+
28+
CREATE SEQUENCE IF NOT EXISTS public.curationnotes_id_seq
29+
INCREMENT 1
30+
START 1
31+
MINVALUE 1
32+
MAXVALUE 9223372036854775807
33+
CACHE 1;
34+
35+
ALTER SEQUENCE public.curationnotes_id_seq
36+
OWNED BY public.curationnotes.id;
37+
38+
ALTER SEQUENCE public.curationnotes_id_seq
39+
OWNER TO postgres;
40+
41+
CREATE TABLE IF NOT EXISTS public.curationnotes
42+
(
43+
id bigint NOT NULL DEFAULT nextval('curationnotes_id_seq'::regclass),
44+
versionno integer NOT NULL,
45+
extra xml,
46+
usertype integer,
47+
creationdate timestamp without time zone,
48+
comment text COLLATE pg_catalog."default",
49+
userref bigint,
50+
curationentryref bigint,
51+
CONSTRAINT curationnotes_pkey PRIMARY KEY (id),
52+
CONSTRAINT fk_2b898659 FOREIGN KEY (curationentryref)
53+
REFERENCES public.curationentries (id) MATCH SIMPLE
54+
ON UPDATE NO ACTION
55+
ON DELETE NO ACTION,
56+
CONSTRAINT fk_5c66acff FOREIGN KEY (userref)
57+
REFERENCES public.users (id) MATCH SIMPLE
58+
ON UPDATE NO ACTION
59+
ON DELETE NO ACTION
60+
)
61+
62+
TABLESPACE pg_default;
63+
64+
ALTER TABLE IF EXISTS public.curationnotes
65+
OWNER to postgres;
66+
CREATE INDEX IF NOT EXISTS idx_curationnote_id
67+
ON public.curationnotes USING btree
68+
(id ASC NULLS LAST)
69+
TABLESPACE pg_default;
70+
71+
72+
CREATE TABLE IF NOT EXISTS public.curationentries
73+
(
74+
id bigint NOT NULL DEFAULT nextval('curationentries_id_seq'::regclass),
75+
versionno integer NOT NULL,
76+
extra xml,
77+
topic text COLLATE pg_catalog."default",
78+
type integer,
79+
name character varying(255) COLLATE pg_catalog."default",
80+
description text COLLATE pg_catalog."default",
81+
solution character varying(255) COLLATE pg_catalog."default",
82+
"position" integer,
83+
source character varying(255) COLLATE pg_catalog."default",
84+
creationdate timestamp without time zone,
85+
userisdone boolean,
86+
isapproved boolean,
87+
lastchangedatetime_user timestamp without time zone,
88+
lastchangedatetime_curator timestamp without time zone,
89+
datasetref bigint,
90+
userref bigint,
91+
CONSTRAINT curationentries_pkey PRIMARY KEY (id),
92+
CONSTRAINT fk_183adac3 FOREIGN KEY (userref)
93+
REFERENCES public.users (id) MATCH SIMPLE
94+
ON UPDATE NO ACTION
95+
ON DELETE NO ACTION,
96+
CONSTRAINT fk_5d430561 FOREIGN KEY (datasetref)
97+
REFERENCES public.datasets (id) MATCH SIMPLE
98+
ON UPDATE NO ACTION
99+
ON DELETE NO ACTION
100+
)
101+
102+
TABLESPACE pg_default;
103+
104+
ALTER TABLE IF EXISTS public.curationentries
105+
OWNER to postgres;
106+
CREATE INDEX IF NOT EXISTS idx_curationentry_id
107+
ON public.curationentries USING btree
108+
(id ASC NULLS LAST)
109+
TABLESPACE pg_default;
110+
111+
14112
-- BEXIS2 Version Update
15113
INSERT INTO public.versions(
16114
versionno, extra, module, value, date)

0 commit comments

Comments
 (0)