diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml index 403ea11..be47a60 100644 --- a/.github/workflows/cron.yml +++ b/.github/workflows/cron.yml @@ -12,16 +12,38 @@ jobs: fail-fast: false matrix: cfengine: ["lucee@5", "lucee@6", "adobe@2021", "adobe@2023", "adobe@2025", "boxlang-cfml@1"] - coldbox: ["coldbox@7", "coldbox@be"] + coldbox: ["coldbox@^7", "coldbox@^8"] experimental: [ false ] include: - cfengine: "lucee@be" + coldbox: "coldbox@^7" + experimental: true + - cfengine: "lucee@be" + coldbox: "coldbox@^8" + experimental: true + - cfengine: "lucee@be" + coldbox: "coldbox@be" + experimental: true + - cfengine: "adobe@be" + coldbox: "coldbox@^7" experimental: true - cfengine: "adobe@be" + coldbox: "coldbox@^8" + experimental: true + - cfengine: "adobe@be" + coldbox: "coldbox@be" + experimental: true + - cfengine: "boxlang@1" + coldbox: "coldbox@^8" experimental: true - cfengine: "boxlang@1" + coldbox: "coldbox@be" + experimental: true + - cfengine: "boxlang@be" + coldbox: "coldbox@^8" experimental: true - cfengine: "boxlang@be" + coldbox: "coldbox@be" experimental: true services: mysql: diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 025b416..c636f8b 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -20,6 +20,7 @@ jobs: fail-fast: false matrix: cfengine: ["lucee@5", "lucee@6", "adobe@2021", "adobe@2023", "adobe@2025", "boxlang-cfml@1"] + coldbox: ["coldbox@^7", "coldbox@^8"] services: mysql: image: mysql:5.7 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index eeb61e2..8c7a0fc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,6 +15,7 @@ jobs: fail-fast: false matrix: cfengine: ["lucee@5", "lucee@6", "adobe@2021", "adobe@2023", "adobe@2025", "boxlang-cfml@1"] + coldbox: ["coldbox@^7", "coldbox@^8"] services: mysql: image: mysql:5.7 diff --git a/box.json b/box.json index ead31e9..c03eac2 100644 --- a/box.json +++ b/box.json @@ -29,13 +29,13 @@ }, "type":"modules", "dependencies":{ - "qb":"^13.0.0", + "qb":"^13.0.12", "str":"^4.0.0", "mementifier":"^3.0.0" }, "devDependencies":{ - "coldbox":"^7.3.0", - "testbox":"be", + "coldbox":"^8.0.0", + "testbox":"^6.0.0", "cfcollection":"^3.6.4", "cfmigrations":"^5.0.0" }, diff --git a/models/BaseEntity.cfc b/models/BaseEntity.cfc index 02d4b53..cdf0eba 100644 --- a/models/BaseEntity.cfc +++ b/models/BaseEntity.cfc @@ -378,7 +378,7 @@ component accessors="true" { */ public string function qualifyColumn( required string column, - string tableName = tableName(), + string tableName = this.tableName(), boolean useParentLookup = true ) { if ( @@ -3302,7 +3302,15 @@ component accessors="true" { ); } if ( !isNull( variables._interceptorService ) ) { - variables._interceptorService.processState( "quick" & arguments.eventName, arguments.eventData ); + param variables.useAnnounceMethodForInterceptorService = structKeyExists( + variables._interceptorService, + "announce" + ); + if ( variables.useAnnounceMethodForInterceptorService ) { + variables._interceptorService.announce( "quick" & arguments.eventName, arguments.eventData ); + } else { + variables._interceptorService.processState( "quick" & arguments.eventName, arguments.eventData ); + } } }