Added a fork() method to the SQL interface and implemented a thread l…

…ocal session helper to locally allow overwriting certain settings (currently only the connection used)
JanHolger · Oct 7, 2022 · Nov 6, 2021 · Nov 8, 2021 · Nov 29, 2021 · Nov 29, 2021
commit a954e800ab3a3b709dd4948acc4b9c7d3de171b0
diff --git a/src/main/java/org/javawebstack/orm/Session.java b/src/main/java/org/javawebstack/orm/Session.java
@@ -0,0 +1,46 @@
+package org.javawebstack.orm;
+
+import org.javawebstack.orm.wrapper.SQL;
+
+import java.util.function.Consumer;
+
+public class Session {
+
+    private static ThreadLocal<Session> sessions = new ThreadLocal<>();
+
+    public static Session current() {
+        return sessions.get();
+    }
+
+    private SQL connection;
+
+    private Session() {
+
+    }
+
+    public Session via(SQL connection) {
+        this.connection = connection;
+        return this;
+    }
+
+    public SQL getConnection() {
+        return connection;
+    }
+
+    public static void session(Consumer<Session> consumer) {
+        Session session = begin();
+        consumer.accept(session);
+        end();
+    }
+
+    public static Session begin() {
+        Session session = new Session();
+        sessions.set(session);
+        return session;
+    }
+
+    public static void end() {
+        sessions.remove();
+    }
+
+}
diff --git a/src/main/java/org/javawebstack/orm/query/Query.java b/src/main/java/org/javawebstack/orm/query/Query.java
@@ -3,7 +3,9 @@
 import org.javawebstack.orm.Model;
 import org.javawebstack.orm.Repo;
 import org.javawebstack.orm.SQLMapper;
+import org.javawebstack.orm.Session;
 import org.javawebstack.orm.exception.ORMQueryException;
+import org.javawebstack.orm.wrapper.SQL;
 import org.javawebstack.orm.wrapper.builder.SQLQueryString;
 
 import java.sql.ResultSet;
@@ -19,6 +21,7 @@ public class Query<T extends Model> {
 
     private final Repo<T> repo;
     private final Class<T> model;
+    private SQL connection;
     private List<String> select = new ArrayList<>();
     private final QueryGroup<T> where = new QueryGroup<>();
     private Integer offset;
@@ -35,6 +38,15 @@ public Query(Class<T> model) {
     public Query(Repo<T> repo, Class<T> model) {
         this.repo = repo;
         this.model = model;
+        Session session = Session.current();
+        this.connection = repo.getConnection();
+        if(session != null && session.getConnection() != null)
+            this.connection = session.getConnection();
+    }
+
+    public Query<T> via(SQL connection) {
+        this.connection = connection;
+        return this;
     }
 
     public boolean isWithDeleted() {
@@ -356,9 +368,9 @@ public Query<T> withDeleted() {
     }
 
     public void finalDelete() {
-        SQLQueryString qs = repo.getConnection().builder().buildDelete(this);
+        SQLQueryString qs = connection.builder().buildDelete(this);
         try {
-            repo.getConnection().write(qs.getQuery(), qs.getParameters().toArray());
+            connection.write(qs.getQuery(), qs.getParameters().toArray());
         } catch (SQLException throwables) {
             throw new ORMQueryException(throwables);
         }
@@ -385,11 +397,11 @@ public void restore() {
     }
 
     public T refresh(T entity) {
-        SQLQueryString qs = repo.getConnection().builder().buildQuery(this);
+        SQLQueryString qs = connection.builder().buildQuery(this);
         try {
-            ResultSet rs = repo.getConnection().read(qs.getQuery(), qs.getParameters().toArray());
+            ResultSet rs = connection.read(qs.getQuery(), qs.getParameters().toArray());
             SQLMapper.mapBack(repo, rs, entity);
-            repo.getConnection().close(rs);
+            connection.close(rs);
             return entity;
         } catch (SQLException throwables) {
             throw new ORMQueryException(throwables);
@@ -401,20 +413,20 @@ public void update(T entity) {
     }
 
     public void update(Map<String, Object> values) {
-        SQLQueryString queryString = repo.getConnection().builder().buildUpdate(this, values);
+        SQLQueryString queryString = connection.builder().buildUpdate(this, values);
         try {
-            repo.getConnection().write(queryString.getQuery(), queryString.getParameters().toArray());
+            connection.write(queryString.getQuery(), queryString.getParameters().toArray());
         } catch (SQLException throwables) {
             throw new ORMQueryException(throwables);
         }
     }
 
     public List<T> all() {
-        SQLQueryString qs = repo.getConnection().builder().buildQuery(this);
+        SQLQueryString qs = connection.builder().buildQuery(this);
         try {
-            ResultSet rs = repo.getConnection().read(qs.getQuery(), qs.getParameters().toArray());
+            ResultSet rs = connection.read(qs.getQuery(), qs.getParameters().toArray());
             List<T> list = SQLMapper.map(repo, rs, new ArrayList<>());
-            repo.getConnection().close(rs);
+            connection.close(rs);
             return list;
         } catch (SQLException throwables) {
             throw new ORMQueryException(throwables);
@@ -437,13 +449,13 @@ public Stream<T> stream() {
     }
 
     public int count() {
-        SQLQueryString qs = repo.getConnection().builder().buildQuery(this.select("count(*)"));
+        SQLQueryString qs = connection.builder().buildQuery(this.select("count(*)"));
         try {
-            ResultSet rs = repo.getConnection().read(qs.getQuery(), qs.getParameters().toArray());
+            ResultSet rs = connection.read(qs.getQuery(), qs.getParameters().toArray());
             int c = 0;
             if (rs.next())
                 c = rs.getInt(1);
-            repo.getConnection().close(rs);
+            connection.close(rs);
             return c;
         } catch (SQLException throwables) {
             throw new ORMQueryException(throwables);

diff --git a/src/main/java/org/javawebstack/orm/wrapper/MySQL.java b/src/main/java/org/javawebstack/orm/wrapper/MySQL.java
@@ -32,6 +32,10 @@ public MySQL(String host, int port, String database, String username, String pas
         this.timeout = timeout * 1000L;
     }
 
+    public SQL fork() {
+        return new MySQL(host, port, database, username, password, (int) (timeout / 1000L));
+    }
+
     public Connection getConnection() {
         long now = System.currentTimeMillis();
         if (now > lastQuery + timeout) {

diff --git a/src/main/java/org/javawebstack/orm/wrapper/SQL.java b/src/main/java/org/javawebstack/orm/wrapper/SQL.java
@@ -22,4 +22,6 @@ public interface SQL {
 
     void removeQueryLogger(QueryLogger logger);
 
+    SQL fork();
+
 }
diff --git a/src/main/java/org/javawebstack/orm/wrapper/SQLite.java b/src/main/java/org/javawebstack/orm/wrapper/SQLite.java
@@ -17,6 +17,10 @@ public SQLite(String file) {
         this.file = file;
     }
 
+    public SQL fork() {
+        return new SQLite(file);
+    }
+
     public Connection getConnection() {
         try {
             if (c == null || c.isClosed()) {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,4 +22,6 @@ public interface SQL {

		void removeQueryLogger(QueryLogger logger);

		SQL fork();

		}