Skip to content

Fixing all JPA TCK 3.1 stored procedure test cases #515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
javasmithy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixing all JPA TCK 3.1 stored procedure test cases #515

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
146 changes: 119 additions & 27 deletions src/main/java/org/datanucleus/store/rdbms/query/StoredProcedureQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Time;
import java.sql.Timestamp;
import java.sql.Types;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
Expand All @@ -37,12 +40,12 @@
import org.datanucleus.store.StoreManager;
import org.datanucleus.store.connection.ManagedConnection;
import org.datanucleus.store.connection.ManagedConnectionResourceListener;
import org.datanucleus.store.rdbms.adapter.DatastoreAdapter;
import org.datanucleus.store.query.AbstractStoredProcedureQuery;
import org.datanucleus.store.query.NoQueryResultsException;
import org.datanucleus.store.query.QueryNotUniqueException;
import org.datanucleus.store.query.QueryResult;
import org.datanucleus.store.rdbms.RDBMSStoreManager;
import org.datanucleus.store.rdbms.adapter.DatastoreAdapter;
import org.datanucleus.util.Localiser;
import org.datanucleus.util.NucleusLogger;

Expand Down Expand Up @@ -185,7 +188,7 @@ protected Object performExecute(Map parameters)
if (paramIter.hasNext())
{
stmtStr.append(",");
}
}
}
}
stmtStr.append(")");
Expand Down Expand Up @@ -279,11 +282,11 @@ else if (param.getType() == Date.class)
{
if (param.getName() != null)
{
stmt.setDate(param.getName(), (java.sql.Date) parameters.get(param.getName()));
stmt.setDate(param.getName(), new java.sql.Date(((Date) parameters.get(param.getName())).getTime()));
}
else
{
stmt.setDate(param.getPosition(), (java.sql.Date) parameters.get(param.getPosition()));
stmt.setDate(param.getPosition(), new java.sql.Date(((Date) parameters.get(param.getPosition())).getTime()));
}
}
else if (param.getType() == BigInteger.class)
Expand All @@ -308,8 +311,48 @@ else if (param.getType() == BigDecimal.class)
stmt.setDouble(param.getPosition(), ((BigDecimal) parameters.get(param.getPosition())).doubleValue());
}
}
else if (param.getType() == Calendar.class)
{
Object paramValue = (param.getName() != null)
? parameters.get(param.getName())
: parameters.get(param.getPosition());
if (paramValue instanceof Date)
{
if (param.getName() != null)
{
stmt.setDate(param.getName(), new java.sql.Date(((Date) paramValue).getTime()));
}
else
{
stmt.setDate(param.getPosition(), new java.sql.Date(((Date) paramValue).getTime()));
}
}
else if (paramValue instanceof Time)
{
if (param.getName() != null)
{
stmt.setTime(param.getName(), (Time) paramValue);
}
else
{
stmt.setTime(param.getPosition(), (Time) paramValue);
}
}
else if (paramValue instanceof Timestamp)
{
if (param.getName() != null)
{
stmt.setTimestamp(param.getName(), (Timestamp) paramValue);
}
else
{
stmt.setTimestamp(param.getPosition(), (Timestamp) paramValue);
}
}
}
else
{

throw new NucleusException("Dont currently support stored proc input params of type " + param.getType());
}
}
Expand Down Expand Up @@ -429,6 +472,17 @@ else if (param.getType() == BigDecimal.class)
stmt.registerOutParameter(param.getPosition(), Types.DOUBLE);
}
}
else if (param.getMode().equals(StoredProcQueryParameterMode.REF_CURSOR))
{
if (param.getName() != null)
{
stmt.registerOutParameter(param.getName(), Types.REF_CURSOR);
}
else
{
stmt.registerOutParameter(param.getPosition(), Types.REF_CURSOR);
}
}
else
{
throw new NucleusException("Dont currently support stored proc output params of type " + param.getType());
Expand Down Expand Up @@ -566,6 +620,18 @@ else if (param.getType() == BigDecimal.class)
value = stmt.getDouble(param.getPosition());
}
}
else if (param.getMode().equals(StoredProcQueryParameterMode.REF_CURSOR))
{
if (param.getName() != null)
{
value = stmt.getObject(param.getName());
}
else
{
value = stmt.getObject(param.getPosition());
}
hasResultSet = true;
}
else
{
throw new NucleusUserException("Dont currently support output parameters of type=" + param.getType());
Expand Down Expand Up @@ -641,7 +707,7 @@ public int getUpdateCount()
mconn.release();
}
}

@Override
public Object getNextResults()
{
Expand All @@ -653,32 +719,33 @@ public Object getNextResults()
ManagedConnection mconn = storeMgr.getConnectionManager().getConnection(ec);
try
{
resultSetNumber++;
ResultSet rs = stmt.getResultSet();
QueryResult qr = getResultsForResultSet((RDBMSStoreManager)storeMgr, rs, mconn);
if (shouldReturnSingleRow())
if (outputParamValues != null)
{
// Single row only needed so just take first row
try
for (Object key : outputParamValues.keySet())
{
if (qr == null || qr.size() == 0)
{
throw new NoQueryResultsException("No query results were returned");
}

Iterator qrIter = qr.iterator();
Object firstRow = qrIter.next();
if (qrIter.hasNext())
Object value = outputParamValues.get(key);
if (value instanceof ResultSet)
{
throw new QueryNotUniqueException();
ResultSet rs = (ResultSet) value;
QueryResult qr = getResultsForResultSet((RDBMSStoreManager)storeMgr, rs, mconn);
outputParamValues.remove(key);
resultSetNumber++;
if (shouldReturnSingleRow())
{
return getUniqueResult(qr);
}
// Apply range?
return qr;
}
return firstRow;
}
finally
{
// can close results right now because we don't return it
close(qr);
}
}
}

ResultSet rs = stmt.getResultSet();
QueryResult qr = getResultsForResultSet((RDBMSStoreManager)storeMgr, rs, mconn);
resultSetNumber++;
if (shouldReturnSingleRow())
{
return getUniqueResult(qr);
}

// Apply range?
Expand All @@ -694,6 +761,31 @@ public Object getNextResults()
}
}

private Object getUniqueResult(QueryResult qr)
{
// Single row only needed so just take first row
try
{
if (qr == null || qr.size() == 0)
{
throw new NoQueryResultsException("No query results were returned");
}

Iterator qrIter = qr.iterator();
Object firstRow = qrIter.next();
if (qrIter.hasNext())
{
throw new QueryNotUniqueException();
}
return firstRow;
}
finally
{
// can close results right now because we don't return it
close(qr);
}
}

protected QueryResult getResultsForResultSet(RDBMSStoreManager storeMgr, ResultSet rs, ManagedConnection mconn)
throws SQLException
{
Expand Down