edit

oneteme · Aug 28, 2024 · 91884fe · 91884fe
1 parent 9419996
commit 91884fe
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 16 deletions.
diff --git a/src/main/java/org/usf/jquery/core/KeyValueMapper.java b/src/main/java/org/usf/jquery/core/KeyValueMapper.java
@@ -20,17 +20,17 @@ public final class KeyValueMapper implements ResultSetMapper<List<DynamicModel>>
     @Override
     public List<DynamicModel> map(ResultSet rs) throws SQLException {
 		log.trace("mapping results...");
-		var bg = currentTimeMillis();
-		var results = new LinkedList<DynamicModel>();
-    	var columnNames = declaredColumns(rs);
+		var t = currentTimeMillis();
+		var res = new LinkedList<DynamicModel>();
+    	var cols = declaredColumns(rs);
         while(rs.next()) {
-            var model = new DynamicModel();
-            for(var i=0; i<columnNames.length; i++) {
-                model.put(columnNames[i], rs.getObject(i+1));
+            var m = new DynamicModel();
+            for(var i=0; i<cols.length; i++) {
+                m.put(cols[i], rs.getObject(i+1));
             }
-            results.add(model);
+            res.add(m);
         }
-		log.trace("{} rows mapped in {} ms", results.size(), currentTimeMillis() - bg);
-        return results;
+		log.trace("{} rows mapped in {} ms", res.size(), currentTimeMillis()-t);
+        return res;
     }
 }
diff --git a/src/main/java/org/usf/jquery/core/QueryParameterBuilder.java b/src/main/java/org/usf/jquery/core/QueryParameterBuilder.java
@@ -141,8 +141,8 @@ public QueryParameterBuilder withValue() {
 		return new QueryParameterBuilder(schema, vPrefix, null, null, views, overView);
 	}
 
-	public QueryParameterBuilder subQuery() {
-		return new QueryParameterBuilder(schema, vPrefix + "_s", args, argTypes, new ArrayList<>(), emptyMap());
+	public QueryParameterBuilder subQuery(Map<DBView, ? extends DBView> overView) {
+		return new QueryParameterBuilder(schema, vPrefix + "_s", args, argTypes, new ArrayList<>(), unmodifiableMap(overView));
 	}
 
 	public static QueryParameterBuilder addWithValue() {

diff --git a/src/main/java/org/usf/jquery/core/QueryView.java b/src/main/java/org/usf/jquery/core/QueryView.java
@@ -20,7 +20,7 @@ public final class QueryView implements DBView {
 	@Override
 	public String sql(QueryParameterBuilder param) {
 		var s = new SqlStringBuilder(100).append("(");
-		builder.build(s, param.subQuery());
+		builder.build(s, param.subQuery(builder.getOverView()));
 		return s.append(")").toString();
 	}
 

diff --git a/src/main/java/org/usf/jquery/core/RequestQuery.java b/src/main/java/org/usf/jquery/core/RequestQuery.java
@@ -34,7 +34,7 @@ public final class RequestQuery {
 	public List<DynamicModel> execute(DataSource ds) throws SQLException {
 		return execute(ds, new KeyValueMapper());
 	}
-
+	
 	public <T> T execute(DataSource ds, ResultSetMapper<T> mapper) throws SQLException { // overload with sql types
 		try(var cn = ds.getConnection()){
 			return execute(cn, mapper);
@@ -43,8 +43,8 @@ public <T> T execute(DataSource ds, ResultSetMapper<T> mapper) throws SQLExcepti
 
 	public <T> T execute(Connection cn, ResultSetMapper<T> mapper) throws SQLException {
 		log.debug("preparing statement : {}", query);
+		log.debug("using arguments : {}", Arrays.toString(args)); //before prepare
 		try(var ps = cn.prepareStatement(query)){
-	        log.debug("with parameters : {}", Arrays.toString(args));
 			if(!isEmpty(args)) {
 				for(var i=0; i<args.length; i++) {
 					if(isNull(args[i])) {

diff --git a/src/main/java/org/usf/jquery/core/ResultSetConsumer.java b/src/main/java/org/usf/jquery/core/ResultSetConsumer.java
@@ -0,0 +1,21 @@
+package org.usf.jquery.core;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+/**
+ * 
+ * @author u$f
+ *
+ */
+@FunctionalInterface
+public interface ResultSetConsumer extends ResultSetMapper<Void> {
+
+	void fetch(ResultSet rs) throws SQLException;
+
+	@Override
+	default Void map(ResultSet rs) throws SQLException {
+		this.fetch(rs);
+		return null;
+	}
+}
diff --git a/src/main/java/org/usf/jquery/web/ViewMetadata.java b/src/main/java/org/usf/jquery/web/ViewMetadata.java
@@ -21,6 +21,7 @@
 
 import org.usf.jquery.core.DBView;
 import org.usf.jquery.core.RequestQueryBuilder;
+import org.usf.jquery.core.ResultSetConsumer;
 import org.usf.jquery.core.TableView;
 
 import lombok.AccessLevel;
@@ -101,7 +102,7 @@ void fetchView(DatabaseMetaData metadata, TableView view, String schema) throws
 
 	void fetch(DatabaseMetaData metadata, DBView qr, String schema) throws SQLException {
 		var query = new RequestQueryBuilder().columns(allColumns(qr)).filters(constant(1).eq(constant(0))); //no data
-		query.build(schema).execute(metadata.getConnection(), rs->{
+		query.build(schema).execute(metadata.getConnection(), (ResultSetConsumer) rs->{
 			var db = reverseMapKeys();
 			var meta = rs.getMetaData();
 			for(var i=1; i<=meta.getColumnCount(); i++) {
@@ -113,7 +114,6 @@ void fetch(DatabaseMetaData metadata, DBView qr, String schema) throws SQLExcept
 			if(!db.isEmpty()) { //no such columns
 				throw columnsNotFoundException(db.keySet());
 			}
-			return null;
 		});
 	}