Author: epbernard
Date: 2008-08-12 11:21:42 -0400 (Tue, 12 Aug 2008)
New Revision: 15037

Modified:
 search/trunk/src/test/org/hibernate/search/test/bridge/BridgeTest.java
 search/trunk/src/test/org/hibernate/search/test/bridge/Cloud.java
Log:
JBPAPP-1062 int1 and int2 are reserved keyword in MySQL

Modified: search/trunk/src/test/org/hibernate/search/test/bridge/BridgeTest.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/bridge/BridgeTest.java  2008-08-12 10:15:33 UTC (rev 15036)
+++ search/trunk/src/test/org/hibernate/search/test/bridge/BridgeTest.java  2008-08-12 15:21:42 UTC (rev 15037)
@@(protected) @@
     cloud.setDate( null );
     cloud.setDouble1( null );
     cloud.setDouble2( 2.1d );
-     cloud.setInt1( null );
-     cloud.setInt2( 2 );
+     cloud.setIntegerv1( null );
+     cloud.setIntegerv2( 2 );
     cloud.setFloat1( null );
     cloud.setFloat2( 2.1f );
     cloud.setLong1( null );
@@(protected) @@
     List result;

     query = parser.parse("double2:[2.1 TO 2.1] AND float2:[2.1 TO 2.1] " +
-        "AND int2:[2 TO 2.1] AND long2:[2 TO 2.1] AND type:\"dog\" AND storm:false");
+        "AND integerv2:[2 TO 2.1] AND long2:[2 TO 2.1] AND type:\"dog\" AND storm:false");

   result = session.createFullTextQuery(query).list();
     assertEquals( "find primitives and do not fail on null", 1, result.size() );

-     query = parser.parse("double1:[2.1 TO 2.1] OR float1:[2.1 TO 2.1] OR int1:[2 TO 2.1] OR long1:[2 TO 2.1]");
+     query = parser.parse("double1:[2.1 TO 2.1] OR float1:[2.1 TO 2.1] OR integerv1:[2 TO 2.1] OR long1:[2 TO 2.1]");
     result = session.createFullTextQuery(query).list();
     assertEquals( "null elements should not be stored", 0, result.size() ); //the query is dumb because restrictive


Modified: search/trunk/src/test/org/hibernate/search/test/bridge/Cloud.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/bridge/Cloud.java  2008-08-12 10:15:33 UTC (rev 15036)
+++ search/trunk/src/test/org/hibernate/search/test/bridge/Cloud.java  2008-08-12 15:21:42 UTC (rev 15037)
@@(protected) @@
  private int id;
  private Long long1;
  private long long2;
-   private Integer int1;
-   private int int2;
+   private Integer integerv1;
+   private int integerv2;
  private Double double1;
  private double double2;
  private Float float1;
@@(protected) @@
  }

  @Field(index=Index.UN_TOKENIZED, store=Store.YES)
-   public Integer getInt1() {
-     return int1;
+   public Integer getIntegerv1() {
+     return integerv1;
  }

-   public void setInt1(Integer int1) {
-     this.int1 = int1;
+   public void setIntegerv1(Integer integerv1) {
+     this.integerv1 = integerv1;
  }

  @Field(index=Index.UN_TOKENIZED, store=Store.YES)
-   public int getInt2() {
-     return int2;
+   public int getIntegerv2() {
+     return integerv2;
  }

-   public void setInt2(int int2) {
-     this.int2 = int2;
+   public void setIntegerv2(int integerv2) {
+     this.integerv2 = integerv2;
  }

  @Field(index=Index.UN_TOKENIZED, store=Store.YES)

_______________________________________________
hibernate-commits mailing list
hibernate-commits@(protected)
https://lists.jboss.org/mailman/listinfo/hibernate-commits