CASSJAVA-3: Fix ordering of LIMIT and PER PARTITION LIMIT clauses

patch by David Stringer; reviewed by Lukasz Antoniak and Bret McGuire
reference: #2022

Author: stringaling

query-builder/src/main/java/com/datastax/oss/driver/internal/querybuilder/select/DefaultSelect.java

@@ -425,15 +425,6 @@ public String asCql() {
 
     orderingClause.ifPresent(c -> c.appendTo(builder));
 
-    if (limit != null) {
-      builder.append(" LIMIT ");
-      if (limit instanceof BindMarker) {
-        ((BindMarker) limit).appendTo(builder);
-      } else {
-        builder.append(limit);
-      }
-    }
-
     if (perPartitionLimit != null) {
       builder.append(" PER PARTITION LIMIT ");
       if (perPartitionLimit instanceof BindMarker) {
@@ -443,6 +434,15 @@ public String asCql() {
       }
     }
 
+    if (limit != null) {
+      builder.append(" LIMIT ");
+      if (limit instanceof BindMarker) {
+        ((BindMarker) limit).appendTo(builder);
+      } else {
+        builder.append(limit);
+      }
+    }
+
     if (allowsFiltering) {
       builder.append(" ALLOW FILTERING");
     }

query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/select/SelectLimitTest.java

@@ -49,4 +49,10 @@ public void should_use_last_per_partition_limit_if_called_multiple_times() {
     assertThat(selectFrom("foo").all().perPartitionLimit(1).perPartitionLimit(2))
         .hasCql("SELECT * FROM foo PER PARTITION LIMIT 2");
   }
+
+  @Test
+  public void should_put_limit_after_partition_limit() {
+    assertThat(selectFrom("foo").all().perPartitionLimit(1).limit(1))
+        .hasCql("SELECT * FROM foo PER PARTITION LIMIT 1 LIMIT 1");
+  }
 }