Support @Jsql:cache on foreignKey, unique, indexes/index, re #86

jaxdb · Oct 1, 2023 · 241f0a5 · 241f0a5
1 parent 748d4cf
commit 241f0a5
Show file tree

Hide file tree

Showing 6 changed files with 249 additions and 167 deletions.
diff --git a/ddlx/src/main/resources/ddlx-0.6.xsd b/ddlx/src/main/resources/ddlx-0.6.xsd
@@ -32,127 +32,127 @@
 
   <xs:complexType name="tinyint">
     <xs:complexContent>
-      <xs:extension base="ddlx:tinyintAbstract">
+      <xs:extension base="ddlx:tinyintCommon">
         <xs:group ref="ddlx:columnIndex"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
 
   <xs:complexType name="smallint">
     <xs:complexContent>
-      <xs:extension base="ddlx:smallintAbstract">
+      <xs:extension base="ddlx:smallintCommon">
         <xs:group ref="ddlx:columnIndex"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
 
   <xs:complexType name="int">
     <xs:complexContent>
-      <xs:extension base="ddlx:intAbstract">
+      <xs:extension base="ddlx:intCommon">
         <xs:group ref="ddlx:columnIndex"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
 
   <xs:complexType name="bigint">
     <xs:complexContent>
-      <xs:extension base="ddlx:bigintAbstract">
+      <xs:extension base="ddlx:bigintCommon">
         <xs:group ref="ddlx:columnIndex"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
 
   <xs:complexType name="float">
     <xs:complexContent>
-      <xs:extension base="ddlx:floatAbstract">
+      <xs:extension base="ddlx:floatCommon">
         <xs:group ref="ddlx:columnIndex"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
 
   <xs:complexType name="double">
     <xs:complexContent>
-      <xs:extension base="ddlx:doubleAbstract">
+      <xs:extension base="ddlx:doubleCommon">
         <xs:group ref="ddlx:columnIndex"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
 
   <xs:complexType name="decimal">
     <xs:complexContent>
-      <xs:extension base="ddlx:decimalAbstract">
+      <xs:extension base="ddlx:decimalCommon">
         <xs:group ref="ddlx:columnIndex"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
 
   <xs:complexType name="binary">
     <xs:complexContent>
-      <xs:extension base="ddlx:binaryAbstract">
+      <xs:extension base="ddlx:binaryCommon">
         <xs:group ref="ddlx:columnIndex"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
 
   <xs:complexType name="blob">
     <xs:complexContent>
-      <xs:extension base="ddlx:blobAbstract">
+      <xs:extension base="ddlx:blobCommon">
         <xs:group ref="ddlx:columnIndex"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
 
   <xs:complexType name="char">
     <xs:complexContent>
-      <xs:extension base="ddlx:charAbstract">
+      <xs:extension base="ddlx:charCommon">
         <xs:group ref="ddlx:columnIndex"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
 
   <xs:complexType name="clob">
     <xs:complexContent>
-      <xs:extension base="ddlx:clobAbstract">
+      <xs:extension base="ddlx:clobCommon">
         <xs:group ref="ddlx:columnIndex"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
 
   <xs:complexType name="enum">
     <xs:complexContent>
-      <xs:extension base="ddlx:enumAbstract">
+      <xs:extension base="ddlx:enumCommon">
         <xs:group ref="ddlx:columnIndex"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
 
   <xs:complexType name="date">
     <xs:complexContent>
-      <xs:extension base="ddlx:dateAbstract">
+      <xs:extension base="ddlx:dateCommon">
         <xs:group ref="ddlx:columnIndex"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
 
   <xs:complexType name="time">
     <xs:complexContent>
-      <xs:extension base="ddlx:timeAbstract">
+      <xs:extension base="ddlx:timeCommon">
         <xs:group ref="ddlx:columnIndex"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
 
   <xs:complexType name="datetime">
     <xs:complexContent>
-      <xs:extension base="ddlx:datetimeAbstract">
+      <xs:extension base="ddlx:datetimeCommon">
         <xs:group ref="ddlx:columnIndex"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
 
   <xs:complexType name="boolean">
     <xs:complexContent>
-      <xs:extension base="ddlx:booleanAbstract">
+      <xs:extension base="ddlx:booleanCommon">
         <xs:group ref="ddlx:columnIndex"/>
       </xs:extension>
     </xs:complexContent>
@@ -173,7 +173,6 @@
               <xs:selector xpath="ddlx:column"/>
               <xs:field xpath="@name"/>
             </xs:key>
-
             <xs:keyref name="check_column_must_match_name_of_column_element" refer="ddlx:keyColumnName">
               <xs:selector xpath=".//ddlx:check|.//ddlx:and|.//ddlx:or"/>
               <xs:field xpath="@column"/>