Jihad complete, operators hidden behind the impl veil.
This commit is contained in:
@@ -39,8 +39,8 @@ import com.samskivert.depot.expression.SQLExpression;
|
||||
import com.samskivert.depot.impl.DepotUtil;
|
||||
import com.samskivert.depot.impl.ExpressionVisitor;
|
||||
import com.samskivert.depot.impl.expression.LiteralExp;
|
||||
import com.samskivert.depot.operator.In;
|
||||
import com.samskivert.depot.operator.Or;
|
||||
import com.samskivert.depot.impl.operator.In;
|
||||
import com.samskivert.depot.impl.operator.Or;
|
||||
|
||||
/**
|
||||
* Contains a set of primary keys that match a set of persistent records. This is used internally
|
||||
|
||||
@@ -25,13 +25,13 @@ import java.util.Collection;
|
||||
import com.samskivert.depot.clause.SelectClause;
|
||||
import com.samskivert.depot.expression.FluentExp;
|
||||
import com.samskivert.depot.expression.SQLExpression;
|
||||
import com.samskivert.depot.operator.Add;
|
||||
import com.samskivert.depot.operator.And;
|
||||
import com.samskivert.depot.operator.Exists;
|
||||
import com.samskivert.depot.operator.Like;
|
||||
import com.samskivert.depot.operator.Mul;
|
||||
import com.samskivert.depot.operator.Not;
|
||||
import com.samskivert.depot.operator.Or;
|
||||
import com.samskivert.depot.impl.operator.Add;
|
||||
import com.samskivert.depot.impl.operator.And;
|
||||
import com.samskivert.depot.impl.operator.Exists;
|
||||
import com.samskivert.depot.impl.operator.Like;
|
||||
import com.samskivert.depot.impl.operator.Mul;
|
||||
import com.samskivert.depot.impl.operator.Not;
|
||||
import com.samskivert.depot.impl.operator.Or;
|
||||
|
||||
/**
|
||||
* Provides static methods for operator construction that don't fit nicely into the fluent style.
|
||||
|
||||
@@ -27,7 +27,7 @@ import com.samskivert.depot.expression.ColumnExp;
|
||||
import com.samskivert.depot.expression.SQLExpression;
|
||||
import com.samskivert.depot.impl.DepotUtil;
|
||||
import com.samskivert.depot.impl.ExpressionVisitor;
|
||||
import com.samskivert.depot.operator.Equals;
|
||||
import com.samskivert.depot.impl.operator.Equals;
|
||||
|
||||
/**
|
||||
* Represents a JOIN.
|
||||
|
||||
@@ -27,9 +27,9 @@ import com.samskivert.depot.expression.ColumnExp;
|
||||
import com.samskivert.depot.expression.SQLExpression;
|
||||
import com.samskivert.depot.impl.ExpressionVisitor;
|
||||
import com.samskivert.depot.impl.expression.ValueExp;
|
||||
import com.samskivert.depot.operator.And;
|
||||
import com.samskivert.depot.operator.Equals;
|
||||
import com.samskivert.depot.operator.IsNull;
|
||||
import com.samskivert.depot.impl.operator.And;
|
||||
import com.samskivert.depot.impl.operator.Equals;
|
||||
import com.samskivert.depot.impl.operator.IsNull;
|
||||
|
||||
/**
|
||||
* Represents a where clause: the condition can be any comparison operator or logical combination
|
||||
|
||||
@@ -25,9 +25,9 @@ import java.util.Collection;
|
||||
import com.samskivert.depot.PersistentRecord;
|
||||
import com.samskivert.depot.clause.Join;
|
||||
import com.samskivert.depot.impl.ExpressionVisitor;
|
||||
import com.samskivert.depot.operator.In;
|
||||
import com.samskivert.depot.operator.IsNull;
|
||||
import com.samskivert.depot.operator.Like;
|
||||
import com.samskivert.depot.impl.operator.In;
|
||||
import com.samskivert.depot.impl.operator.IsNull;
|
||||
import com.samskivert.depot.impl.operator.Like;
|
||||
|
||||
/**
|
||||
* An expression that unambiguously identifies a field of a class, e.g. GameRecord.itemId.
|
||||
|
||||
@@ -20,20 +20,20 @@
|
||||
|
||||
package com.samskivert.depot.expression;
|
||||
|
||||
import com.samskivert.depot.operator.Add;
|
||||
import com.samskivert.depot.operator.And;
|
||||
import com.samskivert.depot.operator.BitAnd;
|
||||
import com.samskivert.depot.operator.BitOr;
|
||||
import com.samskivert.depot.operator.Div;
|
||||
import com.samskivert.depot.operator.Equals;
|
||||
import com.samskivert.depot.operator.GreaterThan;
|
||||
import com.samskivert.depot.operator.GreaterThanEquals;
|
||||
import com.samskivert.depot.operator.LessThan;
|
||||
import com.samskivert.depot.operator.LessThanEquals;
|
||||
import com.samskivert.depot.operator.Mul;
|
||||
import com.samskivert.depot.operator.NotEquals;
|
||||
import com.samskivert.depot.operator.Or;
|
||||
import com.samskivert.depot.operator.Sub;
|
||||
import com.samskivert.depot.impl.operator.Add;
|
||||
import com.samskivert.depot.impl.operator.And;
|
||||
import com.samskivert.depot.impl.operator.BitAnd;
|
||||
import com.samskivert.depot.impl.operator.BitOr;
|
||||
import com.samskivert.depot.impl.operator.Div;
|
||||
import com.samskivert.depot.impl.operator.Equals;
|
||||
import com.samskivert.depot.impl.operator.GreaterThan;
|
||||
import com.samskivert.depot.impl.operator.GreaterThanEquals;
|
||||
import com.samskivert.depot.impl.operator.LessThan;
|
||||
import com.samskivert.depot.impl.operator.LessThanEquals;
|
||||
import com.samskivert.depot.impl.operator.Mul;
|
||||
import com.samskivert.depot.impl.operator.NotEquals;
|
||||
import com.samskivert.depot.impl.operator.Or;
|
||||
import com.samskivert.depot.impl.operator.Sub;
|
||||
|
||||
/**
|
||||
* A base class for {@link SQLExpression} implementations that provides a plethora of combinators
|
||||
|
||||
@@ -50,13 +50,7 @@ import com.samskivert.depot.clause.SelectClause;
|
||||
import com.samskivert.depot.clause.WhereClause;
|
||||
import com.samskivert.depot.expression.*;
|
||||
import com.samskivert.depot.operator.Case;
|
||||
import com.samskivert.depot.operator.Exists;
|
||||
import com.samskivert.depot.operator.FullText;
|
||||
import com.samskivert.depot.operator.In;
|
||||
import com.samskivert.depot.operator.IsNull;
|
||||
import com.samskivert.depot.operator.Not;
|
||||
import com.samskivert.depot.operator.SQLOperator.BinaryOperator;
|
||||
import com.samskivert.depot.operator.SQLOperator.MultiOperator;
|
||||
|
||||
import com.samskivert.depot.impl.clause.CreateIndexClause;
|
||||
import com.samskivert.depot.impl.clause.DeleteClause;
|
||||
@@ -97,6 +91,12 @@ import com.samskivert.depot.impl.expression.StringFun.Position;
|
||||
import com.samskivert.depot.impl.expression.StringFun.Substring;
|
||||
import com.samskivert.depot.impl.expression.StringFun.Trim;
|
||||
import com.samskivert.depot.impl.expression.StringFun.Upper;
|
||||
import com.samskivert.depot.impl.operator.Exists;
|
||||
import com.samskivert.depot.impl.operator.In;
|
||||
import com.samskivert.depot.impl.operator.IsNull;
|
||||
import com.samskivert.depot.impl.operator.Not;
|
||||
import com.samskivert.depot.impl.operator.SQLOperator.BinaryOperator;
|
||||
import com.samskivert.depot.impl.operator.SQLOperator.MultiOperator;
|
||||
|
||||
/**
|
||||
* Implements the base functionality of the SQL-building pass of {@link SQLBuilder}. Dialectal
|
||||
|
||||
@@ -41,13 +41,7 @@ import com.samskivert.depot.expression.SQLExpression.NoValue;
|
||||
|
||||
|
||||
import com.samskivert.depot.operator.Case;
|
||||
import com.samskivert.depot.operator.Exists;
|
||||
import com.samskivert.depot.operator.FullText;
|
||||
import com.samskivert.depot.operator.In;
|
||||
import com.samskivert.depot.operator.IsNull;
|
||||
import com.samskivert.depot.operator.Not;
|
||||
import com.samskivert.depot.operator.SQLOperator.BinaryOperator;
|
||||
import com.samskivert.depot.operator.SQLOperator.MultiOperator;
|
||||
|
||||
import com.samskivert.depot.impl.clause.CreateIndexClause;
|
||||
import com.samskivert.depot.impl.clause.DeleteClause;
|
||||
@@ -87,6 +81,12 @@ import com.samskivert.depot.impl.expression.StringFun.Position;
|
||||
import com.samskivert.depot.impl.expression.StringFun.Substring;
|
||||
import com.samskivert.depot.impl.expression.StringFun.Trim;
|
||||
import com.samskivert.depot.impl.expression.StringFun.Upper;
|
||||
import com.samskivert.depot.impl.operator.Exists;
|
||||
import com.samskivert.depot.impl.operator.In;
|
||||
import com.samskivert.depot.impl.operator.IsNull;
|
||||
import com.samskivert.depot.impl.operator.Not;
|
||||
import com.samskivert.depot.impl.operator.SQLOperator.BinaryOperator;
|
||||
import com.samskivert.depot.impl.operator.SQLOperator.MultiOperator;
|
||||
import com.samskivert.util.ArrayUtil;
|
||||
import com.samskivert.util.Tuple;
|
||||
|
||||
|
||||
@@ -35,13 +35,7 @@ import com.samskivert.depot.clause.WhereClause;
|
||||
|
||||
import com.samskivert.depot.expression.*;
|
||||
import com.samskivert.depot.operator.Case;
|
||||
import com.samskivert.depot.operator.Exists;
|
||||
import com.samskivert.depot.operator.FullText;
|
||||
import com.samskivert.depot.operator.In;
|
||||
import com.samskivert.depot.operator.IsNull;
|
||||
import com.samskivert.depot.operator.Not;
|
||||
import com.samskivert.depot.operator.SQLOperator.BinaryOperator;
|
||||
import com.samskivert.depot.operator.SQLOperator.MultiOperator;
|
||||
|
||||
import com.samskivert.depot.impl.clause.CreateIndexClause;
|
||||
import com.samskivert.depot.impl.clause.DeleteClause;
|
||||
@@ -81,6 +75,12 @@ import com.samskivert.depot.impl.expression.StringFun.Position;
|
||||
import com.samskivert.depot.impl.expression.StringFun.Substring;
|
||||
import com.samskivert.depot.impl.expression.StringFun.Trim;
|
||||
import com.samskivert.depot.impl.expression.StringFun.Upper;
|
||||
import com.samskivert.depot.impl.operator.Exists;
|
||||
import com.samskivert.depot.impl.operator.In;
|
||||
import com.samskivert.depot.impl.operator.IsNull;
|
||||
import com.samskivert.depot.impl.operator.Not;
|
||||
import com.samskivert.depot.impl.operator.SQLOperator.BinaryOperator;
|
||||
import com.samskivert.depot.impl.operator.SQLOperator.MultiOperator;
|
||||
|
||||
/**
|
||||
* Enumerates visitation methods for every possible SQL expression type.
|
||||
|
||||
@@ -50,7 +50,7 @@ import com.samskivert.depot.XList;
|
||||
import com.samskivert.depot.clause.FieldOverride;
|
||||
import com.samskivert.depot.clause.QueryClause;
|
||||
import com.samskivert.depot.clause.SelectClause;
|
||||
import com.samskivert.depot.operator.In;
|
||||
import com.samskivert.depot.impl.operator.In;
|
||||
|
||||
import static com.samskivert.depot.Log.log;
|
||||
|
||||
|
||||
@@ -44,18 +44,18 @@ import com.samskivert.depot.annotation.FullTextIndex;
|
||||
import com.samskivert.depot.annotation.GeneratedValue;
|
||||
import com.samskivert.depot.clause.OrderBy.Order;
|
||||
import com.samskivert.depot.expression.*;
|
||||
import com.samskivert.depot.operator.BitAnd;
|
||||
import com.samskivert.depot.operator.BitOr;
|
||||
import com.samskivert.depot.operator.FullText;
|
||||
import com.samskivert.depot.operator.Like;
|
||||
import com.samskivert.depot.operator.Or;
|
||||
import com.samskivert.depot.operator.SQLOperator.MultiOperator;
|
||||
|
||||
import com.samskivert.depot.impl.clause.CreateIndexClause;
|
||||
import com.samskivert.depot.impl.expression.DateFun.DatePart;
|
||||
import com.samskivert.depot.impl.expression.DateFun.DateTruncate;
|
||||
import com.samskivert.depot.impl.expression.DateFun.DatePart.Part;
|
||||
import com.samskivert.depot.impl.expression.StringFun.Lower;
|
||||
import com.samskivert.depot.impl.operator.BitAnd;
|
||||
import com.samskivert.depot.impl.operator.BitOr;
|
||||
import com.samskivert.depot.impl.operator.Like;
|
||||
import com.samskivert.depot.impl.operator.Or;
|
||||
import com.samskivert.depot.impl.operator.SQLOperator.MultiOperator;
|
||||
|
||||
public class HSQLBuilder
|
||||
extends SQLBuilder
|
||||
|
||||
@@ -28,7 +28,7 @@ import java.sql.Timestamp;
|
||||
|
||||
import com.samskivert.depot.DatabaseException;
|
||||
import com.samskivert.depot.impl.expression.ValueExp;
|
||||
import com.samskivert.depot.operator.In;
|
||||
import com.samskivert.depot.impl.operator.In;
|
||||
import com.samskivert.util.ByteEnum;
|
||||
|
||||
/**
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
package com.samskivert.depot.operator;
|
||||
package com.samskivert.depot.impl.operator;
|
||||
|
||||
import com.samskivert.depot.expression.SQLExpression;
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
package com.samskivert.depot.operator;
|
||||
package com.samskivert.depot.impl.operator;
|
||||
|
||||
import java.util.Collection;
|
||||
|
||||
+2
-2
@@ -18,11 +18,11 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
package com.samskivert.depot.operator;
|
||||
package com.samskivert.depot.impl.operator;
|
||||
|
||||
import com.samskivert.depot.expression.SQLExpression;
|
||||
import com.samskivert.depot.impl.expression.ValueExp;
|
||||
import com.samskivert.depot.operator.SQLOperator.MultiOperator;
|
||||
import com.samskivert.depot.impl.operator.SQLOperator.MultiOperator;
|
||||
|
||||
/**
|
||||
* A convenient container for implementations of arithmetic operators.
|
||||
+1
-1
@@ -18,7 +18,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
package com.samskivert.depot.operator;
|
||||
package com.samskivert.depot.impl.operator;
|
||||
|
||||
import com.samskivert.depot.expression.SQLExpression;
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
package com.samskivert.depot.operator;
|
||||
package com.samskivert.depot.impl.operator;
|
||||
|
||||
import com.samskivert.depot.expression.SQLExpression;
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
package com.samskivert.depot.operator;
|
||||
package com.samskivert.depot.impl.operator;
|
||||
|
||||
import com.samskivert.util.StringUtil;
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
package com.samskivert.depot.operator;
|
||||
package com.samskivert.depot.impl.operator;
|
||||
|
||||
import com.samskivert.depot.expression.SQLExpression;
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
package com.samskivert.depot.operator;
|
||||
package com.samskivert.depot.impl.operator;
|
||||
|
||||
import java.util.Collection;
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
package com.samskivert.depot.operator;
|
||||
package com.samskivert.depot.impl.operator;
|
||||
|
||||
import com.samskivert.depot.expression.SQLExpression;
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
package com.samskivert.depot.operator;
|
||||
package com.samskivert.depot.impl.operator;
|
||||
|
||||
import com.samskivert.depot.expression.SQLExpression;
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
package com.samskivert.depot.operator;
|
||||
package com.samskivert.depot.impl.operator;
|
||||
|
||||
import java.util.Collection;
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
package com.samskivert.depot.operator;
|
||||
package com.samskivert.depot.impl.operator;
|
||||
|
||||
import java.util.Collection;
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
package com.samskivert.depot.operator;
|
||||
package com.samskivert.depot.impl.operator;
|
||||
|
||||
import com.samskivert.depot.expression.SQLExpression;
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
package com.samskivert.depot.operator;
|
||||
package com.samskivert.depot.impl.operator;
|
||||
|
||||
import com.samskivert.depot.expression.SQLExpression;
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
package com.samskivert.depot.operator;
|
||||
package com.samskivert.depot.impl.operator;
|
||||
|
||||
import com.samskivert.depot.expression.SQLExpression;
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
package com.samskivert.depot.operator;
|
||||
package com.samskivert.depot.impl.operator;
|
||||
|
||||
import com.samskivert.depot.expression.SQLExpression;
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
package com.samskivert.depot.operator;
|
||||
package com.samskivert.depot.impl.operator;
|
||||
|
||||
import java.util.Collection;
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
package com.samskivert.depot.operator;
|
||||
package com.samskivert.depot.impl.operator;
|
||||
|
||||
import com.samskivert.depot.expression.SQLExpression;
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
package com.samskivert.depot.operator;
|
||||
package com.samskivert.depot.impl.operator;
|
||||
|
||||
import java.util.Collection;
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
package com.samskivert.depot.operator;
|
||||
package com.samskivert.depot.impl.operator;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
+1
-1
@@ -18,7 +18,7 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
package com.samskivert.depot.operator;
|
||||
package com.samskivert.depot.impl.operator;
|
||||
|
||||
import com.samskivert.depot.expression.SQLExpression;
|
||||
|
||||
@@ -28,6 +28,7 @@ import com.google.common.collect.Lists;
|
||||
import com.samskivert.depot.PersistentRecord;
|
||||
import com.samskivert.depot.expression.SQLExpression;
|
||||
import com.samskivert.depot.impl.ExpressionVisitor;
|
||||
import com.samskivert.depot.impl.operator.SQLOperator;
|
||||
import com.samskivert.util.Tuple;
|
||||
|
||||
/**
|
||||
|
||||
@@ -25,6 +25,7 @@ import java.util.Collection;
|
||||
import com.samskivert.depot.PersistentRecord;
|
||||
import com.samskivert.depot.expression.FluentExp;
|
||||
import com.samskivert.depot.impl.ExpressionVisitor;
|
||||
import com.samskivert.depot.impl.operator.SQLOperator;
|
||||
|
||||
/**
|
||||
* An attempt at a dialect-agnostic full-text search condition, such as MySQL's MATCH() and
|
||||
|
||||
@@ -40,8 +40,8 @@ import com.samskivert.depot.SchemaMigration;
|
||||
import com.samskivert.depot.annotation.Computed;
|
||||
import com.samskivert.depot.clause.Where;
|
||||
import com.samskivert.depot.impl.expression.LiteralExp;
|
||||
import com.samskivert.depot.operator.GreaterThan;
|
||||
import com.samskivert.depot.operator.LessThan;
|
||||
import com.samskivert.depot.impl.operator.GreaterThan;
|
||||
import com.samskivert.depot.impl.operator.LessThan;
|
||||
|
||||
/**
|
||||
* A test tool for the Depot repository services.
|
||||
|
||||
Reference in New Issue
Block a user