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

[#2665] Removed DUMMY clause

Browse Source
This commit is contained in:
Lukas Eder 2013-08-13 11:24:58 +02:00
parent d0a9d76a05
commit ef08665ab5
15 changed files with 12 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
jOOQ/src/main/java/org/jooq/Clause.java
View File

@ -36,25 +36,10 @@
package org.jooq;
/**
* TODO [#2667]
* A listing of clauses that emit events {@link VisitListener}.
*/
public enum Clause {
/**
* A placeholder clause for cases where the behaviour was not yet specified.
* This will not go public, and is meant to be a placeholder during
* development.
*/
@Deprecated
DUMMY,
// -------------------------------------------------------------------------
// Clauses used in a any type of statement to model package references
// -------------------------------------------------------------------------
PACKAGE,
PACKAGE_REFERENCE,
// -------------------------------------------------------------------------
// Clauses used in a any type of statement to model catalog references
// -------------------------------------------------------------------------
@ -130,8 +115,6 @@ public enum Clause {
* </ul>
*/
TABLE_VALUES,
TABLE_FLASHBACK,
TABLE_PIVOT,
// -------------------------------------------------------------------------
// Clauses used in a any type of statement to model column references
@ -166,6 +149,7 @@ public enum Clause {
FIELD_VALUE,
FIELD_CASE,
FIELD_ROW,
FIELD_FUNCTION,
// -------------------------------------------------------------------------
// Clauses used in a any type of statement to model condition references

5
jOOQ/src/main/java/org/jooq/impl/AbstractContext.java
View File

@ -35,7 +35,6 @@
*/
package org.jooq.impl;
import static org.jooq.Clause.DUMMY;
import static org.jooq.impl.Utils.DATA_OMIT_CLAUSE_EVENT_EMISSION;
import java.util.ArrayDeque;
@ -172,7 +171,7 @@ abstract class AbstractContext<C extends Context<C>> implements Context<C> {
@Override
public final C start(Clause clause) {
if (clause != null && clause != DUMMY) {
if (clause != null) {
visitClauses.addLast(clause);
for (VisitListener listener : visitListeners) {
@ -185,7 +184,7 @@ abstract class AbstractContext<C extends Context<C>> implements Context<C> {
@Override
public final C end(Clause clause) {
if (clause != null && clause != DUMMY) {
if (clause != null) {
for (VisitListener listener : visitListeners) {
listener.clauseEnd(visitContext);
}

6
jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java
View File

@ -35,7 +35,8 @@
*/
package org.jooq.impl;
import static org.jooq.Clause.DUMMY;
import static org.jooq.Clause.FIELD;
import static org.jooq.Clause.FIELD_FUNCTION;
import static org.jooq.SQLDialect.POSTGRES;
import static org.jooq.SQLDialect.SQLSERVER;
import static org.jooq.impl.DSL.function;
@ -90,6 +91,7 @@ public abstract class AbstractRoutine<T> extends AbstractQueryPart implements Ro
* Generated UID
*/
private static final long serialVersionUID = 6330037113167106443L;
private static final Clause[] CLAUSES = { FIELD, FIELD_FUNCTION };
// ------------------------------------------------------------------------
// Meta-data attributes (the same for every call)
@ -295,7 +297,7 @@ public abstract class AbstractRoutine<T> extends AbstractQueryPart implements Ro
@Override
public final Clause[] clauses(Context<?> ctx) {
return new Clause[] { DUMMY };
return CLAUSES;
}
@Override

13
jOOQ/src/main/java/org/jooq/impl/ArrayTable.java
View File

@ -35,7 +35,6 @@
*/
package org.jooq.impl;
import static org.jooq.Clause.DUMMY;
import static org.jooq.impl.DSL.fieldByName;
import java.util.ArrayList;
@ -43,9 +42,7 @@ import java.util.List;
import org.jooq.ArrayRecord;
import org.jooq.BindContext;
import org.jooq.Clause;
import org.jooq.Configuration;
import org.jooq.Context;
import org.jooq.Field;
import org.jooq.Param;
import org.jooq.Record;
@ -176,11 +173,6 @@ class ArrayTable extends AbstractTable<Record> {
ctx.visit(table(ctx.configuration()));
}
@Override
public final Clause[] clauses(Context<?> ctx) {
return new Clause[] { DUMMY };
}
private final Table<Record> table(Configuration configuration) {
switch (configuration.dialect().family()) {
case ORACLE: {
@ -301,11 +293,6 @@ class ArrayTable extends AbstractTable<Record> {
context.visit(array);
}
@Override
public final Clause[] clauses(Context<?> ctx) {
return new Clause[] { DUMMY };
}
@Override
final Fields<Record> fields0() {
return ArrayTable.this.fields0();

8
jOOQ/src/main/java/org/jooq/impl/ArrayTableSimulation.java
View File

@ -35,16 +35,13 @@
*/
package org.jooq.impl;
import static org.jooq.Clause.DUMMY;
import static org.jooq.impl.DSL.falseCondition;
import static org.jooq.impl.DSL.fieldByName;
import static org.jooq.impl.DSL.one;
import static org.jooq.impl.DSL.using;
import org.jooq.BindContext;
import org.jooq.Clause;
import org.jooq.Configuration;
import org.jooq.Context;
import org.jooq.Field;
import org.jooq.Record;
import org.jooq.RenderContext;
@ -129,11 +126,6 @@ class ArrayTableSimulation extends AbstractTable<Record> {
ctx.visit(table(ctx.configuration()));
}
@Override
public final Clause[] clauses(Context<?> ctx) {
return new Clause[] { DUMMY };
}
@Override
final Fields<Record> fields0() {
return field;

8
jOOQ/src/main/java/org/jooq/impl/FieldCondition.java
View File

@ -35,14 +35,11 @@
*/
package org.jooq.impl;
import static org.jooq.Clause.DUMMY;
import static org.jooq.impl.DSL.condition;
import static org.jooq.impl.DSL.inline;
import org.jooq.BindContext;
import org.jooq.Clause;
import org.jooq.Configuration;
import org.jooq.Context;
import org.jooq.Field;
import org.jooq.QueryPartInternal;
import org.jooq.RenderContext;
@ -72,11 +69,6 @@ class FieldCondition extends AbstractCondition {
delegate(ctx.configuration()).bind(ctx);
}
@Override
public final Clause[] clauses(Context<?> ctx) {
return new Clause[] { DUMMY };
}
private final QueryPartInternal delegate(Configuration configuration) {
switch (configuration.dialect().family()) {

8
jOOQ/src/main/java/org/jooq/impl/FlashbackTable.java
View File

@ -35,13 +35,10 @@
*/
package org.jooq.impl;
import static org.jooq.Clause.DUMMY;
import static org.jooq.impl.DSL.keyword;
import static org.jooq.impl.DSL.val;
import org.jooq.BindContext;
import org.jooq.Clause;
import org.jooq.Context;
import org.jooq.Field;
import org.jooq.QueryPart;
import org.jooq.Record;
@ -146,11 +143,6 @@ implements VersionsBetweenAndStep<R, T> {
}
}
@Override
public final Clause[] clauses(Context<?> ctx) {
return new Clause[] { DUMMY };
}
@Override
public final boolean declaresTables() {
return true;

9
jOOQ/src/main/java/org/jooq/impl/FunctionTable.java
View File

@ -35,11 +35,7 @@
*/
package org.jooq.impl;
import static org.jooq.Clause.DUMMY;
import org.jooq.BindContext;
import org.jooq.Clause;
import org.jooq.Context;
import org.jooq.Field;
import org.jooq.Record;
import org.jooq.RenderContext;
@ -105,11 +101,6 @@ class FunctionTable<R extends Record> extends AbstractTable<R> {
}
}
@Override
public final Clause[] clauses(Context<?> ctx) {
return new Clause[] { DUMMY };
}
@Override
final Fields<R> fields0() {
return new Fields<R>();

3
jOOQ/src/main/java/org/jooq/impl/Limit.java
View File

@ -35,7 +35,6 @@
*/
package org.jooq.impl;
import static org.jooq.Clause.DUMMY;
import static org.jooq.RenderContext.CastMode.NEVER;
import static org.jooq.conf.ParamType.INLINED;
import static org.jooq.impl.DSL.inline;
@ -324,7 +323,7 @@ class Limit extends AbstractQueryPart {
@Override
public final Clause[] clauses(Context<?> ctx) {
return new Clause[] { DUMMY };
return null;
}
/**

6
jOOQ/src/main/java/org/jooq/impl/PackageImpl.java
View File

@ -35,9 +35,6 @@
*/
package org.jooq.impl;
import static org.jooq.Clause.PACKAGE;
import static org.jooq.Clause.PACKAGE_REFERENCE;
import org.jooq.BindContext;
import org.jooq.Clause;
import org.jooq.Context;
@ -63,7 +60,6 @@ public class PackageImpl extends AbstractQueryPart implements Package {
* Generated UID
*/
private static final long serialVersionUID = 7466890004995197675L;
private static final Clause[] CLAUSES = { PACKAGE, PACKAGE_REFERENCE };
private final Schema schema;
private final String name;
@ -93,7 +89,7 @@ public class PackageImpl extends AbstractQueryPart implements Package {
@Override
public final Clause[] clauses(Context<?> ctx) {
return CLAUSES;
return null;
}
// ------------------------------------------------------------------------

18
jOOQ/src/main/java/org/jooq/impl/Pivot.java
View File

@ -35,7 +35,6 @@
*/
package org.jooq.impl;
import static org.jooq.Clause.DUMMY;
import static org.jooq.conf.ParamType.INLINED;
import static org.jooq.impl.DSL.trueCondition;
import static org.jooq.impl.DSL.using;
@ -45,10 +44,8 @@ import java.util.Collection;
import java.util.List;
import org.jooq.BindContext;
import org.jooq.Clause;
import org.jooq.Condition;
import org.jooq.Configuration;
import org.jooq.Context;
import org.jooq.Field;
import org.jooq.PivotForStep;
import org.jooq.PivotInStep;
@ -148,11 +145,6 @@ implements
.declareTables(false);
}
@Override
public final Clause[] clauses(Context<?> ctx) {
return new Clause[] { DUMMY };
}
private Table<Record> select(Configuration configuration) {
List<Field<?>> groupingFields = new ArrayList<Field<?>>();
List<Field<?>> aliasedGroupingFields = new ArrayList<Field<?>>();
@ -269,11 +261,6 @@ implements
.visit(table)
.declareTables(declareTables);
}
@Override
public final Clause[] clauses(Context<?> ctx) {
return new Clause[] { DUMMY };
}
}
/**
@ -330,11 +317,6 @@ implements
context.visit(pivot(context.configuration()));
}
@Override
public final Clause[] clauses(Context<?> ctx) {
return new Clause[] { DUMMY };
}
@Override
public final Table<Record> as(String alias) {
return new TableAlias<Record>(this, alias, true);

3
jOOQ/src/main/java/org/jooq/impl/SortFieldImpl.java
View File

@ -35,7 +35,6 @@
*/
package org.jooq.impl;
import static org.jooq.Clause.DUMMY;
import static org.jooq.impl.DSL.nvl2;
import static org.jooq.impl.DSL.one;
import static org.jooq.impl.DSL.zero;
@ -168,6 +167,6 @@ class SortFieldImpl<T> extends AbstractQueryPart implements SortField<T> {
@Override
public final Clause[] clauses(Context<?> ctx) {
return new Clause[] { DUMMY };
return null;
}
}

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

@ -35,8 +35,6 @@
*/
package org.jooq.impl;
import static org.jooq.Clause.DUMMY;
import org.jooq.BindContext;
import org.jooq.Clause;
import org.jooq.Context;
@ -142,7 +140,7 @@ public class UDTImpl<R extends UDTRecord<R>> extends AbstractQueryPart implement
@Override
public final Clause[] clauses(Context<?> ctx) {
return new Clause[] { DUMMY };
return null;
}
/**

9
jOOQ/src/main/java/org/jooq/impl/WithTable.java
View File

@ -35,11 +35,7 @@
*/
package org.jooq.impl;
import static org.jooq.Clause.DUMMY;
import org.jooq.BindContext;
import org.jooq.Clause;
import org.jooq.Context;
import org.jooq.Record;
import org.jooq.RenderContext;
import org.jooq.Table;
@ -82,11 +78,6 @@ class WithTable<R extends Record> extends AbstractTable<R> {
context.visit(delegate);
}
@Override
public final Clause[] clauses(Context<?> ctx) {
return new Clause[] { DUMMY };
}
@Override
public final Class<? extends R> getRecordType() {
return delegate.getRecordType();

6
jOOQ/src/test/java/org/jooq/test/VisitContextTest.java
View File

@ -175,9 +175,6 @@ public class VisitContextTest extends AbstractTest {
@Override
public void clauseStart(VisitContext context) {
if (context.clause() == Clause.DUMMY)
return;
clause = context.clause();
indent += 2;
System.out.println(leftPad("+-", indent, "| ") + context.clause());
@ -185,9 +182,6 @@ public class VisitContextTest extends AbstractTest {
@Override
public void clauseEnd(VisitContext context) {
if (context.clause() == Clause.DUMMY)
return;
if (clause == SELECT_WHERE) {
if (context.renderContext() != null) {
context.renderContext()