refactor: Move SqlBuilder method [DHIS2-16705]

dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/db/sql/DorisSqlBuilder.java

@@ -198,6 +198,11 @@ public String differenceInSeconds(String columnA, String columnB) {
     return String.format("(unix_timestamp(%s) - unix_timestamp(%s))", columnA, columnB);
   }
 
+  @Override
+  public String regexpMatch(String pattern) {
+    return String.format("regexp %s", pattern);
+  }
+
   // Statements
 
   @Override
@@ -353,9 +358,4 @@ public String createCatalog(String connectionUrl, String username, String passwo
   public String dropCatalogIfExists() {
     return String.format("drop catalog if exists %s;", quote(catalog));
   }
-
-  @Override
-  public String regexpMatch(String pattern) {
-    return "REGEXP " + pattern;
-  }
 }

dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/db/sql/PostgreSqlBuilder.java

@@ -219,6 +219,11 @@ public String differenceInSeconds(String columnA, String columnB) {
     return String.format("extract(epoch from (%s - %s))", columnA, columnB);
   }
 
+  @Override
+  public String regexpMatch(String pattern) {
+    return String.format("~* %s", pattern);
+  }
+
   // Statements
 
   @Override
@@ -350,9 +355,4 @@ public String createCatalog(String connectionUrl, String username, String passwo
   public String dropCatalogIfExists() {
     return notSupported();
   }
-
-  @Override
-  public String regexpMatch(String pattern) {
-    return "~* " + pattern;
-  }
 }

dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/db/sql/SqlBuilder.java

@@ -236,6 +236,12 @@ public interface SqlBuilder {
    */
   String differenceInSeconds(String columnA, String columnB);
 
+  /**
+   * @param pattern the regular expression pattern to match against
+   * @return a regular expression matching clause.
+   */
+  String regexpMatch(String pattern);
+
   // Statements
 
   /**
@@ -360,12 +366,4 @@ public interface SqlBuilder {
    * @return a drop catalog if exists statement.
    */
   String dropCatalogIfExists();
-
-  /**
-   * Returns the appropriate regexp matching syntax
-   *
-   * @param pattern The regexp pattern to match against
-   * @return The complete regexp matching clause for the current database
-   */
-  String regexpMatch(String pattern);
 }

dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/db/sql/DorisSqlBuilderTest.java

@@ -191,6 +191,14 @@ void testDifferenceInSeconds() {
             sqlBuilder.quote("a", "startdate"), sqlBuilder.quote("b", "enddate")));
   }
 
+  @Test
+  void testRegexpMatch() {
+    assertEquals("regexp test", sqlBuilder.regexpMatch("test"));
+    assertEquals("regexp \\d", sqlBuilder.regexpMatch("\\d"));
+    assertEquals("regexp ", sqlBuilder.regexpMatch(""));
+    assertEquals("regexp [a-z]\\w+\\d{3}", sqlBuilder.regexpMatch("[a-z]\\w+\\d{3}"));
+  }
+
   // Statements
 
   @Test
@@ -344,18 +352,4 @@ void testCountRows() {
 
     assertEquals(expected, sqlBuilder.countRows(getTableA()));
   }
-
-  @Test
-  void testRegexpMatch() {
-    assertEquals("REGEXP test", sqlBuilder.regexpMatch("test"));
-
-    // Test pattern with regex special characters
-    assertEquals("REGEXP \\d", sqlBuilder.regexpMatch("\\d"));
-
-    // Test empty string
-    assertEquals("REGEXP ", sqlBuilder.regexpMatch(""));
-
-    // Test complex regex pattern
-    assertEquals("REGEXP [a-z]\\w+\\d{3}", sqlBuilder.regexpMatch("[a-z]\\w+\\d{3}"));
-  }
 }

dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/db/sql/PostgreSqlBuilderTest.java

@@ -217,6 +217,15 @@ void testDifferenceInSeconds() {
             sqlBuilder.quote("a", "startdate"), sqlBuilder.quote("b", "enddate")));
   }
 
+  @Test
+  void testRegexpMatch() {
+    assertEquals("~* test", sqlBuilder.regexpMatch("test"));
+    assertEquals("~* ", sqlBuilder.regexpMatch(""));
+    assertEquals("~* null", sqlBuilder.regexpMatch(null));
+    assertEquals("~* .*[a-z]\\d+", sqlBuilder.regexpMatch(".*[a-z]\\d+"));
+    assertEquals("~*  ", sqlBuilder.regexpMatch(" "));
+  }
+
   // Statements
 
   @Test
@@ -429,13 +438,4 @@ void testCreateIndexWithDescNullsLast() {
     // then
     assertEquals(expected, createIndexStmt);
   }
-
-  @Test
-  void testRegexpMatch() {
-    assertEquals("~* test", sqlBuilder.regexpMatch("test"));
-    assertEquals("~* ", sqlBuilder.regexpMatch(""));
-    assertEquals("~* null", sqlBuilder.regexpMatch(null));
-    assertEquals("~* .*[a-z]\\d+", sqlBuilder.regexpMatch(".*[a-z]\\d+"));
-    assertEquals("~*  ", sqlBuilder.regexpMatch(" "));
-  }
 }