svn commit: r928241 - in /openjpa/trunk: openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractSQLServerDictionary.java openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Rider.java

[dwoods]

Author: dwoods
Date: Sat Mar 27 17:56:32 2010
New Revision: 928241

URL: http://svn.apache.org/viewvc?rev=928241&view=rev
Log:
OPENJPA-1597 Rollback MSSQL reserved word, but update Rider test entity failure 
on MSSQL

Modified:
    
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractSQLServerDictionary.java
    
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Rider.java

Modified: 
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractSQLServerDictionary.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractSQLServerDictionary.java?rev=928241&r1=928240&r2=928241&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractSQLServerDictionary.java
 (original)
+++ 
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractSQLServerDictionary.java
 Sat Mar 27 17:56:32 2010
@@ -37,7 +37,7 @@ public abstract class AbstractSQLServerD
     extends DBDictionary {
 
     public AbstractSQLServerDictionary() {
-        reservedWordSet.addAll(Arrays.asList(new String[]{ "FILE", "INDEX", 
"RULE" }));
+        reservedWordSet.addAll(Arrays.asList(new String[]{ "FILE", "INDEX" }));
         systemTableSet.add("DTPROPERTIES");
         validationSQL = "SELECT GETDATE()";
         rangePosition = RANGE_POST_DISTINCT;

Modified: 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Rider.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Rider.java?rev=928241&r1=928240&r2=928241&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Rider.java
 (original)
+++ 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Rider.java
 Sat Mar 27 17:56:32 2010
@@ -25,8 +25,10 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
+import javax.persistence.Table;
 
 @Entity
+...@table(name="RIDER_ANNUITY")
 @AttributeOverride(name="lastUpdateDate", 
colu...@column(name="LAST_UPDATE_TS"))
 public class Rider extends AnnuityPersistebleObject implements IRider {
        private static final long serialVersionUID = 2088116709551706187L;
@@ -42,6 +44,8 @@ public class Rider extends AnnuityPersis
        public void setEffectiveDate(Date effectiveDate) {
                this.effectiveDate = effectiveDate;
        }
+
+       @Column(name="RIDER_RULE")
        public String getRule() {
                return rule;
        }