Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OPENJPA-1597 Rollback MSSQL reserved word, but update Rider test entity failure on MSSQL 

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@928241 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Donald Woods 2010-03-27 17:56:32 +00:00
parent a9648ec87e
commit cb0ca8f009
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractSQLServerDictionary.java
View File

@ -37,7 +37,7 @@ public abstract class AbstractSQLServerDictionary
extends DBDictionary { extends DBDictionary {
public AbstractSQLServerDictionary() { public AbstractSQLServerDictionary() {
reservedWordSet.addAll(Arrays.asList(new String[]{ "FILE", "INDEX", "RULE" })); reservedWordSet.addAll(Arrays.asList(new String[]{ "FILE", "INDEX" }));
systemTableSet.add("DTPROPERTIES"); systemTableSet.add("DTPROPERTIES");
validationSQL = "SELECT GETDATE()"; validationSQL = "SELECT GETDATE()";
rangePosition = RANGE_POST_DISTINCT; rangePosition = RANGE_POST_DISTINCT;

4
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Rider.java
View File

@ -25,8 +25,10 @@ import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.EnumType; import javax.persistence.EnumType;
import javax.persistence.Enumerated; import javax.persistence.Enumerated;
import javax.persistence.Table;
@Entity @Entity
@Table(name="RIDER_ANNUITY")
@AttributeOverride(name="lastUpdateDate", column=@Column(name="LAST_UPDATE_TS")) @AttributeOverride(name="lastUpdateDate", column=@Column(name="LAST_UPDATE_TS"))
public class Rider extends AnnuityPersistebleObject implements IRider { public class Rider extends AnnuityPersistebleObject implements IRider {
private static final long serialVersionUID = 2088116709551706187L; private static final long serialVersionUID = 2088116709551706187L;
@ -42,6 +44,8 @@ public class Rider extends AnnuityPersistebleObject implements IRider {
public void setEffectiveDate(Date effectiveDate) { public void setEffectiveDate(Date effectiveDate) {
this.effectiveDate = effectiveDate; this.effectiveDate = effectiveDate;
} }
@Column(name="RIDER_RULE")
public String getRule() { public String getRule() {
return rule; return rule;
} }