remove indices which are problematic with ORACLE

52North · Jul 31, 2019 · 45ab63a · 45ab63a
1 parent 02a8b8b
commit 45ab63a
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 39 deletions.
diff --git a/hibernate/mappings/src/main/resources/mapping/ereporting/ParameterValues.hbm.xml b/hibernate/mappings/src/main/resources/mapping/ereporting/ParameterValues.hbm.xml
@@ -8,7 +8,7 @@
         table="booleanparametervalue" check="value in ('T','F')">
         <comment>Value table for boolean parameter</comment>
         <key foreign-key="parameterBooleanValueFk">
-            <column name="parameterId" index="booleanparamididx">
+            <column name="parameterId">
                 <comment>Foreign Key (FK) to the related parameter from the
                     parameter table. Contains "parameter".parameterid</comment>
             </column>
@@ -25,7 +25,7 @@
         table="categoryparametervalue">
         <comment>Value table for category parameter</comment>
         <key foreign-key="parameterCategoryValueFk">
-            <column name="parameterId" index="categoryparamididx">
+            <column name="parameterId">
                 <comment>Foreign Key (FK) to the related parameter from the
                     parameter table. Contains "parameter".parameterid</comment>
             </column>
@@ -49,7 +49,7 @@
         table="countparametervalue">
         <comment>Value table for count parameter</comment>
         <key foreign-key="parameterCountValueFk">
-            <column name="parameterId" index="countparamididx">
+            <column name="parameterId">
                 <comment>Foreign Key (FK) to the related parameter from the
                     parameter table. Contains "parameter".parameterid</comment>
             </column>
@@ -66,7 +66,7 @@
         table="numericparametervalue">
         <comment>Value table for numeric/Measurment parameter</comment>
         <key foreign-key="parameterNumericValueFk">
-            <column name="parameterId" index="numericparamididx">
+            <column name="parameterId">
                 <comment>Foreign Key (FK) to the related parameter from the
                     parameter table. Contains "parameter".parameterid</comment>
             </column>
@@ -90,7 +90,7 @@
         table="textparametervalue">
         <comment>Value table for text parameter</comment>
         <key foreign-key="parameterTextValueFk">
-            <column name="parameterId" index="textparamididx">
+            <column name="parameterId">
                 <comment>Foreign Key (FK) to the related parameter from the
                     parameter table. Contains "parameter".parameterid</comment>
             </column>
@@ -107,7 +107,7 @@
         table="xmlparametervalue">
         <comment>Value table for XML parameter</comment>
         <key foreign-key="parameterXmlValueFk">
-            <column name="parameterId" index="xmlparamididx">
+            <column name="parameterId">
                 <comment>Foreign Key (FK) to the related parameter from the
                     parameter table. Contains "parameter".parameterid</comment>
             </column>

diff --git a/hibernate/mappings/src/main/resources/mapping/metadata/series/SeriesParameter.hbm.xml b/hibernate/mappings/src/main/resources/mapping/metadata/series/SeriesParameter.hbm.xml
@@ -28,7 +28,7 @@
                          check="value in ('T','F')">
             <comment>Value table for boolean parameter</comment>
             <key foreign-key="seriesParamBooleanValueFk">
-                <column name="parameterId" index="booleanseriesparamididx">
+                <column name="parameterId">
                     <comment>Foreign Key (FK) to the related parameter from the series parameter table. Contains seriesparameter.parameterid</comment>
                 </column>
             </key>
@@ -44,7 +44,7 @@
                          table="categoryseriesparamvalue">
             <comment>Value table for category parameter</comment>
             <key foreign-key="seriesParamCategoryValueFk">
-                <column name="parameterId" index="categoryseriesparamididx">
+                <column name="parameterId">
                     <comment>Foreign Key (FK) to the related parameter from the series parameter table. Contains seriesparameter.parameterid</comment>
                 </column>
             </key>
@@ -67,7 +67,7 @@
                          table="countseriesparamvalue">
             <comment>Value table for count parameter</comment>
             <key foreign-key="seriesParamCountValueFk">
-                <column name="parameterId" index="countseriesparamididx">
+                <column name="parameterId">
                     <comment>Foreign Key (FK) to the related parameter from the series parameter table. Contains seriesparameter.parameterid</comment>
                 </column>
             </key>
@@ -83,7 +83,7 @@
                          table="numericseriesparamvalue">
             <comment>Value table for numeric/Measurment parameter</comment>
             <key foreign-key="seriesParamNumericValueFk">
-                <column name="parameterId" index="numericseriesparamididx">
+                <column name="parameterId">
                     <comment>Foreign Key (FK) to the related parameter from the series parameter table. Contains seriesparameter.parameterid</comment>
                 </column>
             </key>
@@ -107,7 +107,7 @@
                          table="textseriesparamvalue">
             <comment>Value table for text parameter</comment>
             <key foreign-key="seriesParamTextValueFk">
-                <column name="parameterId" index="textseriesparamididx">
+                <column name="parameterId">
                     <comment>Foreign Key (FK) to the related parameter from the series parameter table. Contains seriesparameter.parameterid</comment>
                 </column>
             </key>
@@ -123,7 +123,7 @@
                          table="xmlseriesparamvalue">
             <comment>Value table for XML parameter</comment>
             <key foreign-key="seriesParamXmlValueFk">
-                <column name="parameterId" index="xmlseriesparamididx">
+                <column name="parameterId">
                     <comment>Foreign Key (FK) to the related parameter from the series parameter table. Contains seriesparameter.parameterid</comment>
                 </column>
             </key>

diff --git a/hibernate/mappings/src/main/resources/mapping/old/observation/ParameterValues.hbm.xml b/hibernate/mappings/src/main/resources/mapping/old/observation/ParameterValues.hbm.xml
@@ -8,7 +8,7 @@
         table="booleanparametervalue" check="value in ('T','F')">
         <comment>Value table for boolean parameter</comment>
         <key foreign-key="parameterBooleanValueFk">
-            <column name="parameterId" index="booleanparamididx">
+            <column name="parameterId">
                 <comment>Foreign Key (FK) to the related parameter from the
                     parameter table. Contains "parameter".parameterid</comment>
             </column>
@@ -25,7 +25,7 @@
         table="categoryparametervalue">
         <comment>Value table for category parameter</comment>
         <key foreign-key="parameterCategoryValueFk">
-            <column name="parameterId" index="categoryparamididx">
+            <column name="parameterId">
                 <comment>Foreign Key (FK) to the related parameter from the
                     parameter table. Contains "parameter".parameterid</comment>
             </column>
@@ -49,7 +49,7 @@
         table="countparametervalue">
         <comment>Value table for count parameter</comment>
         <key foreign-key="parameterCountValueFk">
-            <column name="parameterId" index="countparamididx">
+            <column name="parameterId">
                 <comment>Foreign Key (FK) to the related parameter from the
                     parameter table. Contains "parameter".parameterid</comment>
             </column>
@@ -66,7 +66,7 @@
         table="numericparametervalue">
         <comment>Value table for numeric/Measurment parameter</comment>
         <key foreign-key="parameterNumericValueFk">
-            <column name="parameterId" index="numericparamididx">
+            <column name="parameterId">
                 <comment>Foreign Key (FK) to the related parameter from the
                     parameter table. Contains "parameter".parameterid</comment>
             </column>
@@ -90,7 +90,7 @@
         table="textparametervalue">
         <comment>Value table for text parameter</comment>
         <key foreign-key="parameterTextValueFk">
-            <column name="parameterId" index="textparamididx">
+            <column name="parameterId">
                 <comment>Foreign Key (FK) to the related parameter from the
                     parameter table. Contains "parameter".parameterid</comment>
             </column>
@@ -107,7 +107,7 @@
         table="xmlparametervalue">
         <comment>Value table for XML parameter</comment>
         <key foreign-key="parameterXmlValueFk">
-            <column name="parameterId" index="xmlparamididx">
+            <column name="parameterId">
                 <comment>Foreign Key (FK) to the related parameter from the
                     parameter table. Contains "parameter".parameterid</comment>
             </column>

diff --git a/...ngs/src/main/resources/mapping/series/observation/ContextualReferencedObservation.hbm.xml b/...ngs/src/main/resources/mapping/series/observation/ContextualReferencedObservation.hbm.xml
@@ -17,7 +17,7 @@
         <many-to-one name="series"
                      class="org.n52.sos.ds.hibernate.entities.observation.series.Series"
                      foreign-key="observationSeriesFk">
-            <column index="obsSeriesIdx"
+            <column
                     name="seriesId"
                     not-null="true">
                    <comment>Relation/foreign key to the associated series table. Contains "series".seriesId</comment>
@@ -144,7 +144,7 @@
         </set>
         <set name="relatedObservations" table="relatedobservations" fetch="join" access="field" cascade="all">
 	        <key>
-	            <column name="observationId" not-null="true" index="relatedObsObsIdx" />
+	            <column name="observationId" not-null="true" />
 	        </key>
 	        <one-to-many class="org.n52.sos.ds.hibernate.entities.observation.RelatedObservation" />
     	</set>

diff --git a/hibernate/mappings/src/main/resources/mapping/series/observation/Observation.hbm.xml b/hibernate/mappings/src/main/resources/mapping/series/observation/Observation.hbm.xml
@@ -18,7 +18,7 @@
         <many-to-one name="series"
                      class="org.n52.sos.ds.hibernate.entities.observation.series.Series"
                      foreign-key="observationSeriesFk">
-            <column index="obsSeriesIdx"
+            <column
                     name="seriesId"
                     not-null="true">
                    <comment>Relation/foreign key to the associated series table. Contains "series".seriesId</comment>
@@ -153,7 +153,7 @@
         </set>
         <set name="relatedObservations" table="relatedobservations" fetch="join" access="field" cascade="all">
 	        <key>
-	            <column name="observationId" not-null="true" index="relatedObsObsIdx" />
+	            <column name="observationId" not-null="true"/>
 	        </key>
 	        <one-to-many class="org.n52.sos.ds.hibernate.entities.observation.RelatedObservation" />
     	</set>

diff --git a/hibernate/mappings/src/main/resources/mapping/series/observation/ParameterValues.hbm.xml b/hibernate/mappings/src/main/resources/mapping/series/observation/ParameterValues.hbm.xml
@@ -8,7 +8,7 @@
         table="booleanparametervalue" check="value in ('T','F')">
         <comment>Value table for boolean parameter</comment>
         <key foreign-key="parameterBooleanValueFk">
-            <column name="parameterId" index="booleanparamididx">
+            <column name="parameterId">
                 <comment>Foreign Key (FK) to the related parameter from the
                     parameter table. Contains "parameter".parameterid</comment>
             </column>
@@ -25,7 +25,7 @@
         table="categoryparametervalue">
         <comment>Value table for category parameter</comment>
         <key foreign-key="parameterCategoryValueFk">
-            <column name="parameterId" index="categoryparamididx">
+            <column name="parameterId">
                 <comment>Foreign Key (FK) to the related parameter from the
                     parameter table. Contains "parameter".parameterid</comment>
             </column>
@@ -49,7 +49,7 @@
         table="countparametervalue">
         <comment>Value table for count parameter</comment>
         <key foreign-key="parameterCountValueFk">
-            <column name="parameterId" index="countparamididx">
+            <column name="parameterId">
                 <comment>Foreign Key (FK) to the related parameter from the
                     parameter table. Contains "parameter".parameterid</comment>
             </column>
@@ -66,7 +66,7 @@
         table="numericparametervalue">
         <comment>Value table for numeric/Measurment parameter</comment>
         <key foreign-key="parameterNumericValueFk">
-            <column name="parameterId" index="numericparamididx">
+            <column name="parameterId">
                 <comment>Foreign Key (FK) to the related parameter from the
                     parameter table. Contains "parameter".parameterid</comment>
             </column>
@@ -90,7 +90,7 @@
         table="textparametervalue">
         <comment>Value table for text parameter</comment>
         <key foreign-key="parameterTextValueFk">
-            <column name="parameterId" index="textparamididx">
+            <column name="parameterId">
                 <comment>Foreign Key (FK) to the related parameter from the
                     parameter table. Contains "parameter".parameterid</comment>
             </column>
@@ -107,7 +107,7 @@
         table="xmlparametervalue">
         <comment>Value table for XML parameter</comment>
         <key foreign-key="parameterXmlValueFk">
-            <column name="parameterId" index="xmlparamididx">
+            <column name="parameterId">
                 <comment>Foreign Key (FK) to the related parameter from the
                     parameter table. Contains "parameter".parameterid</comment>
             </column>

diff --git a/hibernate/mappings/src/main/resources/mapping/series/observation/RelatedObservations.hbm.xml b/hibernate/mappings/src/main/resources/mapping/series/observation/RelatedObservations.hbm.xml
@@ -15,13 +15,13 @@
             </generator>
         </id>
 		<many-to-one name="observation"
-			class="org.n52.sos.ds.hibernate.entities.observation.series.AbstractSeriesObservation" index="relobsobsididx">
+			class="org.n52.sos.ds.hibernate.entities.observation.series.AbstractSeriesObservation">
 			<column name="observationId" not-null="false">
 				<comment>Foreign Key (FK) to the observation. Contains "observation".observationId</comment>
 			</column>
 		</many-to-one>
 		<many-to-one name="relatedObservation"
-			class="org.n52.sos.ds.hibernate.entities.observation.series.AbstractSeriesObservation" index="relobsrelobsididx">
+			class="org.n52.sos.ds.hibernate.entities.observation.series.AbstractSeriesObservation">
 			<column name="relatedObservation">
 				<comment>Relation/foreign key to the associated observation table. Contains "observation".observationId</comment>
 			</column>

diff --git a/...pings/src/main/resources/mapping/series/observation/TemporalReferencedObservation.hbm.xml b/...pings/src/main/resources/mapping/series/observation/TemporalReferencedObservation.hbm.xml
@@ -17,7 +17,7 @@
         <many-to-one name="series"
                      class="org.n52.sos.ds.hibernate.entities.observation.series.Series"
                      foreign-key="observationSeriesFk">
-            <column index="obsSeriesIdx"
+            <column
                     name="seriesId"
                     not-null="true">
                    <comment>Relation/foreign key to the associated series table. Contains "series".seriesId</comment>

diff --git a/hibernate/mappings/src/main/resources/mapping/series/observation/ValuedObservation.hbm.xml b/hibernate/mappings/src/main/resources/mapping/series/observation/ValuedObservation.hbm.xml
@@ -18,7 +18,7 @@
         <many-to-one name="series"
                      class="org.n52.sos.ds.hibernate.entities.observation.series.Series"
                      foreign-key="observationSeriesFk">
-            <column index="obsSeriesIdx"
+            <column
                     name="seriesId"
                     not-null="true">
                    <comment>Relation/foreign key to the associated series table. Contains "series".seriesId</comment>
@@ -153,7 +153,7 @@
         </set>
         <set name="relatedObservations" table="relatedobservations" fetch="join" access="field" cascade="all">
 	        <key>
-	            <column name="observationId" not-null="true" index="relatedObsObsIdx" />
+	            <column name="observationId" not-null="true"/>
 	        </key>
 	        <one-to-many class="org.n52.sos.ds.hibernate.entities.observation.RelatedObservation" />
     	</set>
@@ -286,8 +286,7 @@
                 </column>
             </key>
             <property name="value" 
-                      type="text"
-                      index="textvalueidx">
+                      type="text">
                  <column name="value">
                      <comment>Text observation value</comment>
                  </column>
@@ -343,13 +342,13 @@
                  cascade="delete-orphan">
                 <comment>Relation table for complex parent/child observations</comment>
                 <key foreign-key="observationParentFK" >
-                     <column name="observationId" not-null="true" index="complexobsididx">
+                     <column name="observationId" not-null="true">
                          <comment>Foreign Key (FK) to the related parent complex observation. Contains "observation".observationid</comment>
                     </column>
                 </key>
                 <many-to-many entity-name="org.n52.sos.ds.hibernate.entities.observation.series.AbstractSeriesObservation"
                               foreign-key="observationChildFk">
-                    <column name="childObservationId" not-null="true" index="complexchildobsididx">
+                    <column name="childObservationId" not-null="true">
                         <comment>Foreign Key (FK) to the related child complex observation. Contains "observation".observationid</comment>
                     </column>
                 </many-to-many>
@@ -395,13 +394,13 @@
                  cascade="delete-orphan">
                 <comment>Relation table for complex parent/child observations</comment>
                 <key foreign-key="profileObsParentFK" >
-                     <column name="observationId" not-null="true" index="profileobsididx">
+                     <column name="observationId" not-null="true">
                          <comment>Foreign Key (FK) to the related parent complex observation. Contains "observation".observationid</comment>
                     </column>
                 </key>
                 <many-to-many entity-name="org.n52.sos.ds.hibernate.entities.observation.series.AbstractSeriesObservation"
                               foreign-key="profileObsChildFk" >
-                    <column name="childObservationId" not-null="true" index="profileobsididx">
+                    <column name="childObservationId" not-null="true">
                         <comment>Foreign Key (FK) to the related child complex observation. Contains "observation".observationid</comment>
                     </column>
                 </many-to-many>