fix for limit

TheHortonMachine · Dec 22, 2023 · 64ae05a · 64ae05a
1 parent 98ea123
commit 64ae05a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/dbs/src/main/java/org/hortonmachine/dbs/postgis/PostgisDb.java b/dbs/src/main/java/org/hortonmachine/dbs/postgis/PostgisDb.java
@@ -353,7 +353,11 @@ public QueryResult getTableRecordsMapFromRawSql( String sql, int limit ) throws
         IGeometryParser gp = getType().getGeometryParser();
         return execOnConnection(connection -> {
             QueryResult queryResult = new QueryResult();
-            String _sql = sql;
+            String _sql = sql.trim();
+            if(_sql.endsWith(";")) {
+                int index = _sql.lastIndexOf(';');
+                _sql = _sql.substring(0, index);
+            }
             String lowerSql = _sql.trim().toLowerCase();
             if (limit > 0 && lowerSql.startsWith("select") && !lowerSql.contains("limit")) {
                 _sql = _sql + " limit " + limit;

diff --git a/hmachine/src/test/java/org/hortonmachine/hmachine/models/hm/TestTca.java b/hmachine/src/test/java/org/hortonmachine/hmachine/models/hm/TestTca.java
@@ -17,10 +17,9 @@
  */
 package org.hortonmachine.hmachine.models.hm;
 
-import java.util.HashMap;
-import org.hortonmachine.gears.utils.RegionMap;
 import org.geotools.coverage.grid.GridCoverage2D;
 import org.hortonmachine.gears.utils.PrintUtilities;
+import org.hortonmachine.gears.utils.RegionMap;
 import org.hortonmachine.gears.utils.coverage.CoverageUtilities;
 import org.hortonmachine.hmachine.modules.geomorphology.tca.OmsTca;
 import org.hortonmachine.hmachine.utils.HMTestCase;