#452 Too many aggregate statistics results for offsets

Author: Igor Polevoy

activejdbc/src/main/java/org/javalite/activejdbc/statistics/QueryExecutionEvent.java

@@ -25,12 +25,14 @@
 public class QueryExecutionEvent {
 
     private static final Pattern IN_PATTERN = Pattern.compile("(IN|in)\\s*\\(.*\\)", Pattern.CASE_INSENSITIVE);
+    private static final Pattern OFFSET_PATTERN = Pattern.compile("(offset|OFFSET|Offset)\\s*\\d*", Pattern.CASE_INSENSITIVE);
 
-    private final String query;
+    private String query;
     private final long time;
 
     public QueryExecutionEvent(String query, long time) {
         this.query = IN_PATTERN.matcher(query).replaceAll("IN (...)");
+        this.query = OFFSET_PATTERN.matcher(this.query).replaceAll("offset ...");
         this.time = time;
     }
 

activejdbc/src/test/java/org/javalite/activejdbc/statistics/StatisticsQueueTest.java

@@ -109,4 +109,11 @@ public void shouldNormalizeInSelects(){
         QueryExecutionEvent event = new QueryExecutionEvent("select * from people where id IN (1,2,3,4)", 1);
         the(event.getQuery()).shouldBeEqual("select * from people where id IN (...)");
     }
+
+
+    @Test // related to: https://github.com/javalite/activejdbc/issues/452
+    public void shouldNormalizeOffset(){
+        QueryExecutionEvent event = new QueryExecutionEvent("select * from pages where lesson_id=? order by the_index limit 1 offset 0", 1);
+        the(event.getQuery()).shouldBeEqual("select * from pages where lesson_id=? order by the_index limit 1 offset ...");
+    }
 }