Skip to content
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.

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

fix: support parenthesis in {oj ...} JDBC escape syntax #865 #1204

Merged
merged 15 commits into from Jun 4, 2018
Merged
Diff settings

Always

Just for now

Revert "removed underscores from variable-names"

This reverts commit 34b0f1e.
  • Loading branch information...
AlBundy33 committed Jun 4, 2018
commit 0960b03f71de1f9117ad29482124ff965adaf27a
@@ -130,31 +130,31 @@ public void testOuterJoinSyntaxWithMultipleJoinsAndWithOj3() throws Exception {
* @throws Exception on error
*/
private void testOuterJoinSyntax(final String theQuery, List<String> theExpectedColumns) throws Exception {
final Statement st = connection.createStatement();
final Statement _st = connection.createStatement();

try {
final ResultSet rs = st.executeQuery(theQuery);
final ResultSet _rs = _st.executeQuery(theQuery);

try {
final ResultSetMetaData md = rs.getMetaData();
Assert.assertEquals(theExpectedColumns.size(), md.getColumnCount());
for (int i = 0; i < md.getColumnCount(); i++) {
Assert.assertTrue(theExpectedColumns.contains(md.getColumnLabel(i + 1)));
final ResultSetMetaData _md = _rs.getMetaData();
Assert.assertEquals(theExpectedColumns.size(), _md.getColumnCount());
for (int _i = 0; _i < _md.getColumnCount(); _i++) {
Assert.assertTrue(theExpectedColumns.contains(_md.getColumnLabel(_i + 1)));
}

int count = 0;
while (rs.next()) {
for (final String label : theExpectedColumns) {
rs.getObject(label); // just try to get the values without check
int _count = 0;
while (_rs.next()) {
for (final String _label : theExpectedColumns) {
_rs.getObject(_label); // just try to get the values without check
}
count++;
_count++;
}
Assert.assertEquals(count, 2);
Assert.assertEquals(_count, 2);
} finally {
rs.close();
_rs.close();
}
} finally {
st.close();
_st.close();
}
}

ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.