clear cache after modification schema

vzakharchenko · Mar 25, 2020 · d300483 · d300483
1 parent 5287729
commit d300483
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 0 deletions.
diff --git a/...c/main/java/com/github/vzakharchenko/dynamic/orm/core/dynamic/AbstractDynamicContext.java b/...c/main/java/com/github/vzakharchenko/dynamic/orm/core/dynamic/AbstractDynamicContext.java
@@ -44,6 +44,7 @@ public void registerQ(Map<String, QDynamicTable> qDynamicTableMap,
         for (QDynamicTable qDynamicTable : qDynamicTables) {
             qDynamicTableMap.put(StringUtils.upperCase(
                     qDynamicTable.getTableName()), qDynamicTable);
+            qDynamicTable.reInit();
         }
         updateCache(qDynamicTableMap, cacheName);
     }

diff --git a/...rc/main/java/com/github/vzakharchenko/dynamic/orm/core/dynamic/QAbstractDynamicTable.java b/...rc/main/java/com/github/vzakharchenko/dynamic/orm/core/dynamic/QAbstractDynamicTable.java
@@ -167,6 +167,14 @@ public List<ForeignKey<?>> deletedForeignKeys() {
         return this.removedForeignKeys;
     }
 
+    protected abstract void init();
+
+    public void reInit() {
+        deletedColumns().clear();
+        deletedForeignKeys().clear();
+        init();
+    }
+
     public void removeForeignKey(List<Path<?>> localColumns) {
         List<ForeignKey<?>> foreignKeys = getForeignKeys().stream().filter(
                 (Predicate<ForeignKey<?>>) foreignKey ->

diff --git a/...m-core/src/main/java/com/github/vzakharchenko/dynamic/orm/core/dynamic/QDynamicTable.java b/...m-core/src/main/java/com/github/vzakharchenko/dynamic/orm/core/dynamic/QDynamicTable.java
@@ -37,6 +37,11 @@ protected QDynamicTable(String tableName) {
         super(StringUtils.upperCase(tableName));
     }
 
+    @Override
+    protected void init() {
+        removedIndexList.clear();
+    }
+
     // CHECKSTYLE:OFF
     @Override
     public boolean equals(Object o) { //NOPMD

diff --git a/...main/java/com/github/vzakharchenko/dynamic/orm/core/dynamic/QDynamicTableFactoryImpl.java b/...main/java/com/github/vzakharchenko/dynamic/orm/core/dynamic/QDynamicTableFactoryImpl.java
@@ -7,6 +7,7 @@
 import com.github.vzakharchenko.dynamic.orm.core.dynamic.structure.DynamicStructureSaver;
 import com.github.vzakharchenko.dynamic.orm.core.dynamic.structure.DynamicStructureUpdater;
 import com.github.vzakharchenko.dynamic.orm.core.dynamic.structure.LiquibaseHolder;
+import com.github.vzakharchenko.dynamic.orm.core.helper.CacheHelper;
 import liquibase.database.Database;
 import liquibase.database.DatabaseFactory;
 import liquibase.database.jvm.JdbcConnection;
@@ -150,6 +151,9 @@ public void clear() {
         sequenceModelMap.clear();
         dynamicTableMap.clear();
         viewModelMap.clear();
+        removedTables.clear();
+        removedSequences.clear();
+        CacheHelper.getAccessQueryContext(ormQueryFactory).clearCache();
     }
 
 

diff --git a/...-orm-core/src/main/java/com/github/vzakharchenko/dynamic/orm/core/helper/CacheHelper.java b/...-orm-core/src/main/java/com/github/vzakharchenko/dynamic/orm/core/helper/CacheHelper.java
@@ -1,6 +1,8 @@
 package com.github.vzakharchenko.dynamic.orm.core.helper;
 
+import com.github.vzakharchenko.dynamic.orm.core.AccessQueryContext;
 import com.github.vzakharchenko.dynamic.orm.core.DMLModel;
+import com.github.vzakharchenko.dynamic.orm.core.OrmQueryFactory;
 import com.github.vzakharchenko.dynamic.orm.core.cache.CachedAllData;
 import com.github.vzakharchenko.dynamic.orm.core.cache.CachedColumn;
 import com.github.vzakharchenko.dynamic.orm.core.cache.CachedColumnWithValue;
@@ -11,6 +13,7 @@
 import com.querydsl.sql.RelationalPath;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.util.Assert;
 
 import java.io.Serializable;
 import java.util.Collections;
@@ -31,6 +34,11 @@ public abstract class CacheHelper {
 //        }
 //    }
 
+    public static AccessQueryContext getAccessQueryContext(OrmQueryFactory ormQueryFactory) {
+        Assert.notNull(ormQueryFactory, ormQueryFactory + " is null");
+        return (AccessQueryContext) ormQueryFactory;
+    }
+
 
     public static CachedAllData buildAllDataCache(RelationalPath<?> qTable) {
         return new CachedAllData(qTable);

diff --git a/...mic-orm-core/src/test/java/com/github/vzakharchenko/dynamic/orm/AbstractTestQueryOrm.java b/...mic-orm-core/src/test/java/com/github/vzakharchenko/dynamic/orm/AbstractTestQueryOrm.java
@@ -104,6 +104,7 @@ public void dropSchema() {
         for (DbStructureService dbStructureService : dbStructureServices) {
             dbStructureService.clear();
         }
+        qDynamicTableFactory.clear();
         checkConnectionLeaks();
 
     }