revert TDS constraint test

Author: petermueller

integration_test/pg/constraints_test.exs

@@ -291,4 +291,4 @@ defmodule Ecto.Integration.ConstraintsTest do
 
     assert changeset.data.__meta__.state == :loaded
   end
-end
+end

integration_test/tds/constraints_test.exs

@@ -4,7 +4,7 @@ defmodule Ecto.Integration.ConstraintsTest do
   import Ecto.Migrator, only: [up: 4]
   alias Ecto.Integration.PoolRepo
 
-  defmodule ConstraintTableMigration do
+  defmodule ConstraintMigration do
     use Ecto.Migration
 
     @table table(:constraints_test)
@@ -15,16 +15,7 @@ defmodule Ecto.Integration.ConstraintsTest do
         add :from, :integer
         add :to, :integer
       end
-    end
-  end
-
-  defmodule CheckConstraintMigration do
-    use Ecto.Migration
-
-    @table table(:constraints_test)
-
-    def change do
-      create constraint(@table.name, :positive_price, check: "[price] > 0")
+      create constraint(@table.name, :cannot_overlap, check: "[from] < [to]")
     end
   end
 
@@ -43,74 +34,34 @@ defmodule Ecto.Integration.ConstraintsTest do
   setup_all do
     ExUnit.CaptureLog.capture_log(fn ->
       num = @base_migration + System.unique_integer([:positive])
-      up(PoolRepo, num, ConstraintTableMigration, log: false)
+      up(PoolRepo, num, ConstraintMigration, log: false)
     end)
 
     :ok
   end
 
-  @tag :create_constraint
   test "check constraint" do
-    num = @base_migration + System.unique_integer([:positive])
+    changeset = Ecto.Changeset.change(%Constraint{}, from: 0, to: 10)
+    {:ok, _} = PoolRepo.insert(changeset)
 
-    ExUnit.CaptureLog.capture_log(fn ->
-      :ok = up(PoolRepo, num, CheckConstraintMigration, log: false)
-    end)
+    non_overlapping_changeset = Ecto.Changeset.change(%Constraint{}, from: 11, to: 12)
+    {:ok, _} = PoolRepo.insert(non_overlapping_changeset)
 
-    # When the changeset doesn't expect the db error
-    changeset = Ecto.Changeset.change(%Constraint{}, price: -10)
+    overlapping_changeset = Ecto.Changeset.change(%Constraint{}, from: 1900, to: 12)
 
     exception =
-      assert_raise Ecto.ConstraintError,
-                   ~r/constraint error when attempting to insert struct/,
-                   fn -> PoolRepo.insert(changeset) end
-
-    assert exception.message =~ "\"positive_price\" (check_constraint)"
+      assert_raise Ecto.ConstraintError, ~r/constraint error when attempting to insert struct/, fn ->
+        PoolRepo.insert(overlapping_changeset)
+      end
+    assert exception.message =~ "\"cannot_overlap\" (check_constraint)"
     assert exception.message =~ "The changeset has not defined any constraint."
     assert exception.message =~ "call `check_constraint/3`"
 
-    # When the changeset does expect the db error, but doesn't give a custom message
     {:error, changeset} =
-      changeset
-      |> Ecto.Changeset.check_constraint(:price, name: :positive_price)
+      overlapping_changeset
+      |> Ecto.Changeset.check_constraint(:from, name: :cannot_overlap)
       |> PoolRepo.insert()
-
-    assert changeset.errors == [
-             price: {"is invalid", [constraint: :check, constraint_name: "positive_price"]}
-           ]
-
-    assert changeset.data.__meta__.state == :built
-
-    # When the changeset does expect the db error and gives a custom message
-    changeset = Ecto.Changeset.change(%Constraint{}, price: -10)
-
-    {:error, changeset} =
-      changeset
-      |> Ecto.Changeset.check_constraint(:price,
-        name: :positive_price,
-        message: "price must be greater than 0"
-      )
-      |> PoolRepo.insert()
-
-    assert changeset.errors == [
-             price:
-               {"price must be greater than 0",
-                [constraint: :check, constraint_name: "positive_price"]}
-           ]
-
+    assert changeset.errors == [from: {"is invalid", [constraint: :check, constraint_name: "cannot_overlap"]}]
     assert changeset.data.__meta__.state == :built
-
-    # When the change does not violate the check constraint
-    changeset = Ecto.Changeset.change(%Constraint{}, price: 10, from: 100, to: 200)
-
-    {:ok, result} =
-      changeset
-      |> Ecto.Changeset.check_constraint(:price,
-        name: :positive_price,
-        message: "price must be greater than 0"
-      )
-      |> PoolRepo.insert()
-
-    assert is_integer(result.id)
   end
-end
+end