@@ -125,6 +125,10 @@ abstract class DriverType(val name : String) { def primaryKeySetup(tableName : String, columnName : String) : List[String] = { List("ALTER TABLE "+tableName+" ADD CONSTRAINT "+tableName+"_PK PRIMARY KEY("+columnName+")") } + + /** This defines the syntax for adding a column in an alter. This is + * used because some DBs (Oracle, for one) use slightly different syntax. */ + def alterAddColumn = "ADD COLUMN" } object DriverType { @@ -369,6 +373,9 @@ object OracleDriver extends DriverType("Oracle") { stmt.executeUpdate handler(Left(stmt.getGeneratedKeys)) } + + // Oracle doesn't use "COLUMN" syntax when adding a column to a table + override def alterAddColumn = "ADD" } object MaxDbDriver extends DriverType("MaxDB") { lift-persistence/lift-mapper/src/main/scala/net/liftweb/mapper/Driver.scala @@ -205,7 +205,7 @@ object Schemifier { (field.dbColumnNames(field.name) -- cols).foreach { colName => cmds += maybeWrite(performWrite, logFunc, connection) { - () => "ALTER TABLE "+table.dbTableName+" ADD COLUMN "+field.fieldCreatorString(connection.driverType, colName) + () => "ALTER TABLE "+table.dbTableName+" "+connection.driverType.alterAddColumn+" "+field.fieldCreatorString(connection.driverType, colName) } if ((!connection.driverType.pkDefinedByIndexColumn_?) && field.dbPrimaryKey_?) { // Add primary key only when it has not been created by the index field itself. lift-persistence/lift-mapper/src/main/scala/net/liftweb/mapper/Schemifier.scala 0f225b718f0261d521f82d7ae6baa18a2e804646 Derek Chen-Becker github@chen-becker.org http://github.com/dpp/liftweb/commit/227cb935862806ecfd5860c48c22fa77a42d5c40 227cb935862806ecfd5860c48c22fa77a42d5c40 2009-10-27T08:46:40-07:00 2009-10-21T16:19:14-07:00 Fix Oracle ALTER TABLE syntax for column adds Closes #86 Oracle uses the syntax "ADD column_name" instead of "ADD COLUMN column_name". Added a new def on DriverType to allow different drivers to override the default behavior. 617aa08676f80063b9ef0da306751b3761f166eb Derek Chen-Becker github@chen-becker.org