AfflictionNetworks/depot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Match the SQLBuilder changes in HSQLBuilder to fix the build

Browse Source
This commit is contained in:
Charlie Groves
2011-03-29 19:36:35 +00:00
parent 903bb5181b
commit e41e3c9961
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/samskivert/depot/impl/HSQLBuilder.java
+11 -10
View File
@@ -20,29 +20,25 @@
package com.samskivert.depot.impl; package com.samskivert.depot.impl;
import java.lang.reflect.Field;
import java.sql.Connection; import java.sql.Connection;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.samskivert.jdbc.ColumnDefinition;
import com.samskivert.util.ArrayUtil;
import com.samskivert.depot.Exps; import com.samskivert.depot.Exps;
import com.samskivert.depot.Ops; import com.samskivert.depot.Ops;
import com.samskivert.depot.PersistentRecord; import com.samskivert.depot.PersistentRecord;
import com.samskivert.depot.annotation.FullTextIndex; import com.samskivert.depot.annotation.FullTextIndex;
import com.samskivert.depot.annotation.GeneratedValue; import com.samskivert.depot.annotation.GeneratedValue;
import com.samskivert.depot.expression.*; import com.samskivert.depot.expression.ColumnExp;
import com.samskivert.depot.operator.FullText; import com.samskivert.depot.expression.SQLExpression;
import com.samskivert.depot.impl.expression.AggregateFun; import com.samskivert.depot.impl.expression.AggregateFun;
import com.samskivert.depot.impl.expression.DateFun.DatePart.Part;
import com.samskivert.depot.impl.expression.DateFun.DatePart; import com.samskivert.depot.impl.expression.DateFun.DatePart;
import com.samskivert.depot.impl.expression.DateFun.DatePart.Part;
import com.samskivert.depot.impl.expression.DateFun.DateTruncate; import com.samskivert.depot.impl.expression.DateFun.DateTruncate;
import com.samskivert.depot.impl.expression.LiteralExp; import com.samskivert.depot.impl.expression.LiteralExp;
import com.samskivert.depot.impl.expression.NumericalFun; import com.samskivert.depot.impl.expression.NumericalFun;
@@ -52,6 +48,10 @@ import com.samskivert.depot.impl.operator.BitAnd;
import com.samskivert.depot.impl.operator.BitOr; import com.samskivert.depot.impl.operator.BitOr;
import com.samskivert.depot.impl.operator.Like; import com.samskivert.depot.impl.operator.Like;
import com.samskivert.depot.impl.operator.MultiOperator; import com.samskivert.depot.impl.operator.MultiOperator;
import com.samskivert.depot.operator.FullText;
import com.samskivert.util.ArrayUtil;
import com.samskivert.jdbc.ColumnDefinition;
public class HSQLBuilder public class HSQLBuilder
extends SQLBuilder extends SQLBuilder
@@ -250,7 +250,8 @@ public class HSQLBuilder
} }
@Override @Override
protected void maybeMutateForGeneratedValue (GeneratedValue genValue, ColumnDefinition column) protected void maybeMutateForGeneratedValue (
Field field, GeneratedValue genValue, ColumnDefinition column)
{ {
// HSQL's IDENTITY() implementation does not take the form of a type, as MySQL's // HSQL's IDENTITY() implementation does not take the form of a type, as MySQL's
// and PostgreSQL's conveniently shared SERIAL alias, nor as MySQL's original // and PostgreSQL's conveniently shared SERIAL alias, nor as MySQL's original
@@ -263,7 +264,7 @@ public class HSQLBuilder
break; break;
default: default:
super.maybeMutateForGeneratedValue(genValue, column); super.maybeMutateForGeneratedValue(field, genValue, column);
} }
} }