[bugfix] Function signatures used xs:long for SQL handles, but this was not enforced in eXist-db, and so accidentally internally xs:integer was being used. This has now been corrected

Author: adamretter

extensions/modules/sql/src/main/java/org/exist/xquery/modules/sql/ExecuteFunction.java

@@ -106,7 +106,7 @@ public class ExecuteFunction extends BasicFunction {
                     ),
                     arity(
                             FS_PARAM_CONNECTION_HANDLE,
-                            param("statement-handle", Type.INTEGER, "The prepared statement handle"),
+                            param("statement-handle", Type.LONG, "The prepared statement handle"),
                             optParam("parameters", Type.ELEMENT, "Parameters for the prepared statement. e.g. <sql:parameters><sql:param sql:type=\"long\">1234</sql:param><sql:param sql:type=\"varchar\"><sql:null/></sql:param></sql:parameters>"),
                             FS_PARAM_MAKE_NODE_FROM_COLUMN_NAME
                     )

extensions/modules/sql/src/main/java/org/exist/xquery/modules/sql/GetConnectionFunction.java

@@ -130,7 +130,7 @@ public Sequence eval(final Sequence[] args, final Sequence contextSequence) thro
         }
 
         // store the Connection and return the uid handle of the Connection
-        return new IntegerValue(SQLModule.storeConnection(context, connection));
+        return new IntegerValue(SQLModule.storeConnection(context, connection), Type.LONG);
     }
 
     private Connection getConnection(final Sequence[] args) throws XPathException {

extensions/modules/sql/src/main/java/org/exist/xquery/modules/sql/GetJNDIConnectionFunction.java

@@ -126,7 +126,7 @@ public Sequence eval(Sequence[] args, Sequence contextSequence) throws XPathExce
             }
 
             // store the connection and return the uid handle of the connection
-            return (new IntegerValue(SQLModule.storeConnection(context, con)));
+            return (new IntegerValue(SQLModule.storeConnection(context, con), Type.LONG));
         } catch (Exception e) {
             throw (new XPathException(this, e.getMessage()));
         }

extensions/modules/sql/src/main/java/org/exist/xquery/modules/sql/PrepareFunction.java

@@ -112,7 +112,7 @@ public Sequence eval(Sequence[] args, Sequence contextSequence) throws XPathExce
             stmt = con.prepareStatement(sql);
 
             // store the PreparedStatement and return the uid handle of the PreparedStatement
-            return (new IntegerValue(SQLModule.storePreparedStatement(context, new PreparedStatementWithSQL(sql, stmt))));
+            return (new IntegerValue(SQLModule.storePreparedStatement(context, new PreparedStatementWithSQL(sql, stmt)), Type.LONG));
         } catch (SQLException sqle) {
             LOG.error("sql:prepare() Caught SQLException \"{}\" for SQL: \"{}\"", sqle.getMessage(), sql, sqle);