Merge branch 'dev' of https://github.com/BEXIS2/Workspace into dev

BEXIS2 · Oct 21, 2021 · 5169106 · 5169106
2 parents 35dfa5d + f68a047
commit 5169106
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,6 @@
 /Modules/DDM/Lucene/SearchIndex/BexisAutoComplete/segments_1
+<<<<<<< HEAD
+/Modules/DDM/Lucene
+=======
 /General/Configurations/Credentials.config
+>>>>>>> 9a1b89511ee2031ef009497d1d5403106eb32385
diff --git a/Components/Dlm/Db/Mappings/Default/Data/ContentDescriptor.hbm.xml b/Components/Dlm/Db/Mappings/Default/Data/ContentDescriptor.hbm.xml
@@ -29,8 +29,8 @@
       <column name="Name" index="idx_ContentDescriptors_id"/>
     </property>
 
-    <property name="URI" type="String">
-      <column name="URI" />
+    <property name="URI" type="StringClob">
+      <column name="URI"  sql-type="text"/>
     </property>
 
     <many-to-one class="DatasetVersion" name="DatasetVersion" column="DatasetVersionRef" not-null="true">      

diff --git a/Components/Dlm/Db/Mappings/Default/Data/DatasetVersion.hbm.xml b/Components/Dlm/Db/Mappings/Default/Data/DatasetVersion.hbm.xml
@@ -114,4 +114,4 @@
 
   </class>
 
-</hibernate-mapping>
+</hibernate-mapping>
diff --git a/Components/Security/Db/Mappings/Default/Requests/Decision.hbm.xml b/Components/Security/Db/Mappings/Default/Requests/Decision.hbm.xml
@@ -13,6 +13,7 @@
       <column name="Extra" not-null="false" sql-type="xml" />
     </property>
 
+
     <property name="DecisionDate" type="DateTime">
       <column name="DecisionDate" />
     </property>
@@ -30,4 +31,4 @@
 
     <many-to-one name="Request" column="RequestRef" class="BExIS.Security.Entities.Requests.Request, BExIS.Security.Entities" />
   </class>
-</hibernate-mapping>
+</hibernate-mapping>
diff --git a/Components/Security/Db/Mappings/Default/Requests/Request.hbm.xml b/Components/Security/Db/Mappings/Default/Requests/Request.hbm.xml
@@ -43,4 +43,4 @@
 
     <many-to-one name="Applicant" column="ApplicantRef" class="BExIS.Security.Entities.Subjects.User, BExIS.Security.Entities" />
   </class>
-</hibernate-mapping>
+</hibernate-mapping>
diff --git a/General/Db/Settings/PostgreSQL82Dialect.hibernate.cfg.xml b/General/Db/Settings/PostgreSQL82Dialect.hibernate.cfg.xml
@@ -16,6 +16,7 @@
     <property name="show_sql">False</property><!--set to false on production-->
     <property name="format_sql">True</property><!--set to false on production-->
     <property name="generate_statistics">False</property><!--set to false on production-->
+    <property name="command_timeout">180</property><!--	Specify the default timeout in seconds of DbCommands generated by NHibernate. Negative values disable it. Link: https://nhibernate.info/doc/nhibernate-reference/session-configuration.html-->
   </session-factory>
 
 </hibernate-configuration>
diff --git a/Modules/DDM/Lucene/SearchIndex/BexisAutoComplete/segments.gen b/Modules/DDM/Lucene/SearchIndex/BexisAutoComplete/segments.gen
diff --git a/Modules/DDM/Lucene/SearchIndex/BexisAutoComplete/segments_1 b/Modules/DDM/Lucene/SearchIndex/BexisAutoComplete/segments_1
diff --git a/Modules/DDM/Lucene/SearchIndex/BexisSearchIndex/segments.gen b/Modules/DDM/Lucene/SearchIndex/BexisSearchIndex/segments.gen
diff --git a/Modules/DDM/Lucene/SearchIndex/BexisSearchIndex/segments_1 b/Modules/DDM/Lucene/SearchIndex/BexisSearchIndex/segments_1
Original file line number	Diff line number	Diff line change
Expand Up		@@ -114,4 +114,4 @@

		</class>

		</hibernate-mapping>
		</hibernate-mapping>