Skip to content

Commit

Permalink
fix(QueryBuilder): Upgrade cbpaginator to fix maxrows discrepency
Browse files Browse the repository at this point in the history
cbpaginator would clamp the `maxrows` between 0 and a configured
maximum.  qb, however, would execute the query before this clamping.
This means that the length of the results was different than the
reported `maxrows`.  The new version of `cbpaginator` does not do
any clamping.  Please handle that in your application.  This change
is NOT breaking because qb never used the clamped value.  This fix
is just fixing the discrepency between the results length and the
reported maxrows value in the returned pagination struct.
  • Loading branch information
elpete committed Mar 25, 2020
1 parent 8b335da commit 085c8a6
Showing 1 changed file with 35 additions and 37 deletions.
72 changes: 35 additions & 37 deletions box.json
Original file line number Diff line number Diff line change
@@ -1,58 +1,56 @@
{
"name":"qb",
"version":"7.5.1",
"author":"Eric Peterson",
"homepage":"https://github.com/coldbox-modules/qb",
"documentation":"https://github.com/coldbox-modules/qb",
"location":"forgeboxStorage",
"scripts":{
"generateAPIDocs":"rm .tmp --recurse --force && docbox generate mapping=qb excludes=test|ModuleConfig strategy-outputDir=.tmp/apidocs strategy-projectTitle=qb",
"commitAPIDocs":"run-script generateAPIDocs && !git add docs/apidocs/* && !git commit -m 'Updated API Docs'",
"format":"cfformat run models/**/*.cfc,tests/resources/**/*.cfc,tests/specs/**/*.cfc --overwrite",
"format:check":"cfformat check models/**/*.cfc,tests/resources/**/*.cfc,tests/specs/**/*.cfc"
"name": "qb",
"version": "7.5.1",
"author": "Eric Peterson",
"homepage": "https://github.com/coldbox-modules/qb",
"documentation": "https://github.com/coldbox-modules/qb",
"location": "forgeboxStorage",
"scripts": {
"generateAPIDocs": "rm .tmp --recurse --force && docbox generate mapping=qb excludes=test|ModuleConfig strategy-outputDir=.tmp/apidocs strategy-projectTitle=qb",
"commitAPIDocs": "run-script generateAPIDocs && !git add docs/apidocs/* && !git commit -m 'Updated API Docs'",
"format": "cfformat run models/**/*.cfc,tests/resources/**/*.cfc,tests/specs/**/*.cfc --overwrite",
"format:check": "cfformat check models/**/*.cfc,tests/resources/**/*.cfc,tests/specs/**/*.cfc"
},
"repository":{
"type":"git",
"URL":"https://github.com/coldbox-modules/qb"
"repository": {
"type": "git",
"URL": "https://github.com/coldbox-modules/qb"
},
"bugs":"https://github.com/coldbox-modules/qb/issues",
"slug":"qb",
"shortDescription":"A query builder for the rest of us",
"type":"modules",
"keywords":[
"bugs": "https://github.com/coldbox-modules/qb/issues",
"slug": "qb",
"shortDescription": "A query builder for the rest of us",
"type": "modules",
"keywords": [
"ORM",
"query",
"SQL"
],
"private":false,
"projectURL":"https://github.com/coldbox-modules/qb",
"license":[
"private": false,
"projectURL": "https://github.com/coldbox-modules/qb",
"license": [
{
"type":"MIT",
"URL":"https://github.com/coldbox-modules/qb/LICENSE"
"type": "MIT",
"URL": "https://github.com/coldbox-modules/qb/LICENSE"
}
],
"dependencies":{
"cbpaginator":"^1.3.0",
"coldbox":"stable"
"dependencies": {
"cbpaginator": "^2.0.0"
},
"devDependencies":{
"testbox":"^3.0.0"
"devDependencies": {
"testbox": "^3.0.0"
},
"installPaths":{
"testbox":"testbox/",
"cbpaginator":"modules/cbpaginator/",
"coldbox":"coldbox/"
"installPaths": {
"testbox": "testbox/",
"cbpaginator": "modules/cbpaginator/"
},
"ignore":[
"ignore": [
"**/.*",
"test",
"tests",
"docs/**/*.*",
"server.json"
],
"testbox":{
"runner":"http://localhost:7777/tests/runner.cfm",
"verbose":false
"testbox": {
"runner": "http://localhost:7777/tests/runner.cfm",
"verbose": false
}
}

0 comments on commit 085c8a6

Please sign in to comment.