Rename db columns that clash with sql server keywords etc

src/test/java/com/avaje/tests/compositekeys/TestCKeyIdInExpression.java

@@ -1,8 +1,11 @@
 package com.avaje.tests.compositekeys;
 
 import com.avaje.ebean.BaseTestCase;
+import com.avaje.ebean.Ebean;
 import com.avaje.ebean.EbeanServer;
 import com.avaje.ebean.Query;
+import com.avaje.tests.model.composite.RCustomer;
+import com.avaje.tests.model.composite.RCustomerKey;
 import com.avaje.tests.model.composite.ROrder;
 import com.avaje.tests.model.composite.ROrderPK;
 import org.junit.Assert;
@@ -18,11 +21,30 @@ public class TestCKeyIdInExpression extends BaseTestCase {
 
   }
 
-  // public void testRunManually() {
+  //@Test
+  public void notRanAuto_doInsert() {
+
+    RCustomerKey customerKey = new RCustomerKey("compa", "coa");
+    RCustomer rCustomer = new RCustomer();
+    rCustomer.setKey(customerKey);
+    rCustomer.setDescription("some foo for ms sql server");
+
+    Ebean.save(rCustomer);
+
+    ROrderPK k0 = new ROrderPK("compa", 100);
+    ROrder rOrder = new ROrder();
+    rOrder.setCustomer(rCustomer);
+    rOrder.setOrderPK(k0);
+    rOrder.setItem("Chair");
+
+    Ebean.save(rOrder);
+  }
+
   //@Test
   public void notRanAutomatically() {
 
-    EbeanServer server = CreateIdExpandedFormServer.create();
+    //EbeanServer server = CreateIdExpandedFormServer.create();
+    EbeanServer server = Ebean.getServer(null);
 
     ROrderPK k0 = new ROrderPK("compa", 100);
     ROrderPK k1 = new ROrderPK("compa", 101);
@@ -40,14 +62,14 @@ public class TestCKeyIdInExpression extends BaseTestCase {
     query.findList();
     String sql = query.getGeneratedSql();
 
-    Assert.assertTrue(sql.contains("(r.company=? and r.order_number=?) or"));
+    Assert.assertTrue(sql.contains("(t0.company=? and t0.order_number=?) or"));
 
     Query<ROrder> query2 = server.find(ROrder.class).setId(k0);
 
     query2.findUnique();
     sql = query2.getGeneratedSql();
-    Assert.assertTrue(sql.contains("r.company = ? "));
-    Assert.assertTrue(sql.contains(" and r.order_number = ?"));
+    Assert.assertTrue(sql.contains("t0.company = ? "));
+    Assert.assertTrue(sql.contains(" and t0.order_number = ?"));
 
     server.delete(ROrder.class, k0);
 

src/test/java/com/avaje/tests/model/basic/ResetBasicData.java

@@ -97,25 +97,21 @@ public class ResetBasicData {
 	  server.execute(new TxRunnable() {
 			public void run() {
 				Product p = new Product();
-				p.setId(1);
 				p.setName("Chair");
 				p.setSku("C001");
 				server.save(p);
 		
 				p = new Product();
-				p.setId(2);
 				p.setName("Desk");
 				p.setSku("DSK1");
 				server.save(p);
 		
 				p = new Product();
-				p.setId(3);
 				p.setName("Computer");
 				p.setSku("C002");
 				server.save(p);
 		
 				p = new Product();
-				p.setId(4);
 				p.setName("Printer");
 				p.setSku("C003");
 				server.save(p);

src/test/java/com/avaje/tests/model/types/SomeFileBean.java

@@ -45,7 +45,7 @@ public class SomeFileBean {
     return content;
   }
 
-  public void setContent(File file) {
+  public void setContent(File content) {
     this.content = content;
   }
 }

src/test/java/com/avaje/tests/query/other/TestQueryConversationRowCount.java

@@ -41,9 +41,9 @@ public class TestQueryConversationRowCount extends BaseTestCase {
     // where t0.group_id = ?  and ((t0.open = ?  and u1.user_id = ? )  or t0.open = ? ) 
     // order by t0.when_created desc; 
 
-    Assert.assertTrue(generatedSql.contains("select distinct t0.id c0, t0.title c1, t0.open"));
+    Assert.assertTrue(generatedSql.contains("select distinct t0.id c0, t0.title c1, t0.isopen"));
     Assert.assertTrue(generatedSql.contains("left outer join c_participation u1 on u1.conversation_id = t0.id"));
-    Assert.assertTrue(generatedSql.contains("where t0.group_id = ?  and ((t0.open = ?  and u1.user_id = ? )  or t0.open = ? )"));
+    Assert.assertTrue(generatedSql.contains("where t0.group_id = ?  and ((t0.isopen = ?  and u1.user_id = ? )  or t0.isopen = ? )"));
 
     
     LoggedSqlCollector.start();
@@ -61,7 +61,7 @@ public class TestQueryConversationRowCount extends BaseTestCase {
     
     String countSql = loggedSql.get(0);
     
-    Assert.assertTrue(countSql.contains("select count(*) from ( select distinct t0.id c0 from c_conversation t0 left outer join c_participation u1 on u1.conversation_id = t0.id  where t0.group_id = ?  and ((t0.open = ?  and u1.user_id = ? )  or t0.open = ? )"));
+    Assert.assertTrue(countSql.contains("select count(*) from ( select distinct t0.id c0 from c_conversation t0 left outer join c_participation u1 on u1.conversation_id = t0.id  where t0.group_id = ?  and ((t0.isopen = ?  and u1.user_id = ? )  or t0.isopen = ? )"));
   }
   
   @Test
@@ -96,7 +96,7 @@ public class TestQueryConversationRowCount extends BaseTestCase {
     // where t0.group_id = ?  and ((t0.open = ?  and u1.user_id = ? )  or t0.open = ? ) 
     // order by t0.when_created desc; 
 
-    Assert.assertTrue(generatedSql.contains("select distinct t0.id c0, t0.title c1, t0.open"));
+    Assert.assertTrue(generatedSql.contains("select distinct t0.id c0, t0.title c1, t0.isopen"));
     
     
     // THE NEXT ASSERT CURRENTLY FAILS: