Merge branch '7.0' into 7.1

michaeloffner · michaeloffner · commit f18cc3de949c · 2026-07-03T19:57:18.000+02:00
# Conflicts:
#	core/.classpath
#	loader/build.xml
#	loader/pom.xml
#	test/tickets/LDEV2423.cfc
#	test/tickets/LDEV3022.cfc
diff --git a/.gitignore b/.gitignore
@@ -21,7 +21,7 @@ target/*
 WEB-INF
 core/bin/
 loader/bin/
-.classpath
+/.classpath
 *.eml
 *.iml
 *.ipr
diff --git a/core/src/main/java/lucee/commons/io/res/type/file/FileResource.java b/core/src/main/java/lucee/commons/io/res/type/file/FileResource.java
@@ -131,12 +131,12 @@ public void copyTo(Resource res, boolean append) throws IOException {
 	}
 
 	/**
-	 * LDEV-6095: after copy, ensure the owner can read/write the new file without altering group/other bits
-	 * (ModeUtil-based setReadable/setWritable would set all roles and break mode preservation).
+	 * LDEV-6095: after copy, ensure the owner can read/write the new file without altering group/other
+	 * bits (ModeUtil-based setReadable/setWritable would set all roles and break mode preservation).
 	 * When {@code attributeCopyUsed} is true, {@link StandardCopyOption#COPY_ATTRIBUTES} already copied
 	 * readonly/hidden/etc.; only add missing owner write when the POSIX mode lacks it (e.g. chmod 444).
-	 * Readonly set via {@link #setWritable(boolean)} is tracked with a user xattr so it can be distinguished
-	 * from a plain {@code fileSetAccessMode} change during copy.
+	 * Readonly set via {@link #setWritable(boolean)} is tracked with a user xattr so it can be
+	 * distinguished from a plain {@code fileSetAccessMode} change during copy.
 	 */
 	private static void applyPermissionsAfterCopy(Resource dest, Resource source, boolean attributeCopyUsed) {
 		if (dest instanceof FileResource) {
@@ -278,7 +278,7 @@ private static boolean hasReadonlyAttribute(Path path) {
 		try {
 			UserDefinedFileAttributeView view = Files.getFileAttributeView(path, UserDefinedFileAttributeView.class);
 			if (view == null || !view.list().contains(READONLY_ATTRIBUTE)) return false;
-			int size = (int) view.size(READONLY_ATTRIBUTE);
+			int size = view.size(READONLY_ATTRIBUTE);
 			ByteBuffer buf = ByteBuffer.allocate(size);
 			view.read(READONLY_ATTRIBUTE, buf);
 			buf.flip();
@@ -663,8 +663,7 @@ public boolean renameTo(Resource dest) {
 			moveTo(dest);
 			return true;
 		}
-		catch (IOException e) {
-		}
+		catch (IOException e) {}
 		return false;
 	}
 
@@ -880,8 +879,7 @@ public boolean exists() {
 		try {
 			provider.read(this);
 		}
-		catch (IOException e) {
-		}
+		catch (IOException e) {}
 
 		return super.exists();
 	}
diff --git a/core/src/main/java/lucee/runtime/db/SQLCaster.java b/core/src/main/java/lucee/runtime/db/SQLCaster.java
@@ -250,7 +250,7 @@ public static void setValue(PageContext pc, TimeZone tz, PreparedStatement stat,
 		case Types.DOUBLE:
 		case Types.FLOAT:
 			try {
-				if (type == Types.FLOAT) stat.setFloat(parameterIndex, Caster.toFloatValue(value));
+				if (type == Types.FLOAT) stat.setDouble(parameterIndex, Caster.toDoubleValue(value));
 				else if (type == Types.DOUBLE) stat.setDouble(parameterIndex, Caster.toDoubleValue(value));
 				else stat.setObject(parameterIndex, Caster.toDouble(value), type);
 			}
diff --git a/core/src/main/java/lucee/runtime/query/caster/Cast.java b/core/src/main/java/lucee/runtime/query/caster/Cast.java
@@ -24,8 +24,15 @@
 import java.util.Calendar;
 import java.util.TimeZone;
 
+import lucee.commons.io.SystemUtil;
+import lucee.runtime.op.Caster;
+
 public interface Cast {
 
+	// when enabled, DATE/TIME/TIMESTAMP query columns keep the JDBC driver's native toString() format
+	// (matching ACF) instead of Lucee's {ts '...'} ODBC escape format when cast to a string - see LDEV-1344
+	public static final boolean JDBC_DATETIME_FORMAT = Caster.toBooleanValue(SystemUtil.getSystemPropOrEnvVar("lucee.query.datetime.jdbcformat", null), false);
+
 	public static final Cast ARRAY = new ArrayCast();
 	public static final Cast BIT = new BitCast();
 	public static final Cast BLOB = new BlobCast();
diff --git a/core/src/main/java/lucee/runtime/query/caster/DateCast.java b/core/src/main/java/lucee/runtime/query/caster/DateCast.java
@@ -27,6 +27,7 @@
 
 import lucee.commons.date.JREDateTimeUtil;
 import lucee.runtime.type.dt.DateTimeImpl;
+import lucee.runtime.type.dt.TimestampImpl;
 
 public final class DateCast implements Cast {
 
@@ -40,7 +41,7 @@ public DateCast(boolean useTimeZone) {
 	public Object toCFType(TimeZone tz, ResultSet rst, int columnIndex) throws SQLException, IOException {
 		Date d = useTimeZone ? rst.getDate(columnIndex, JREDateTimeUtil.getThreadCalendar(tz)) : rst.getDate(columnIndex);
 		if (d == null) return null;
-		return new DateTimeImpl(d.getTime());
+		return Cast.JDBC_DATETIME_FORMAT ? new TimestampImpl(d, d.toString()) : new DateTimeImpl(d.getTime());
 
 	}
 
diff --git a/core/src/main/java/lucee/runtime/query/caster/OracleTimestampLTZ.java b/core/src/main/java/lucee/runtime/query/caster/OracleTimestampLTZ.java
@@ -27,6 +27,7 @@
 import lucee.runtime.exp.PageException;
 import lucee.runtime.reflection.Reflector;
 import lucee.runtime.type.dt.DateTimeImpl;
+import lucee.runtime.type.dt.TimestampImpl;
 
 public final class OracleTimestampLTZ implements Cast {
 
@@ -38,7 +39,7 @@ public Object toCFType(TimeZone tz, ResultSet rst, int columnIndex) throws SQLEx
 		// we do not have oracle.sql.TIMESTAMPTZ in the core, so we need reflection for this
 		try {
 			Timestamp ts = (Timestamp) Reflector.callMethod(o, "timestampValue", new Object[] { rst.getStatement().getConnection(), JREDateTimeUtil.getThreadCalendar(tz) });
-			return new DateTimeImpl(ts.getTime());
+			return Cast.JDBC_DATETIME_FORMAT ? new TimestampImpl(ts, ts.toString()) : new DateTimeImpl(ts.getTime());
 		}
 		catch (PageException pe) {
 			throw ExceptionUtil.toIOException(pe);
diff --git a/core/src/main/java/lucee/runtime/query/caster/OracleTimestampNS.java b/core/src/main/java/lucee/runtime/query/caster/OracleTimestampNS.java
@@ -26,6 +26,7 @@
 import lucee.runtime.exp.PageException;
 import lucee.runtime.reflection.Reflector;
 import lucee.runtime.type.dt.DateTimeImpl;
+import lucee.runtime.type.dt.TimestampImpl;
 
 public final class OracleTimestampNS implements Cast {
 
@@ -37,7 +38,7 @@ public Object toCFType(TimeZone tz, ResultSet rst, int columnIndex) throws SQLEx
 		// we do not have oracle.sql.TIMESTAMPTZ in the core, so we need reflection for this
 		try {
 			Timestamp ts = (Timestamp) Reflector.callMethod(o, "timestampValue", new Object[] {});
-			return new DateTimeImpl(ts.getTime());
+			return Cast.JDBC_DATETIME_FORMAT ? new TimestampImpl(ts, ts.toString()) : new DateTimeImpl(ts.getTime());
 		}
 		catch (PageException pe) {
 			throw ExceptionUtil.toIOException(pe);
diff --git a/core/src/main/java/lucee/runtime/query/caster/OracleTimestampTZ.java b/core/src/main/java/lucee/runtime/query/caster/OracleTimestampTZ.java
@@ -26,6 +26,7 @@
 import lucee.runtime.exp.PageException;
 import lucee.runtime.reflection.Reflector;
 import lucee.runtime.type.dt.DateTimeImpl;
+import lucee.runtime.type.dt.TimestampImpl;
 
 public final class OracleTimestampTZ implements Cast {
 
@@ -37,7 +38,7 @@ public Object toCFType(TimeZone tz, ResultSet rst, int columnIndex) throws SQLEx
 		// we do not have oracle.sql.TIMESTAMPTZ in the core, so we need reflection for this
 		try {
 			Timestamp ts = (Timestamp) Reflector.callMethod(o, "timestampValue", new Object[] { rst.getStatement().getConnection() });
-			return new DateTimeImpl(ts.getTime());
+			return Cast.JDBC_DATETIME_FORMAT ? new TimestampImpl(ts, ts.toString()) : new DateTimeImpl(ts.getTime());
 		}
 		catch (PageException pe) {
 			throw ExceptionUtil.toIOException(pe);
diff --git a/core/src/main/java/lucee/runtime/query/caster/TimeCast.java b/core/src/main/java/lucee/runtime/query/caster/TimeCast.java
@@ -27,6 +27,7 @@
 
 import lucee.commons.date.JREDateTimeUtil;
 import lucee.runtime.type.dt.DateTimeImpl;
+import lucee.runtime.type.dt.TimestampImpl;
 
 public final class TimeCast implements Cast {
 
@@ -41,7 +42,7 @@ public Object toCFType(TimeZone tz, ResultSet rst, int columnIndex) throws SQLEx
 		Time t = useTimeZone ? rst.getTime(columnIndex, JREDateTimeUtil.getThreadCalendar(tz)) : rst.getTime(columnIndex);
 		if (t == null) return null;
 
-		return new DateTimeImpl(t.getTime());
+		return Cast.JDBC_DATETIME_FORMAT ? new TimestampImpl(t, t.toString()) : new DateTimeImpl(t.getTime());
 
 	}
 
diff --git a/core/src/main/java/lucee/runtime/query/caster/TimestampCast.java b/core/src/main/java/lucee/runtime/query/caster/TimestampCast.java
@@ -27,6 +27,7 @@
 
 import lucee.commons.date.JREDateTimeUtil;
 import lucee.runtime.type.dt.DateTimeImpl;
+import lucee.runtime.type.dt.TimestampImpl;
 
 public final class TimestampCast implements Cast {
 
@@ -40,7 +41,7 @@ public TimestampCast(boolean useTimeZone) {
 	public Object toCFType(TimeZone tz, ResultSet rst, int columnIndex) throws SQLException, IOException {
 		Timestamp ts = useTimeZone ? rst.getTimestamp(columnIndex, JREDateTimeUtil.getThreadCalendar(tz)) : rst.getTimestamp(columnIndex);
 		if (ts == null) return null;
-		return new DateTimeImpl(ts.getTime());
+		return Cast.JDBC_DATETIME_FORMAT ? new TimestampImpl(ts, ts.toString()) : new DateTimeImpl(ts.getTime());
 	}
 
 	@Override
diff --git a/core/src/main/java/lucee/runtime/reflection/Reflector.java b/core/src/main/java/lucee/runtime/reflection/Reflector.java
@@ -968,15 +968,33 @@ public static MethodInstance getGetter(Class clazz, String prop, boolean nameCas
 
 	/**
 	 * to get a Getter Method of an Object
-	 * 
+	 *
 	 * @param clazz Class to invoke method from
 	 * @param prop Name of the Method without get
 	 * @return return Value of the getter Method
 	 */
 	public static MethodInstance getGetterEL(Class clazz, String prop, boolean nameCaseSensitive) {
-		prop = "get" + StringUtil.ucFirst(prop);
-		MethodInstance mi = getMethodInstance(clazz, KeyImpl.init(prop), ArrayUtil.OBJECT_EMPTY, nameCaseSensitive, false);
-		if (!mi.hasMethod()) return null;
+		String getterName = "get" + StringUtil.ucFirst(prop);
+		MethodInstance mi = getMethodInstance(clazz, KeyImpl.init(getterName), ArrayUtil.OBJECT_EMPTY, nameCaseSensitive, false);
+
+		if (!mi.hasMethod()) {
+			String isName = "is" + StringUtil.ucFirst(prop);
+			mi = getMethodInstance(clazz, KeyImpl.init(isName), ArrayUtil.OBJECT_EMPTY, nameCaseSensitive, false);
+			if (mi.hasMethod()) {
+				try {
+					lucee.transformer.dynamic.meta.Method m = mi.getMethod();
+					Class rtn = m.getReturnClass();
+					if (rtn != Boolean.class && rtn != boolean.class) return null;
+				}
+				catch (PageException e) {
+					return null;
+				}
+			}
+			else {
+				return null;
+			}
+		}
+
 		try {
 			if (mi.getMethod().getReturnClass() == void.class) return null;
 		}
diff --git a/core/src/main/java/lucee/runtime/tag/CFTagCore.java b/core/src/main/java/lucee/runtime/tag/CFTagCore.java
@@ -73,6 +73,10 @@ public static InitFile createInitFile(PageContext pageContext, boolean isweb, St
 		if (StringUtil.isEmpty(mappingName)) mappingName = "mapping-tag";
 		Mapping mapping = config.getTagMapping(mappingName);
 
+		if (mapping == null) {
+			throw new RuntimeException("Tag mapping \"" + mappingName + "\" not found");
+		}
+
 		return new InitFile(pageContext, mapping.getPageSource(filename), filename);
 
 	}
diff --git a/core/src/main/java/lucee/runtime/tag/TagUtil.java b/core/src/main/java/lucee/runtime/tag/TagUtil.java
@@ -37,6 +37,7 @@
 import lucee.runtime.Component;
 import lucee.runtime.ComponentImpl;
 import lucee.runtime.ComponentSpecificAccess;
+import lucee.runtime.Mapping;
 import lucee.runtime.PageContext;
 import lucee.runtime.PageContextImpl;
 import lucee.runtime.PageSource;
@@ -307,7 +308,9 @@ private static void addTagMetaData(PageContext pc, TagLib tl, TagLibTag tlt, Str
 		if (pc == null) return;
 		try {
 			ConfigWebPro config = (ConfigWebPro) pc.getConfig();
-			PageSource ps = config.getTagMapping(mappingName).getPageSource(filename);
+			Mapping mapping = config.getTagMapping(mappingName);
+			if (mapping == null) return;
+			PageSource ps = mapping.getPageSource(filename);
 
 			// Page p = ps.loadPage(pc);
 			ComponentImpl c = ComponentLoader.loadComponent(pc, ps, filename, true, true);
diff --git a/core/src/main/java/lucee/runtime/type/dt/DateTimeImpl.java b/core/src/main/java/lucee/runtime/type/dt/DateTimeImpl.java
@@ -45,7 +45,7 @@
 /**
  * Printable and Castable DateTime Object
  */
-public final class DateTimeImpl extends DateTime implements SimpleValue, Objects {
+public class DateTimeImpl extends DateTime implements SimpleValue, Objects {
 
 	private static final long serialVersionUID = 1287979666244112798L;
 
diff --git a/core/src/main/java/lucee/runtime/type/dt/TimestampImpl.java b/core/src/main/java/lucee/runtime/type/dt/TimestampImpl.java
@@ -0,0 +1,43 @@
+/**
+ *
+ * Copyright (c) 2014, the Railo Company Ltd. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ **/
+package lucee.runtime.type.dt;
+
+import java.util.Date;
+import java.util.TimeZone;
+
+/**
+ * DateTimeImpl for a value read from a JDBC DATE/TIME/TIMESTAMP column, preserving the driver's
+ * own toString() representation instead of Lucee's {ts '...'} ODBC escape format - see LDEV-1344
+ */
+public final class TimestampImpl extends DateTimeImpl {
+
+	private static final long serialVersionUID = 1L;
+
+	private final String jdbcToString;
+
+	public TimestampImpl(Date date, String jdbcToString) {
+		super(date);
+		this.jdbcToString = jdbcToString;
+	}
+
+	@Override
+	public String castToString(TimeZone tz) {
+		return jdbcToString;
+	}
+}
diff --git a/core/src/main/java/resource/setting/sysprop-envvar.json b/core/src/main/java/resource/setting/sysprop-envvar.json
@@ -1019,6 +1019,17 @@
 		"type": "boolean",
 		"default": false
 	},
+	{
+		"sysprop": "lucee.query.datetime.jdbcformat",
+		"envvar": "LUCEE_QUERY_DATETIME_JDBCFORMAT",
+		"desc": "By default, Lucee converts DATE/TIME/TIMESTAMP query column values to a string using the ODBC escape format (e.g. `{ts '2017-05-18 19:14:38'}`), while Adobe ColdFusion (ACF) uses the JDBC driver's native `toString()` format (e.g. `2017-05-18 19:14:38.0`). This difference can break legacy code that builds SQL by concatenating a query result date directly into a new SQL string instead of using cfqueryparam. Set this environment variable or SysProp to `true` to make Lucee use the JDBC driver's native string format instead, matching ACF (see LDEV-1344)",
+		"category": "query",
+		"tags": [ "cfquery" ],
+		"functions": [ "queryExecute" ],
+		"type": "boolean",
+		"introduced": "7.0.1",
+		"default": false
+	},
 	{
 		"sysprop": "lucee.query.result.threshold",
 		"envvar": "LUCEE_QUERY_RESULT_THRESHOLD",
diff --git a/test/tickets/LDEV6377.cfc b/test/tickets/LDEV6377.cfc
diff --git a/test/tickets/LDEV6377_regression.cfm b/test/tickets/LDEV6377_regression.cfm

Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,7 @@ public static void setValue(PageContext pc, TimeZone tz, PreparedStatement stat,`
`250`	`250`	`case Types.DOUBLE:`
`251`	`251`	`case Types.FLOAT:`
`252`	`252`	`try {`
`253`		`- if (type == Types.FLOAT) stat.setFloat(parameterIndex, Caster.toFloatValue(value));`
	`253`	`+ if (type == Types.FLOAT) stat.setDouble(parameterIndex, Caster.toDoubleValue(value));`
`254`	`254`	`else if (type == Types.DOUBLE) stat.setDouble(parameterIndex, Caster.toDoubleValue(value));`
`255`	`255`	`else stat.setObject(parameterIndex, Caster.toDouble(value), type);`
`256`	`256`	`}`