github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#800] Add support for Sybase Adaptive Server Enterprise - fixed some integration tests

Browse Source
This commit is contained in:
Lukas Eder 2011-09-06 21:02:02 +00:00
parent 6e9b555944
commit 02a4ace239
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
jOOQ/src/main/java/org/jooq/impl/Join.java
View File

@ -47,6 +47,7 @@ import org.jooq.Field;
import org.jooq.JoinType;
import org.jooq.QueryPart;
import org.jooq.RenderContext;
import org.jooq.SQLDialect;
import org.jooq.Table;
import org.jooq.TableLike;
@ -99,25 +100,30 @@ class Join extends AbstractQueryPart {
}
}
public final Condition getCondition() {
final Condition getCondition() {
return condition.getWhere();
}
public final Table<?> getTable() {
final Table<?> getTable() {
return table.asTable();
}
public final JoinType getType() {
return type;
final JoinType getType(RenderContext context) {
if (context.getDialect() == SQLDialect.ASE && type == JoinType.CROSS_JOIN) {
return JoinType.JOIN;
}
else {
return type;
}
}
@Override
public final void toSQL(RenderContext context) {
context.sql(getType().toSQL());
context.sql(getType(context).toSQL());
context.sql(" ");
context.sql(getTable());
switch (getType()) {
switch (getType(context)) {
// CROSS JOIN does not have any additional clauses
case CROSS_JOIN:
@ -130,20 +136,23 @@ class Join extends AbstractQueryPart {
// Regular JOINs
default: {
if (usingSyntax) {
context.sql(" using (");
using.toSQLNames(context);
context.sql(")");
}
else {
context.sql(" on ").sql(getCondition());
}
toSQL0(context);
break;
}
}
}
private void toSQL0(RenderContext context) {
if (usingSyntax) {
context.sql(" using (");
using.toSQLNames(context);
context.sql(")");
}
else {
context.sql(" on ").sql(getCondition());
}
}
@Override
public final boolean declaresTables() {
return true;

4
jOOQ/src/main/java/org/jooq/impl/SelectImpl.java
View File

@ -571,8 +571,8 @@ class SelectImpl extends AbstractDelegatingSelect<Record> implements
return simpleJoin0(table, JoinType.NATURAL_RIGHT_OUTER_JOIN);
}
private final SelectImpl simpleJoin0(TableLike<?> table, JoinType naturalJoinType) {
getQuery().addJoin(table, naturalJoinType);
private final SelectImpl simpleJoin0(TableLike<?> table, JoinType type) {
getQuery().addJoin(table, type);
joinTable = null;
joinType = null;
return this;