Rename db columns that clash with sql server keywords etc

This commit is contained in:
rbygrave
2014-12-17 00:20:48 +13:00
parent 73cf3e8511
commit 59428bb214
4 changed files with 27 additions and 29 deletions
@@ -2,10 +2,7 @@ package com.avaje.tests.model.converstation;
import java.util.List;
import javax.persistence.Entity;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.persistence.*;
import com.avaje.tests.model.BaseModel;
@@ -14,7 +11,8 @@ import com.avaje.tests.model.BaseModel;
public class Conversation extends BaseModel {
String title;
@Column(name="isopen")
boolean open;
@ManyToOne
@@ -15,7 +15,7 @@ public class SomeFileBean {
String name;
@Lob
File file;
File content;
public Long getId() {
return id;
@@ -41,11 +41,11 @@ public class SomeFileBean {
this.name = name;
}
public File getFile() {
return file;
public File getContent() {
return content;
}
public void setFile(File file) {
this.file = file;
public void setContent(File file) {
this.content = content;
}
}
@@ -31,9 +31,9 @@ public class TestFileType extends BaseTestCase {
.findUnique();
assertEquals("afile", bean1.getName());
assertNull(bean1.getFile());
assertNull(bean1.getContent());
bean1.setFile(file);
bean1.setContent(file);
Ebean.save(bean1);
SomeFileBean bean2 = Ebean.find(SomeFileBean.class)
@@ -42,8 +42,8 @@ public class TestFileType extends BaseTestCase {
.findUnique();
assertEquals("afile", bean2.getName());
assertNotNull(bean2.getFile());
System.out.println("test_insertNullFile: bean2: "+bean2.getFile());
assertNotNull(bean2.getContent());
System.out.println("test_insertNullFile: bean2: "+bean2.getContent());
Ebean.delete(bean1);
}
@@ -56,7 +56,7 @@ public class TestFileType extends BaseTestCase {
SomeFileBean bean0 = new SomeFileBean();
bean0.setName("afile");
bean0.setFile(file);
bean0.setContent(file);
Ebean.save(bean0);
@@ -66,12 +66,12 @@ public class TestFileType extends BaseTestCase {
.findUnique();
assertEquals("afile", bean1.getName());
assertNotNull(bean1.getFile());
assertEquals(file.length(), bean1.getFile().length());
System.out.println("t2 bean1: " + bean1.getFile().getAbsoluteFile());
assertNotNull(bean1.getContent());
assertEquals(file.length(), bean1.getContent().length());
System.out.println("t2 bean1: " + bean1.getContent().getAbsoluteFile());
bean1.setName("mod-file");
bean1.setFile(file2);
bean1.setContent(file2);
// update to file2
Ebean.save(bean1);
@@ -81,11 +81,11 @@ public class TestFileType extends BaseTestCase {
.setId(bean0.getId())
.findUnique();
assertEquals(file2.length(), bean2.getFile().length());
System.out.println("t2 bean3: " + bean2.getFile().getAbsoluteFile());
assertEquals(file2.length(), bean2.getContent().length());
System.out.println("t2 bean3: " + bean2.getContent().getAbsoluteFile());
// update to null
bean2.setFile(null);
bean2.setContent(null);
bean2.setName("setNull");
Ebean.save(bean2);
@@ -94,8 +94,8 @@ public class TestFileType extends BaseTestCase {
.setId(bean0.getId())
.findUnique();
assertNull(bean3.getFile());
System.out.println("t2 bean3: " + bean3.getFile());
assertNull(bean3.getContent());
System.out.println("t2 bean3: " + bean3.getContent());
bean3.setName("changeOnlyName");
Ebean.save(bean3);
@@ -24,7 +24,7 @@ public class TestFileTypeFetching extends BaseTestCase {
SomeFileBean bean0 = new SomeFileBean();
bean0.setName("one");
bean0.setFile(file);
bean0.setContent(file);
Ebean.save(bean0);
SomeFileBean bean1 = Ebean.find(SomeFileBean.class)
@@ -34,15 +34,15 @@ public class TestFileTypeFetching extends BaseTestCase {
BeanState beanState = Ebean.getBeanState(bean1);
Set<String> loadedProps = beanState.getLoadedProps();
assertTrue(loadedProps.contains("name"));
assertFalse(loadedProps.contains("file"));
assertFalse(loadedProps.contains("content"));
File file1 = bean1.getFile();
File file1 = bean1.getContent();
assertEquals(file.length(), file1.length());
SomeFileBean statelessUpdateBean = new SomeFileBean();
statelessUpdateBean.setId(bean0.getId());
statelessUpdateBean.setFile(file2);
statelessUpdateBean.setContent(file2);
// perform stateless update (handy)
Ebean.update(statelessUpdateBean);
@@ -52,7 +52,7 @@ public class TestFileTypeFetching extends BaseTestCase {
.setId(bean0.getId())
.findUnique();
assertEquals(file2.length(), bean2.getFile().length());
assertEquals(file2.length(), bean2.getContent().length());
Ebean.delete(bean1);
}