edit

oneteme · Sep 11, 2024 · 6c98584 · 6c98584
1 parent 9a6159a
commit 6c98584
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/src/main/java/org/usf/jquery/core/CombinedOperator.java b/src/main/java/org/usf/jquery/core/CombinedOperator.java
@@ -21,7 +21,7 @@ default OperationColumn operation(JDBCType type, Object... args) {
 
 	@Override
 	default String id() {
-		return null;
+		return "CombinedOperator"; //do better
 	}
 
 	@Override

diff --git a/src/main/java/org/usf/jquery/core/DBColumn.java b/src/main/java/org/usf/jquery/core/DBColumn.java
@@ -442,7 +442,7 @@ static NamedColumn allColumns(@NonNull DBView view) {
 			@Override
 			public String sql(QueryContext ctx) {
 				ctx.viewAlias(view);
-				return "*"; //lazy 
+				return "*";
 			}
 
 			@Override

diff --git a/src/main/java/org/usf/jquery/core/Operator.java b/src/main/java/org/usf/jquery/core/Operator.java
@@ -218,7 +218,7 @@ static TypedOperator yearMonth() {//YYYY-MM
 		return new TypedOperator(VARCHAR, op, required(DATE, TIMESTAMP, TIMESTAMP_WITH_TIMEZONE)); 
 	}
 
-	static TypedOperator yearWeek() {//YYYY-'W'WW //!ISO
+	static TypedOperator yearWeek() {//YYYY-'W'WW
 		CombinedOperator op = args-> {
 			var col = requireNArgs(1, args, ()-> "yearWeek")[0];
 			return concat().operation(varchar().operation(year().operation(col)), 
@@ -239,8 +239,9 @@ static TypedOperator monthDay() {//MM-DD
 	static TypedOperator hourMinute() {//HH:MM
 		CombinedOperator op = args-> {
 			var col = requireNArgs(1, args, ()-> "hourMinute")[0];
-			var time = JDBCType.typeOf(col).filter(t-> t == TIME).isPresent() ? col : time().operation(col);
-			return left().operation(varchar().operation(time), 5);
+			var tim = JDBCType.typeOf(col).filter(t-> t == TIME)
+					.map(t-> col).orElseGet(()-> time().operation(col));
+			return left().operation(varchar().operation(tim), 5);
 		};
 		return new TypedOperator(VARCHAR, op, required(TIME, TIMESTAMP, TIMESTAMP_WITH_TIMEZONE));
 	}

diff --git a/src/main/java/org/usf/jquery/core/TypedOperator.java b/src/main/java/org/usf/jquery/core/TypedOperator.java
@@ -46,7 +46,7 @@ public OperationColumn operation(Object... args) {
 	@Override // do not delegate this
 	public OperationColumn operation(JDBCType type, Object... args) {
 		return operator.is(CombinedOperator.class)
-				? operator.operation(type, args) //no sql
+				? operator.operation(type, parameterSet.assertArguments(args)) //no sql
 				: Operator.super.operation(type, args);
 	}