fix max page size

liuzsen · Wulf · commit bd256ac2ad48 · 2022-10-24T05:49:33.000-04:00
diff --git a/create-rust-app_cli/template/backend/models/todo.rs+database_postgres b/create-rust-app_cli/template/backend/models/todo.rs+database_postgres
@@ -70,7 +70,7 @@ pub fn read_all(db: &mut Connection, pagination: &PaginationParams) -> QueryResu
         .limit(pagination.page_size)
         .offset(
             pagination.page
-                * std::cmp::max(pagination.page_size, PaginationParams::MAX_PAGE_SIZE as i64),
+                * std::cmp::min(pagination.page_size, PaginationParams::MAX_PAGE_SIZE as i64),
         )
         .load::<Todo>(db)
 }
diff --git a/create-rust-app_cli/template/backend/models/todo.rs+database_sqlite b/create-rust-app_cli/template/backend/models/todo.rs+database_sqlite
@@ -68,7 +68,7 @@ pub fn read_all(db: &mut Connection, pagination: &PaginationParams) -> QueryResu
         .limit(pagination.page_size)
         .offset(
             pagination.page
-                * std::cmp::max(pagination.page_size, PaginationParams::MAX_PAGE_SIZE as i64),
+                * std::cmp::min(pagination.page_size, PaginationParams::MAX_PAGE_SIZE as i64),
         )
         .load::<Todo>(db)
 }

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ pub fn read_all(db: &mut Connection, pagination: &PaginationParams) -> QueryResu`
`70`	`70`	`.limit(pagination.page_size)`
`71`	`71`	`.offset(`
`72`	`72`	`pagination.page`
`73`		`- * std::cmp::max(pagination.page_size, PaginationParams::MAX_PAGE_SIZE as i64),`
	`73`	`+ * std::cmp::min(pagination.page_size, PaginationParams::MAX_PAGE_SIZE as i64),`
`74`	`74`	`)`
`75`	`75`	`.load::<Todo>(db)`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ pub fn read_all(db: &mut Connection, pagination: &PaginationParams) -> QueryResu`
`68`	`68`	`.limit(pagination.page_size)`
`69`	`69`	`.offset(`
`70`	`70`	`pagination.page`
`71`		`- * std::cmp::max(pagination.page_size, PaginationParams::MAX_PAGE_SIZE as i64),`
	`71`	`+ * std::cmp::min(pagination.page_size, PaginationParams::MAX_PAGE_SIZE as i64),`
`72`	`72`	`)`
`73`	`73`	`.load::<Todo>(db)`
`74`	`74`	`}`