Set XSD version to v1.1

jaxdb · Aug 11, 2023 · cf9f7f9 · cf9f7f9
1 parent d70dc52
commit cf9f7f9
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 5 deletions.
diff --git a/ddlx/src/main/resources/ddlx-0.5.xsd b/ddlx/src/main/resources/ddlx-0.5.xsd
@@ -15,9 +15,11 @@
   program. If not, see <http://opensource.org/licenses/MIT/>.
 -->
 <xs:schema
+  vc:minVersion="1.1"
   elementFormDefault="qualified"
   targetNamespace="http://www.jaxdb.org/ddlx-0.5.xsd"
   xmlns:ddlx="http://www.jaxdb.org/ddlx-0.5.xsd"
+  xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning"
   xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
   <xs:include schemaLocation="ddlx-common-0.5.xsd"/>

diff --git a/ddlx/src/main/resources/ddlx-common-0.5.xsd b/ddlx/src/main/resources/ddlx-common-0.5.xsd
@@ -15,10 +15,12 @@
   program. If not, see <http://opensource.org/licenses/MIT/>.
 -->
 <xs:schema
+  vc:minVersion="1.1"
   elementFormDefault="qualified"
   targetNamespace="http://www.jaxdb.org/ddlx-0.5.xsd"
   xmlns:ddlx="http://www.jaxdb.org/ddlx-0.5.xsd"
   xmlns:dt="http://www.jaxdb.org/datatypes-0.5.xsd"
+  xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:xs="http://www.w3.org/2001/XMLSchema">
 

diff --git a/jsql/src/main/java/org/jaxdb/jsql/Schema.java b/jsql/src/main/java/org/jaxdb/jsql/Schema.java
@@ -109,8 +109,9 @@ Notifier<?> getCacheNotifier() {
         final SELECT<T> select = onConnectPreLoad.apply(table);
         if (select != null) {
           final Connector connector = table.getSchema().getConnector();
-          try (final RowIterator<T> rows = select.execute(connector)) {
-            while (rows.nextRow());
+          try (final RowIterator<T> rows = select.execute(connector, CacheConfig.withoutCacheSelectEntity)) {
+            while (rows.nextRow())
+              cacheNotifier.onSelect(rows.nextEntity());
           }
         }
       }

diff --git a/jsql/src/main/resources/jsql-0.5.xsd b/jsql/src/main/resources/jsql-0.5.xsd
@@ -15,12 +15,14 @@
   program. If not, see <http://opensource.org/licenses/MIT/>.
 -->
 <xs:schema
+  vc:minVersion="1.1"
   elementFormDefault="qualified"
   attributeFormDefault="qualified"
   targetNamespace="http://www.jaxdb.org/jsql-0.5.xsd"
   xmlns:ddlx="http://www.jaxdb.org/ddlx-0.5.xsd"
   xmlns:sqlx="http://www.jaxdb.org/sqlx-0.5.xsd"
   xmlns:jsql="http://www.jaxdb.org/jsql-0.5.xsd"
+  xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning"
   xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
   <xs:import namespace="http://www.jaxdb.org/ddlx-0.5.xsd" schemaLocation="jsql-ddlx-0.5.xsd"/>

diff --git a/jsql/src/main/resources/jsql-ddlx-0.5.xsd b/jsql/src/main/resources/jsql-ddlx-0.5.xsd
@@ -15,11 +15,13 @@
   program. If not, see <http://opensource.org/licenses/MIT/>.
 -->
 <xs:schema
+  vc:minVersion="1.1"
   elementFormDefault="qualified"
   targetNamespace="http://www.jaxdb.org/ddlx-0.5.xsd"
   xmlns:ddlx="http://www.jaxdb.org/ddlx-0.5.xsd"
   xmlns:sqlx="http://www.jaxdb.org/sqlx-0.5.xsd"
   xmlns:jsql="http://www.jaxdb.org/jsql-0.5.xsd"
+  xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning"
   xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
   <xs:import namespace="http://www.jaxdb.org/jsql-0.5.xsd" schemaLocation="jsql-0.5.xsd"/>

diff --git a/jsql/src/test/java/org/jaxdb/jsql/TestCommand.java b/jsql/src/test/java/org/jaxdb/jsql/TestCommand.java
@@ -43,8 +43,8 @@ public static class Select {
     }
 
     private static boolean called;
-    private static ThreadLocal<AssertCommand> assertCommand = new ThreadLocal<>();
-    private static ThreadLocal<AssertSelect> assertSelect = new ThreadLocal<>();
+    private static final ThreadLocal<AssertCommand> assertCommand = new ThreadLocal<>();
+    private static final ThreadLocal<AssertSelect> assertSelect = new ThreadLocal<>();
 
     public static boolean called() {
       if (!called)

diff --git a/jsql/src/test/java/org/jaxdb/jsql/TestConnectionFactory.java b/jsql/src/test/java/org/jaxdb/jsql/TestConnectionFactory.java
@@ -21,7 +21,7 @@
 import java.sql.SQLException;
 
 public abstract class TestConnectionFactory implements ConnectionFactory {
-  private static ThreadLocal<Boolean> called = new ThreadLocal<Boolean>() {
+  private static final ThreadLocal<Boolean> called = new ThreadLocal<Boolean>() {
     @Override
     protected Boolean initialValue() {
       return Boolean.FALSE;

diff --git a/sqlx/src/main/resources/sqlx-0.5.xsd b/sqlx/src/main/resources/sqlx-0.5.xsd
@@ -15,11 +15,13 @@
   program. If not, see <http://opensource.org/licenses/MIT/>.
 -->
 <xs:schema
+  vc:minVersion="1.1"
   elementFormDefault="qualified"
   attributeFormDefault="qualified"
   targetNamespace="http://www.jaxdb.org/sqlx-0.5.xsd"
   xmlns:ddlx="http://www.jaxdb.org/ddlx-0.5.xsd"
   xmlns:sqlx="http://www.jaxdb.org/sqlx-0.5.xsd"
+  xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning"
   xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
   <xs:import namespace="http://www.jaxdb.org/ddlx-0.5.xsd" schemaLocation="sqlx-ddlx-0.5.xsd"/>

diff --git a/sqlx/src/main/resources/sqlx-common-0.5.xsd b/sqlx/src/main/resources/sqlx-common-0.5.xsd
@@ -15,10 +15,12 @@
   program. If not, see <http://opensource.org/licenses/MIT/>.
 -->
 <xs:schema
+  vc:minVersion="1.1"
   attributeFormDefault="qualified"
   elementFormDefault="qualified"
   targetNamespace="http://www.jaxdb.org/sqlx-0.5.xsd"
   xmlns:sqlx="http://www.jaxdb.org/sqlx-0.5.xsd"
+  xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning"
   xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
   <xs:simpleType name="increment">

diff --git a/sqlx/src/main/resources/sqlx-ddlx-0.5.xsd b/sqlx/src/main/resources/sqlx-ddlx-0.5.xsd
@@ -15,10 +15,12 @@
   program. If not, see <http://opensource.org/licenses/MIT/>.
 -->
 <xs:schema
+  vc:minVersion="1.1"
   elementFormDefault="qualified"
   targetNamespace="http://www.jaxdb.org/ddlx-0.5.xsd"
   xmlns:ddlx="http://www.jaxdb.org/ddlx-0.5.xsd"
   xmlns:sqlx="http://www.jaxdb.org/sqlx-0.5.xsd"
+  xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning"
   xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
   <xs:import namespace="http://www.jaxdb.org/sqlx-0.5.xsd" schemaLocation="sqlx-0.5.xsd"/>