2 files changed, 13 insertions, 18 deletions
diff --git a/src/main/java/io/trygvis/esper/testing/gitorious/GitoriousProjectDiscovery.java b/src/main/java/io/trygvis/esper/testing/gitorious/GitoriousProjectDiscovery.java
index 67b6d17..d60956d 100644..100755
--- a/src/main/java/io/trygvis/esper/testing/gitorious/GitoriousProjectDiscovery.java
+++ b/src/main/java/io/trygvis/esper/testing/gitorious/GitoriousProjectDiscovery.java
@@ -38,7 +38,7 @@ public class GitoriousProjectDiscovery {
 
         Set<GitoriousRepositoryDto> repositories = Collections.emptySet();
         try (Connection c = boneCp.getConnection()) {
-            repositories = new HashSet<>(new Daos(c).gitoriousRepositoryDao.select(Daos.OrderDirection.ASC));
+            repositories = new HashSet<>(new Daos(c).gitoriousRepositoryDao.select(true));
         } catch (SQLException e) {
             // ignore
         }
@@ -53,7 +53,7 @@ public class GitoriousProjectDiscovery {
             public void act(Connection c) throws Exception {
                 try (Daos daos = new Daos(c)) {
                     discoverProjects(daos);
-                    repositoryManager.update(daos.gitoriousRepositoryDao.select(Daos.OrderDirection.NONE));
+                    repositoryManager.update(daos.gitoriousRepositoryDao.select(null));
                     daos.commit();
                 }
             }
diff --git a/src/main/java/io/trygvis/esper/testing/gitorious/GitoriousRepositoryDao.java b/src/main/java/io/trygvis/esper/testing/gitorious/GitoriousRepositoryDao.java
index 903d74c..27e66fe 100644..100755
--- a/src/main/java/io/trygvis/esper/testing/gitorious/GitoriousRepositoryDao.java
+++ b/src/main/java/io/trygvis/esper/testing/gitorious/GitoriousRepositoryDao.java
@@ -2,8 +2,7 @@ package io.trygvis.esper.testing.gitorious;
 
 import fj.data.*;
 import io.trygvis.esper.testing.*;
-import static io.trygvis.esper.testing.Util.dateToTimestamp;
-import static io.trygvis.esper.testing.Util.timestampToDate;
+import io.trygvis.esper.testing.util.sql.*;
 
 import java.net.*;
 import java.sql.*;
@@ -11,6 +10,8 @@ import java.util.*;
 import java.util.Date;
 import java.util.List;
 
+import static io.trygvis.esper.testing.Util.*;
+
 public class GitoriousRepositoryDao {
     private final Connection c;
 
@@ -38,7 +39,7 @@ public class GitoriousRepositoryDao {
     }
 
     public int countRepositories(String projectSlug, String name) throws SQLException {
-        try (PreparedStatement s = c.prepareStatement("SELECT count(*) FROM gitorious_repository WHERE project_slug=? and name=?")) {
+        try (PreparedStatement s = c.prepareStatement("SELECT count(*) FROM gitorious_repository WHERE project_slug=? AND name=?")) {
             s.setString(1, projectSlug);
             s.setString(2, name);
             try (ResultSet rs = s.executeQuery()) {
@@ -55,21 +56,15 @@ public class GitoriousRepositoryDao {
         }
     }
 
-    public List<GitoriousRepositoryDto> select(Daos.OrderDirection order) throws SQLException {
-        String orderBy;
-
-        switch (order) {
-            case ASC:
-                orderBy = "ORDER BY project_slug, name";
-                break;
-            case DESC:
-                orderBy = "ORDER BY project_slug DESC, name DESC";
-                break;
-            default:
-                orderBy = "";
+    public List<GitoriousRepositoryDto> select(Boolean asc) throws SQLException {
+        String sql = "SELECT " + ALL_FIELDS + " FROM gitorious_repository ";
+
+        if(asc != null) {
+            String[] orderBy = asc ? new String[]{"project_slug", "name"} : new String[]{"project_slug-", "name-"};
+            sql += orderBy(orderBy, "project_slug", "name");
         }
 
-        try (PreparedStatement s = c.prepareStatement("SELECT " + ALL_FIELDS + " FROM gitorious_repository " + orderBy)) {
+        try (PreparedStatement s = c.prepareStatement(sql)) {
             return executeQuery(s);
         }
     }