Merge 25.3 to develop

Author: labkey-chrisj

query/src/org/labkey/query/sql/Method.java

@@ -358,13 +358,13 @@ public MethodInfo getMethodInfo()
         labkeyMethod.put("rand", new JdbcMethod("rand", JdbcType.DOUBLE, 0, 1));
         labkeyMethod.put("repeat", new JdbcMethod("repeat", JdbcType.VARCHAR, 2, 2));
         labkeyMethod.put("round", new Method("round", JdbcType.DOUBLE, 1, 2)
-            {
-                @Override
-                public MethodInfo getMethodInfo()
-                {
-                    return new RoundInfo();
-                }
-            });
+			{
+				@Override
+				public MethodInfo getMethodInfo()
+				{
+					return new RoundInfo();
+				}
+			});
         labkeyMethod.put("rtrim", new JdbcMethod("rtrim", JdbcType.VARCHAR, 1, 1));
         labkeyMethod.put("second", new JdbcMethod("second", JdbcType.INTEGER, 1, 1));
         labkeyMethod.put("sign", new JdbcMethod("sign", JdbcType.DOUBLE, 1, 1));
@@ -813,30 +813,43 @@ public SQLFragment getSQL(SqlDialect dialect, SQLFragment[] arguments)
                     return super.getSQL(dialect, new SQLFragment[] {arguments[0]});
             }
 
-            int i = Integer.MIN_VALUE;
-            try
+            if (supportsRoundDouble)
             {
-                i = Integer.parseInt(arguments[1].getSQL());
+                return super.getSQL(dialect, arguments);
             }
-            catch (NumberFormatException x)
+            else if (dialect.isPostgreSQL())
             {
-                /* fall through */
+                // Postgres ROUND() requires NUMERIC argument and will error with DOUBLE
+                // This CAST works because in postgres NUMERIC(unspecified) => up to 131072 digits before the decimal point; up to 16383 digits after the decimal point
+                // This is not SQL standard behavior
+                SQLFragment numeric = new SQLFragment();
+                numeric.append("CAST((").append(arguments[0]).append(") AS NUMERIC)");
+                return super.getSQL(dialect, new SQLFragment[] {numeric, arguments[1]});
             }
-
-            if (supportsRoundDouble || i == Integer.MIN_VALUE)
-                return super.getSQL(dialect, arguments);
-
-            // fall back, only supports simple integer
-            SQLFragment scaled = new SQLFragment();
-            scaled.append("(");
-            scaled.append(arguments[0]);
-            scaled.append(")*").appendValue(Math.pow(10,i));
-            SQLFragment ret = super.getSQL(dialect, new SQLFragment[] {scaled});
-            ret.append("/");
-            ret.appendValue(Math.pow(10,i));
-            return ret;
-        }
-    }
+            else
+            {
+                // NOTE: At the moment there appear to be no Dialects that use this code path (but it still works).
+                // Leave for completeness?
+                int n = Integer.MIN_VALUE;
+                try
+                {
+                    n = Integer.parseInt(arguments[1].getSQL());
+                }
+                catch (NumberFormatException x)
+                {
+                    /* fall through */
+                }
+                // If 2nd argument isn't a constant, just do the default thing.  This may work or it may cause a server parse error.
+                if (n == Integer.MIN_VALUE)
+                    return super.getSQL(dialect, arguments);
+                var scale = Math.pow(10,n);
+                SQLFragment scaled = new SQLFragment().append("(").append(arguments[0]).append(")*").appendValue(scale);
+                SQLFragment ret = super.getSQL(dialect, new SQLFragment[]{scaled});
+                ret.append("/").appendValue(scale);
+                return ret;
+            }
+		}
+	}
 
 
     static class AgeMethodInfo extends AbstractMethodInfo