From 3b2dab8a1f90e903180c693578c242dde253378c Mon Sep 17 00:00:00 2001 From: Zac Spitzer Date: Fri, 6 Sep 2024 12:59:20 +0200 Subject: [PATCH 1/4] fix test os detection --- test/functions/FileSetAccessMode.cfc | 2 +- test/tickets/LDEV5034.cfc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/functions/FileSetAccessMode.cfc b/test/functions/FileSetAccessMode.cfc index ff5fa2a3f8..77c95dd1bd 100644 --- a/test/functions/FileSetAccessMode.cfc +++ b/test/functions/FileSetAccessMode.cfc @@ -79,7 +79,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase" { } private function isNotUnix(){ - return (server.os.name == "windows"); + return (server.os.name contains "windows"); } } diff --git a/test/tickets/LDEV5034.cfc b/test/tickets/LDEV5034.cfc index e329274d71..7a8a9e489c 100644 --- a/test/tickets/LDEV5034.cfc +++ b/test/tickets/LDEV5034.cfc @@ -101,7 +101,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase" { } private function isNotUnix(){ - return (server.os.name == "windows"); + return (server.os.name contains "windows"); } } From 1c96ec9a68198e9533532e7107beb6b724f96b6d Mon Sep 17 00:00:00 2001 From: Zac Spitzer Date: Fri, 6 Sep 2024 13:04:36 +0200 Subject: [PATCH 2/4] LDEV-2616 check if mssql service is available --- test/tickets/LDEV2616.cfc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/test/tickets/LDEV2616.cfc b/test/tickets/LDEV2616.cfc index a520edabbc..679f2cc230 100644 --- a/test/tickets/LDEV2616.cfc +++ b/test/tickets/LDEV2616.cfc @@ -6,7 +6,8 @@ component extends="org.lucee.cfml.test.LuceeTestCase"{ function run( testResults , testBox ) { describe( "test case for LDEV-2616", function() { - it(title = " value empty throws an error for queryexecute function", body = function( currentSpec ) { + it(title = " value empty throws an error for queryexecute function", skip=msSqlUnavailable(), + body = function( currentSpec ) { var result = ""; try { result = _InternalRequest( @@ -22,6 +23,12 @@ component extends="org.lucee.cfml.test.LuceeTestCase"{ }); } + private boolean function msSqlUnavailable() { + // getting the credentials from the environment variables + return isEmpty(server.getDatasource("mssql")); + } + + private string function createURI(string calledName){ var baseURI = "/test/#listLast(getDirectoryFromPath(getCurrenttemplatepath()),"\/")#/"; return baseURI&""&calledName; From cfa42ebfb176799d52b43167b8807ab3b71dfaa2 Mon Sep 17 00:00:00 2001 From: michaeloffner Date: Sat, 7 Sep 2024 00:32:17 +0200 Subject: [PATCH 3/4] LDEV-3382 - check for old and new variable path --- core/src/main/java/resource/context/admin/debug/Modern.cfc | 6 ++++-- loader/build.xml | 2 +- loader/pom.xml | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/resource/context/admin/debug/Modern.cfc b/core/src/main/java/resource/context/admin/debug/Modern.cfc index 4fab2afdb7..1689b922f2 100644 --- a/core/src/main/java/resource/context/admin/debug/Modern.cfc +++ b/core/src/main/java/resource/context/admin/debug/Modern.cfc @@ -162,8 +162,10 @@ if(structKeyExists(arguments.custom, "metrics_Charts")) { local.times=arguments.debugging.times; var time=getTickCount(); - var _cgi=structKeyExists(arguments.debugging,'cgi')?arguments.debugging.cgi:cgi; - + // CGI + if(!isNull(arguments.debugging.scope.cgi)) local._cgi=arguments.debugging.scope.cgi; + else if(!isNull(arguments.debugging.cgi)) local._cgi=arguments.debugging.cgi; + else local._cgi=cgi; diff --git a/loader/build.xml b/loader/build.xml index 018e0c871e..a61f865ec8 100644 --- a/loader/build.xml +++ b/loader/build.xml @@ -2,7 +2,7 @@ - + diff --git a/loader/pom.xml b/loader/pom.xml index 774ac0da32..be1a930f7b 100644 --- a/loader/pom.xml +++ b/loader/pom.xml @@ -3,7 +3,7 @@ org.lucee lucee - 6.1.1.79-RC + 6.1.1.80-SNAPSHOT jar Lucee Loader Build From 8db9b9a45a41cff16c2122ff5708db0924f69179 Mon Sep 17 00:00:00 2001 From: michaeloffner Date: Sat, 7 Sep 2024 00:41:49 +0200 Subject: [PATCH 4/4] LDEV-3382 - check for old and new variable path --- core/src/main/java/resource/context/admin/debug/Classic.cfc | 4 +++- core/src/main/java/resource/context/admin/debug/Comment.cfc | 4 +++- core/src/main/java/resource/context/admin/debug/Simple.cfc | 5 ++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/resource/context/admin/debug/Classic.cfc b/core/src/main/java/resource/context/admin/debug/Classic.cfc index d39dbf1633..020a0d8800 100644 --- a/core/src/main/java/resource/context/admin/debug/Classic.cfc +++ b/core/src/main/java/resource/context/admin/debug/Classic.cfc @@ -83,7 +83,9 @@ private function isColumnEmpty(query query, string columnName){ var time=getTickCount(); - var _cgi = arguments?.debugging?.scope?.cgi ?: cgi; + if(!isNull(arguments.debugging.scope.cgi)) local._cgi=arguments.debugging.scope.cgi; + else if(!isNull(arguments.debugging.cgi)) local._cgi=arguments.debugging.cgi; + else local._cgi=cgi; if(isNull(arguments.debugging.pages)) local.pages=queryNew('id,count,min,max,avg,app,load,query,total,src'); diff --git a/core/src/main/java/resource/context/admin/debug/Comment.cfc b/core/src/main/java/resource/context/admin/debug/Comment.cfc index 3ac05b567e..97b1972685 100644 --- a/core/src/main/java/resource/context/admin/debug/Comment.cfc +++ b/core/src/main/java/resource/context/admin/debug/Comment.cfc @@ -56,7 +56,9 @@ */ function output(struct custom, struct debugging, string context="web") { var NL=variables.NL; - var _cgi = arguments?.debugging?.scope?.cgi ?: cgi; + if(!isNull(arguments.debugging.scope.cgi)) local._cgi=arguments.debugging.scope.cgi; + else if(!isNull(arguments.debugging.cgi)) local._cgi=arguments.debugging.cgi; + else local._cgi=cgi; if (not StructKeyExists(arguments.custom, "unit")) arguments.custom["unit"] = "millisecond"; writeOutput("