[Make `paged-query-view-mixin' properly composable with other mixins clinton@unknownlamer.org**20090216110016 Ignore-this: 1946c7e9674dc0688f17a99093d47947 Methods on `limit' and `skip' take the values returned by the main method body into account now rather than unconditionally overriding their values. ] { hunk ./src/query-view.lisp 121 -(defmethod limit ((view query-paged-view-mixin)) - (page-size view)) +(defmethod limit :around ((view query-paged-view-mixin)) + (let ((limit (call-next-method))) + (if (and limit (> (* (page-offset view) + (page-size view)) + limit)) + nil + (page-size view)))) hunk ./src/query-view.lisp 129 -(defmethod skip ((view query-paged-view-mixin)) - (* (page-size view) (page-offset view))) +(defmethod skip :around ((view query-paged-view-mixin)) + (+ (or (call-next-method) 0) + (* (page-size view) (page-offset view)))) }