Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add reversed actions when using reverse #87

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ libraryDependencies += "org.apache.derby" % "derby" % "10.11.1

libraryDependencies += "org.hsqldb" % "hsqldb" % "2.5.0" % "test"

libraryDependencies += "org.postgresql" % "postgresql" % "42.2.14" % "test"
libraryDependencies += "org.postgresql" % "postgresql" % "42.2.14" % "test"

libraryDependencies += "mysql" % "mysql-connector-java" % "8.0.16" % "test"

Expand Down
40 changes: 20 additions & 20 deletions src/main/scala/slick/migration/api/TableMigration.scala
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,27 @@ object TableMigration {

object Action {
sealed abstract class Reversible(sort: Int) extends Action(sort)
case object DropTable extends Action(0)
case object CreateTable extends Reversible(1)
case class RenameTableTo(to: String) extends Reversible(2)
case class RenameTableFrom(from: String) extends Reversible(2)
case class AddColumn(info: ColumnInfo) extends Reversible(3)
case class AddColumnAndSetInitialValue(info: ColumnInfo, rawSqlExpr: String) extends Reversible(3)
case class DropColumn(info: ColumnInfo) extends Reversible(4)
case class DropColumnOfName(name: String) extends Action(4)
case class RenameColumnTo(originalInfo: ColumnInfo, to: String) extends Reversible(5)
case class RenameColumnFrom(currentInfo: ColumnInfo, from: String) extends Reversible(5)
case class AlterColumnType(info: ColumnInfo) extends Action(6)
case class AlterColumnDefault(info: ColumnInfo) extends Action(6)
case class AlterColumnNullable(info: ColumnInfo) extends Action(6)
case class DropPrimaryKey(info: PrimaryKeyInfo) extends Reversible(7)
case class DropForeignKey(fk: ForeignKey) extends Reversible(7)
case object CreateTable extends Reversible(0)
case class RenameTableTo(to: String) extends Reversible(1)
case class AddColumn(info: ColumnInfo) extends Reversible(2)
case class AddColumnAndSetInitialValue(info: ColumnInfo, rawSqlExpr: String) extends Reversible(2)
case class RenameColumnTo(originalInfo: ColumnInfo, to: String) extends Reversible(2)
case class AlterColumnType(info: ColumnInfo) extends Action(3)
case class AlterColumnDefault(info: ColumnInfo) extends Action(3)
case class AlterColumnNullable(info: ColumnInfo) extends Action(3)
case class AddPrimaryKey(info: PrimaryKeyInfo) extends Reversible(4)
case class AddForeignKey(fk: ForeignKey) extends Reversible(4)
case class CreateIndex(info: IndexInfo) extends Reversible(5)
case class RenameIndexTo(originalInfo: IndexInfo, to: String) extends Reversible(5)
case class DropPrimaryKey(info: PrimaryKeyInfo) extends Reversible(6)
case class DropForeignKey(fk: ForeignKey) extends Reversible(6)
case class DropIndex(info: IndexInfo) extends Reversible(7)
case class AddPrimaryKey(info: PrimaryKeyInfo) extends Reversible(8)
case class AddForeignKey(fk: ForeignKey) extends Reversible(8)
case class CreateIndex(info: IndexInfo) extends Reversible(8)
case class RenameIndexTo(originalInfo: IndexInfo, to: String) extends Reversible(9)
case class RenameIndexFrom(currentInfo: IndexInfo, from: String) extends Reversible(9)
case class RenameColumnFrom(currentInfo: ColumnInfo, from: String) extends Reversible(8)
case class RenameIndexFrom(currentInfo: IndexInfo, from: String) extends Reversible(8)
case class RenameTableFrom(from: String) extends Reversible(8)
case class DropColumnOfName(name: String) extends Action(9)
case class DropColumn(info: ColumnInfo) extends Reversible(9)
case object DropTable extends Action(10)
}

sealed trait WithActions[A <: Action] {
Expand Down
32 changes: 31 additions & 1 deletion src/test/scala/slick/migration/api/DbTest.scala
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import scala.concurrent.Await
import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent.duration.Duration
import scala.util.control.NonFatal
import slick.jdbc.{HsqldbProfile, JdbcProfile, OracleProfile}
import slick.jdbc.{HsqldbProfile, JdbcProfile, OracleProfile, PostgresProfile}
import slick.jdbc.meta._
import slick.lifted.AbstractTable
import com.typesafe.slick.testkit.util.JdbcTestDB
Expand Down Expand Up @@ -245,6 +245,36 @@ abstract class DbTest[P <: JdbcProfile](val tdb: JdbcTestDB {val profile: P})
runMigration(tm.drop)
}
}

test("reverse") {
val tm = TableMigration(TestTable)
val createTable = tm.create.addColumns(_.id, _.strWithDefault)

assert(createTable.sql.size === 1)
assert(createTable.sql.head.contains("create table"))

runMigration(createTable)

val reversed = createTable.reverse

assert(reversed.sql.size === 3)
assert(reversed.sql.head.contains("ID"))
assert(reversed.sql(1).contains("STR_WITH_DEFAULT"))
assert(reversed.sql(2).contains("drop table"))

try withBeforeAndAfter(reversed)(getTables) { (before, after) =>
// Only postgres can remove all columns from a table
if (this.profile.isInstanceOf[PostgresProfile]) {
assert(before.contains("TEST_TABLE"))
assert(!after.contains("TEST_TABLE"))
}
} catch {
case _: Throwable =>
if (!this.profile.isInstanceOf[PostgresProfile]) {
runMigration(tm.drop)
}
}
}
}

trait CompleteDbTest { this: DbTest[_ <: JdbcProfile] =>
Expand Down