#374 - Merge BaseColumnDdl into BaseTableDdl

src/main/java/com/avaje/ebean/config/dbplatform/Oracle10Platform.java

@@ -14,7 +14,7 @@ public class Oracle10Platform extends DatabasePlatform {
   public Oracle10Platform() {
     super();
     this.name = "oracle";
-    this.maxIntersectionTableName = 30;
+    this.maxTableNameLength = 30;
     // OnQueryOnly.CLOSE as a performance optimisation on Oracle
     this.onQueryOnly = OnQueryOnly.CLOSE;
     this.dbEncrypt = new Oracle10DbEncrypt();

src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/BaseDdlHandler.java

@@ -2,7 +2,6 @@
 
 import com.avaje.ebean.config.DbConstraintNaming;
 import com.avaje.ebean.config.NamingConvention;
-import com.avaje.ebean.dbmigration.ddlgeneration.platform.BaseColumnDdl;
 import com.avaje.ebean.dbmigration.ddlgeneration.platform.BaseTableDdl;
 import com.avaje.ebean.dbmigration.ddlgeneration.platform.PlatformDdl;
 import com.avaje.ebean.dbmigration.migration.AddColumn;
@@ -19,13 +18,10 @@
  */
 public class BaseDdlHandler implements DdlHandler {
 
-  protected final ColumnDdl columnDdl;
-
   protected final TableDdl tableDdl;
 
   public BaseDdlHandler(NamingConvention namingConvention, DbConstraintNaming naming, PlatformDdl platformDdl) {
     this.tableDdl = new BaseTableDdl(namingConvention, naming, platformDdl);
-    this.columnDdl = new BaseColumnDdl(platformDdl);
   }
 
   @Override
@@ -52,16 +48,16 @@ public void generate(DdlWrite writer, CreateTable createTable) throws IOExceptio
 
   @Override
   public void generate(DdlWrite writer, AddColumn addColumn) throws IOException {
-    columnDdl.generate(writer, addColumn);
+    tableDdl.generate(writer, addColumn);
   }
 
   @Override
   public void generate(DdlWrite writer, DropColumn dropColumn) throws IOException {
-    columnDdl.generate(writer, dropColumn);
+    tableDdl.generate(writer, dropColumn);
   }
 
   @Override
   public void generate(DdlWrite writer, AlterColumn alterColumn) throws IOException {
-    columnDdl.generate(writer, alterColumn);
+    tableDdl.generate(writer, alterColumn);
   }
 }

src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/TableDdl.java

@@ -1,6 +1,9 @@
 package com.avaje.ebean.dbmigration.ddlgeneration;
 
+import com.avaje.ebean.dbmigration.migration.AddColumn;
+import com.avaje.ebean.dbmigration.migration.AlterColumn;
 import com.avaje.ebean.dbmigration.migration.CreateTable;
+import com.avaje.ebean.dbmigration.migration.DropColumn;
 
 import java.io.IOException;
 
@@ -13,4 +16,20 @@ public interface TableDdl {
    * Generate the create table DDL.
    */
   void generate(DdlWrite writer, CreateTable createTable) throws IOException;
+
+  /**
+   * Write the add column change.
+   */
+  void generate(DdlWrite writer, AddColumn addColumn) throws IOException;
+
+  /**
+   * Write the drop column change.
+   */
+  void generate(DdlWrite writer, DropColumn dropColumn) throws IOException;
+
+  /**
+   * Write the alter column changes.
+   */
+  void generate(DdlWrite writer, AlterColumn alterColumn) throws IOException;
+
 }