Merge branch 'develop' into fix/3302-matrix-burndown

Author: bpamiri

.github/workflows/compat-matrix.yml

@@ -439,12 +439,40 @@ jobs:
           " || { echo "JUnit conversion failed for ${db} (non-fatal)"; rm -f "$JUNIT_FILE"; }
             fi
 
+            # Zero-test guard (#3302): a compile-wiped leg returns HTTP 200 with
+            # totalSpecs=0 (one bad CFC zeroes the whole directory compile), which
+            # previously rendered as a pass. Every engine runs the same core suite
+            # (~4,700 specs), so anything below the floor means the suite never
+            # actually ran. Revisit the floor if per-DB spec subsets ever ship.
+            MIN_SPECS=4000
+            TOTAL_SPECS="-1"
+            if [ -f "$RESULT_FILE" ] && { [ "$HTTP_CODE" = "200" ] || [ "$HTTP_CODE" = "417" ]; }; then
+              TOTAL_SPECS=$(python3 -c "
+          import json, sys
+          try:
+              d = json.load(open('$RESULT_FILE'))
+              print(int(d.get('totalSpecs', 0)))
+          except:
+              print(-1)
+          " 2>/dev/null || echo "-1")
+            fi
+
+            SPECS_OK=true
+            if { [ "$HTTP_CODE" = "200" ] || [ "$HTTP_CODE" = "417" ]; } && [ "$TOTAL_SPECS" -lt "$MIN_SPECS" ]; then
+              SPECS_OK=false
+              echo "::error::${{ matrix.cfengine }} + ${db}: HTTP ${HTTP_CODE} but only ${TOTAL_SPECS} testcases reported (floor: ${MIN_SPECS}) — suite likely compile-wiped, treating leg as failed"
+            fi
+
             # Track per-database result
-            if [ "$HTTP_CODE" = "200" ]; then
-              echo "PASSED: ${{ matrix.cfengine }} + ${db}"
+            if [ "$HTTP_CODE" = "200" ] && [ "$SPECS_OK" = true ]; then
+              echo "PASSED: ${{ matrix.cfengine }} + ${db} (${TOTAL_SPECS} testcases)"
               DB_STATUS="pass"
             else
-              echo "FAILED: ${{ matrix.cfengine }} + ${db} (HTTP ${HTTP_CODE})"
+              if [ "$HTTP_CODE" = "200" ]; then
+                echo "FAILED: ${{ matrix.cfengine }} + ${db} (HTTP 200 but zero-test guard tripped)"
+              else
+                echo "FAILED: ${{ matrix.cfengine }} + ${db} (HTTP ${HTTP_CODE})"
+              fi
               DB_STATUS="fail"
               if echo "$SOFT_FAIL_DBS" | grep -qw "$db"; then
                 echo "::warning::${db} tests failed but marked as soft-fail (non-blocking)"
@@ -486,6 +514,8 @@ jobs:
           echo "|----------|--------|" >> $GITHUB_STEP_SUMMARY
 
           SOFT_FAIL_DBS="oracle"
+          # Keep in sync with MIN_SPECS in the run-tests step (#3302).
+          MIN_SPECS=4000
           IFS=',' read -ra DBS <<< "${{ steps.db-list.outputs.databases }}"
           for db in "${DBS[@]}"; do
             RESULT_FILE="/tmp/test-results/${{ matrix.cfengine }}-${db}-result.txt"
@@ -494,18 +524,22 @@ jobs:
               IS_SOFT_FAIL=true
             fi
             if [ -f "$RESULT_FILE" ]; then
-              # Check JSON for failures
-              FAIL_COUNT=$(python3 -c "
+              # Check JSON for failures and testcase count (zero-test guard, #3302)
+              STATS=$(python3 -c "
           import json, sys
           try:
               d = json.load(open('$RESULT_FILE'))
-              print(d.get('totalFail', 0) + d.get('totalError', 0))
+              print(int(d.get('totalFail', 0) + d.get('totalError', 0)), int(d.get('totalSpecs', 0)))
           except:
-              print(-1)
-          " 2>/dev/null || echo "-1")
+              print(-1, -1)
+          " 2>/dev/null || echo "-1 -1")
+              FAIL_COUNT="${STATS% *}"
+              SPEC_COUNT="${STATS#* }"
 
-              if [ "$FAIL_COUNT" = "0" ]; then
+              if [ "$FAIL_COUNT" = "0" ] && [ "$SPEC_COUNT" -ge "$MIN_SPECS" ]; then
                 echo "| ${db} | :white_check_mark: Pass |" >> $GITHUB_STEP_SUMMARY
+              elif [ "$FAIL_COUNT" = "0" ]; then
+                echo "| ${db} | :warning: ${SPEC_COUNT} tests (zero-test guard) |" >> "$GITHUB_STEP_SUMMARY"
               elif [ "$FAIL_COUNT" = "-1" ] && [ "$IS_SOFT_FAIL" = true ]; then
                 echo "| ${db} | :warning: Error (soft-fail) |" >> $GITHUB_STEP_SUMMARY
               elif [ "$FAIL_COUNT" = "-1" ]; then
@@ -613,6 +647,12 @@ jobs:
           files: junit-results/**/*.xml
           check_name: "Wheels Test Results"
           comment_title: "Wheels Test Results"
+          # Keep the aggregate check neutral (#3302): oracle soft-fail debt
+          # otherwise pins a red "Wheels Test Results" check to whatever SHA
+          # the matrix was dispatched on, marking innocent PRs UNSTABLE.
+          # Leg pass/fail gating lives in the tests job (OVERALL_STATUS);
+          # annotations, PR comments, and artifacts are unaffected by this.
+          fail_on: nothing
           report_individual_runs: true
           report_suite_logs: any
           json_file: junit-results/test-results.json
@@ -647,27 +687,41 @@ jobs:
           MATRIX_MD="${MATRIX_MD}
           "
           MATRIX_MD="${MATRIX_MD}
-          | Engine | MySQL | PostgreSQL | SQL Server | H2 | CockroachDB | Oracle | SQLite |"
+          | Engine | MySQL | PostgreSQL | SQL Server | H2 | CockroachDB | Oracle (soft-fail) | SQLite |"
           MATRIX_MD="${MATRIX_MD}
-          |--------|:-----:|:----------:|:----------:|:--:|:-----------:|:------:|:------:|"
+          |--------|:-----:|:----------:|:----------:|:--:|:-----------:|:------------------:|:------:|"
+
+          # Keep in sync with SOFT_FAIL_DBS and MIN_SPECS in the tests job (#3302).
+          SOFT_FAIL_DBS="oracle"
+          MIN_SPECS=4000
 
           for engine in lucee6 lucee7 adobe2023 adobe2025 boxlang; do
             ROW="| **${engine}** |"
             for db in mysql postgres sqlserver h2 cockroachdb oracle sqlite; do
               FILE="results/test-results-${engine}/${engine}-${db}-result.txt"
+              IS_SOFT_FAIL=false
+              if echo "$SOFT_FAIL_DBS" | grep -qw "$db"; then
+                IS_SOFT_FAIL=true
+              fi
               if [ -f "$FILE" ]; then
-                FAIL=$(python3 -c "
+                STATS=$(python3 -c "
           import json, sys
           try:
               d = json.load(open('$FILE'))
-              print(int(d.get('totalFail', 0) + d.get('totalError', 0)))
+              print(int(d.get('totalFail', 0) + d.get('totalError', 0)), int(d.get('totalSpecs', 0)))
           except:
-              print(-1)
-          " 2>/dev/null || echo "-1")
-                if [ "$FAIL" = "0" ]; then
+              print(-1, -1)
+          " 2>/dev/null || echo "-1 -1")
+                FAIL="${STATS% *}"
+                SPECS="${STATS#* }"
+                if [ "$FAIL" = "0" ] && [ "$SPECS" -ge "$MIN_SPECS" ]; then
                   ROW="${ROW} :white_check_mark: |"
                 elif [ "$FAIL" = "-1" ]; then
                   ROW="${ROW} :warning: |"
+                elif [ "$FAIL" = "0" ]; then
+                  ROW="${ROW} :warning: ${SPECS} tests |"
+                elif [ "$IS_SOFT_FAIL" = true ]; then
+                  ROW="${ROW} :warning: ${FAIL} |"
                 else
                   ROW="${ROW} :x: ${FAIL} |"
                 fi
@@ -681,6 +735,9 @@ jobs:
 
           MATRIX_MD="${MATRIX_MD}
 
+          *Oracle is soft-fail (non-blocking, tracked in #2663) — :warning: cells in that column never gate the run.*
+          *A ':warning: N tests' cell means the leg reported fewer than ${MIN_SPECS} testcases (suite likely compile-wiped, counted as failed).*
+
           *Results for commit ${GITHUB_SHA:0:7}.*"
 
           # Write to step summary

CLAUDE.md

@@ -390,7 +390,9 @@ model("User")
     .orderBy("name", "ASC")
     .limit(25)
     .get();
-// Methods: where, orWhere, whereNull, whereNotNull, whereBetween, whereIn, whereNotIn, orderBy, limit, get
+// Methods: where, orWhere, whereNull, whereNotNull, whereBetween, whereIn, whereNotIn, orderBy,
+// limit, offset, select, include, group, distinct, forUpdate, get
+// Any of these (not just where) can START the chain on the model, e.g. model("User").select("id,name").get()
 
 // Batch processing — memory-efficient
 model("User").findEach(batchSize=1000, callback=function(user) {

changelog.d/debug-bar-reload-subpath.fixed.md

@@ -0,0 +1,6 @@
+- Debug bar reload link (and the CFML error page's displayed URL) now honors the `subpath`
+  setting: the base URL is composed from the resolved `webPath` plus the front-controller
+  filename — the same idiom as `urlFor()` — instead of raw `cgi.script_name`, so subfolder
+  deployments emit `/myapp/posts?reload=` instead of the unroutable
+  `/myapp/public/index.cfm/posts?reload=`. Root installs render byte-identical to before.
+  Extracted into the unit-tested `$buildDebugReloadUrl()` helper in `Global.cfc` ([#3344](https://github.com/wheels-dev/wheels/issues/3344))

changelog.d/debugbar-restore-button.fixed.md

@@ -0,0 +1 @@
+- Debug bar: the minimized "Debug" restore button now renders after clicking the X. The `#wdb-minimized` button was nested inside the `#wheels-debugbar` container that `wdbMinimize()` hides with `display:none`, so it could never appear and the bar stayed gone for the whole browser session (manual `sessionStorage` cleanup was the only recovery). It is now a sibling of the container, so minimizing shows the restore button bottom-right and clicking it brings the bar back ([#3345](https://github.com/wheels-dev/wheels/issues/3345)).

changelog.d/query-builder-select-entry.added.md

@@ -0,0 +1 @@
+- `select()`, `include()`, `group()`, `distinct()`, and `forUpdate()` can now start a query-builder chain directly on the model class (e.g. `model("Person").select("id,firstName").where("department", "engineering").get()`), matching `where()` and the other entry-position builder methods. `forUpdate()` is also available when transitioning from a scope chain. ([#3346](https://github.com/wheels-dev/wheels/issues/3346))

changelog.d/test-runner-swap-lock.fixed.md

@@ -0,0 +1,11 @@
+- Web test runner (`/wheels/core/tests` and `/wheels/app/tests`): the swap→run→restore window that
+  temporarily replaces the live `application.wheels` config with test configuration is now serialized
+  under an exclusive named lock, and the restore runs in a `finally` block. Overlapping test requests
+  can no longer clobber each other's `application.$$$wheels` backup and leave test config live until
+  the next `reload=true`, and an erroring suite now restores the original config too. ParallelRunner
+  partition sub-requests detect the already-applied swap and skip both the swap and the shared lock,
+  so parallel test mode does not deadlock. Note: this serializes test-vs-test only — a normal request
+  concurrent with a test run still sees swapped config; true isolation is deferred to a
+  separate-application-context design (refs [#3025](https://github.com/wheels-dev/wheels/issues/3025)).
+  Also removes the orphaned legacy RocketUnit runner twin `vendor/wheels/rocketunit_tests/Test.cfc`
+  (nothing loads it; the active legacy chain via `wheels.Test` is unchanged).

vendor/wheels/Global.cfc

@@ -2699,6 +2699,80 @@ return local.$wheels;
 		return local.base & local.relative;
 	}
 
+	/**
+	 * Internal function. Builds the debug bar's base reload URL (issue #3344).
+	 * The base is composed from the resolved `webPath` plus the front-controller
+	 * filename — the same idiom `urlFor()` uses — instead of raw
+	 * `cgi.script_name`, so subfolder (subpath) installs emit links like
+	 * `/myapp/posts?reload=` rather than `/myapp/public/index.cfm/posts?reload=`
+	 * (which the user's rewrite rules don't route). The caller selects which
+	 * path_info to pass (`request.cgi.path_info` when available, `cgi.path_info`
+	 * otherwise — engines report it differently). `webPath` and `rewriteFile`
+	 * default from application scope; tests pass them explicitly, and early
+	 * boot/error paths where they're missing fall back to the raw script name
+	 * (the pre-#3344 behavior). Pure string logic so it can be unit-tested in
+	 * isolation.
+	 */
+	public string function $buildDebugReloadUrl(
+		required string scriptName,
+		string pathInfo = "",
+		string queryString = "",
+		string webPath,
+		string rewriteFile
+	) {
+		// Resolve webPath/rewriteFile from application scope unless overridden.
+		// No runtime default-arg expressions (some engines evaluate those
+		// eagerly) — same pattern as $resolveSubpathInclude.
+		if (StructKeyExists(arguments, "webPath")) {
+			local.resolvedWebPath = arguments.webPath;
+		} else if (IsDefined("application.wheels.webPath")) {
+			local.resolvedWebPath = application.wheels.webPath;
+		} else {
+			local.resolvedWebPath = "";
+		}
+		if (StructKeyExists(arguments, "rewriteFile")) {
+			local.resolvedRewriteFile = arguments.rewriteFile;
+		} else if (IsDefined("application.wheels.rewriteFile")) {
+			local.resolvedRewriteFile = application.wheels.rewriteFile;
+		} else {
+			local.resolvedRewriteFile = "";
+		}
+
+		// Base: webPath + front-controller filename (matches urlFor()); fall
+		// back to the raw script name when webPath isn't resolved yet.
+		if (Len(local.resolvedWebPath)) {
+			local.rv = local.resolvedWebPath & ListLast(arguments.scriptName, "/");
+		} else {
+			local.rv = arguments.scriptName;
+		}
+		if (arguments.pathInfo != arguments.scriptName) {
+			local.rv &= arguments.pathInfo;
+		}
+		if (Len(arguments.queryString)) {
+			local.rv &= "?" & arguments.queryString;
+		}
+		if (Len(local.resolvedRewriteFile)) {
+			local.rv = ReplaceNoCase(local.rv, "/" & local.resolvedRewriteFile, "");
+		}
+		local.reloadTokens = "development,testing,maintenance,production,true";
+		local.iEnd = ListLen(local.reloadTokens);
+		for (local.i = 1; local.i <= local.iEnd; local.i++) {
+			local.token = ListGetAt(local.reloadTokens, local.i);
+			local.rv = ReplaceNoCase(
+				ReplaceNoCase(local.rv, "?reload=" & local.token, ""),
+				"&reload=" & local.token,
+				""
+			);
+		}
+		if (Find("?", local.rv)) {
+			local.rv &= "&";
+		} else {
+			local.rv &= "?";
+		}
+		local.rv &= "reload=";
+		return local.rv;
+	}
+
 	/**
 	 * Internal function.
 	 */

vendor/wheels/events/onerror/cfmlerror.cfm

@@ -65,9 +65,19 @@
 		<!--- Request Info Grid --->
 		<div style="display:grid;grid-template-columns:repeat(auto-fill,minmax(280px,1fr));gap:12px;margin:1.5em 0;">
 			<cfif IsDefined("application.wheels.rewriteFile")>
+				<!---
+					Base composed from webPath (subpath-aware, issue #3344) so subfolder
+					installs display /myapp/... instead of /myapp/public/... — same idiom
+					as urlFor() and $buildDebugReloadUrl().
+				--->
+				<cfif IsDefined("application.wheels.webPath") AND Len(application.wheels.webPath)>
+					<cfset local.errorUrlBase = Replace(application.wheels.webPath & ListLast(cgi.script_name, "/"), "/#application.wheels.rewriteFile#", "")>
+				<cfelse>
+					<cfset local.errorUrlBase = Replace(cgi.script_name, "/#application.wheels.rewriteFile#", "")>
+				</cfif>
 				<div style="background:##181825;border:1px solid ##45475a;border-radius:6px;padding:12px 16px;">
 					<div style="font-size:10px;font-weight:700;color:##6c7086;text-transform:uppercase;letter-spacing:.5px;margin-bottom:4px;">URL</div>
-					<div style="font-family:monospace;font-size:12px;color:##cdd6f4;word-break:break-all;">http<cfif cgi.http_x_forwarded_proto EQ "https" OR cgi.server_port_secure EQ "true">s</cfif>://#EncodeForHTML(cgi.server_name)##Replace(cgi.script_name, "/#application.wheels.rewriteFile#", "")#<cfif IsDefined("request.cgi.path_info")>#EncodeForHTML(request.cgi.path_info)#<cfelse>#EncodeForHTML(cgi.path_info)#</cfif><cfif cgi.query_string IS NOT "">?#EncodeForHTML(cgi.query_string)#</cfif></div>
+					<div style="font-family:monospace;font-size:12px;color:##cdd6f4;word-break:break-all;">http<cfif cgi.http_x_forwarded_proto EQ "https" OR cgi.server_port_secure EQ "true">s</cfif>://#EncodeForHTML(cgi.server_name)##EncodeForHTML(local.errorUrlBase)#<cfif IsDefined("request.cgi.path_info")>#EncodeForHTML(request.cgi.path_info)#<cfelse>#EncodeForHTML(cgi.path_info)#</cfif><cfif cgi.query_string IS NOT "">?#EncodeForHTML(cgi.query_string)#</cfif></div>
 				</div>
 			</cfif>
 			<cfif Len(cgi.http_referer)>

vendor/wheels/events/onrequestend/debug.cfm

@@ -7,33 +7,21 @@ OR (StructKeyExists(local.reqHeaders, "X-Fetch") AND local.reqHeaders["X-Fetch"]
 OR (StructKeyExists(url, "format") AND ListFindNoCase("json,xml,csv,pdf", url.format))>
 	<cfexit>
 </cfif>
-<cfset local.baseReloadURL = cgi.script_name>
+<!---
+	Base reload URL composed from webPath (subpath-aware, issue #3344) via
+	$buildDebugReloadUrl() in Global.cfc. Engines report path_info differently,
+	so prefer the normalized request.cgi copy when available.
+--->
 <cfif IsDefined("request.cgi.path_info")>
-	<cfif request.cgi.path_info IS NOT cgi.script_name>
-		<cfset local.baseReloadURL &= request.cgi.path_info>
-	</cfif>
+	<cfset local.debugPathInfo = request.cgi.path_info>
 	<cfelse>
-	<cfif cgi.path_info IS NOT cgi.script_name>
-		<cfset local.baseReloadURL &= cgi.path_info>
-	</cfif>
-</cfif>
-<cfif Len(cgi.query_string)>
-	<cfset local.baseReloadURL &= "?" & cgi.query_string>
+	<cfset local.debugPathInfo = cgi.path_info>
 </cfif>
-<cfset local.baseReloadURL = ReplaceNoCase(local.baseReloadURL, "/" & application.wheels.rewriteFile, "")>
-<cfloop list="development,testing,maintenance,production,true" index="local.i">
-	<cfset local.baseReloadURL = ReplaceNoCase(
-		ReplaceNoCase(local.baseReloadURL, "?reload=" & local.i, ""),
-		"&reload=" & local.i,
-		""
-	)>
-</cfloop>
-<cfif local.baseReloadURL Contains "?">
-	<cfset local.baseReloadURL &= "&">
-	<cfelse>
-	<cfset local.baseReloadURL &= "?">
-</cfif>
-<cfset local.baseReloadURL &= "reload=">
+<cfset local.baseReloadURL = $buildDebugReloadUrl(
+	scriptName = cgi.script_name,
+	pathInfo = local.debugPathInfo,
+	queryString = cgi.query_string
+)>
 <cfset local.gitbranch = DirectoryExists(GetDirectoryFromPath(GetBaseTemplatePath()) & ".git") ? FileRead(
 	GetDirectoryFromPath(GetBaseTemplatePath()) & ".git/HEAD"
 ) : "">
@@ -489,15 +477,17 @@ OR (StructKeyExists(url, "format") AND ListFindNoCase("json,xml,csv,pdf", url.fo
 </div>
 </cfif>
 
+</div>
+
 <!--- ============ MINIMIZED BUTTON ============ --->
-<div id="wdb-minimized" style="display:none;position:fixed;bottom:8px;right:8px;z-index:99999;">
+<!--- Sibling of ##wheels-debugbar on purpose: wdbMinimize() sets the container to display:none, and a descendant of a display:none element can never render, so nesting this inside the container makes the restore button unreachable (issue ##3345). It is independently position:fixed. The script include stays below so both elements exist when debugbar.js's load-time wdbMinimize() re-invocation runs. --->
+<div id="wdb-minimized" style="all:initial;display:none;position:fixed;bottom:8px;right:8px;z-index:99999;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen,Ubuntu,sans-serif;">
 	<button onclick="wdbRestore()" style="background:##1e1e2e;border:1px solid ##45475a;border-radius:8px;padding:6px 10px;cursor:pointer;color:##89b4fa;font-size:12px;font-family:inherit;display:flex;align-items:center;gap:4px;box-shadow:0 2px 8px rgba(0,0,0,.3);">
 		<svg viewBox="0 0 153 18" xmlns="http://www.w3.org/2000/svg" style="width:20px;height:5px;"><path d="M15.71 12c1.65 0 2.99 1.34 2.99 3s-1.34 3-2.99 3-2.99-1.34-2.99-3v-1.27c0-.42-.15-.79-.45-1.09L6.1 6.45c-.3-.3-.66-.45-1.09-.45H3.75c-1.65 0-2.99-1.34-2.99-3S2.09 0 3.74 0s2.99 1.34 2.99 3v1.27c0 .42.15.79.45 1.09l6.17 6.19c.3.3.66.45 1.09.45z" fill="##f38ba8"/></svg>
 		Debug
 	</button>
 </div>
 
 <script><cfinclude template="/wheels/public/assets/js/debugbar.js"></script>
-</div>
 </cfoutput></cfsavecontent><cfoutput>#ReReplace(local.wdbHtml, "(?m)>\s+<", "><", "all")#</cfoutput>
 <!--- cfformat-ignore-end --->