remove restrict/cascade errors

Author: Jason Stiebs

integration_test/hints_test.exs

@@ -6,21 +6,6 @@ defmodule Ecto.Integration.HintsTest do
   alias Ecto.Integration.Post
   alias Ecto.Integration.TestRepo
 
-  test "join hints" do
-    {:ok, _} = TestRepo.query("CREATE INDEX post_id_idx ON posts (id)")
-    TestRepo.insert!(%Post{id: 1})
-
-    results =
-      from(p in Post,
-        join: p2 in Post,
-        on: p.id == p2.id,
-        hints: ["INDEXED BY post_id_idx"]
-      )
-      |> TestRepo.all()
-
-    assert [%Post{id: 1}] = results
-  end
-
   test "from hints" do
     {:ok, _} = TestRepo.query("CREATE INDEX post_id_idx ON posts (id)")
     TestRepo.insert!(%Post{id: 1})

integration_test/test_helper.exs

@@ -108,6 +108,7 @@ ExUnit.start(
     :alter_foreign_key,
     :assigns_id_type,
     :modify_column,
+    :restrict,
 
     # SQLite3 does not support the concat function
     :concat,
@@ -121,5 +122,8 @@ ExUnit.start(
     :selected_as_with_order_by,
     :selected_as_with_order_by_expression,
     :selected_as_with_having,
+
+    # Distinct with options not supported
+    :distinct_count
   ]
 )

lib/ecto/adapters/sqlite3/connection.ex

@@ -370,11 +370,6 @@ defmodule Ecto.Adapters.SQLite3.Connection do
   ## DDL
   ##
 
-  @impl true
-  def execute_ddl({_command, %Table{options: options}, _}) when is_list(options) do
-    raise ArgumentError, "SQLite3 adapter does not support keyword lists in :options"
-  end
-
   @impl true
   def execute_ddl({:create, %Table{} = table, columns}) do
     {table, composite_pk_def} = composite_pk_definition(table, columns)
@@ -426,14 +421,7 @@ defmodule Ecto.Adapters.SQLite3.Connection do
   end
 
   @impl true
-  def execute_ddl({:drop, %Table{} = table, mode}) do
-    if mode != [] do
-      raise ArgumentError, """
-      `#{inspect(mode)}` is not supported for DROP TABLE with SQLite3 \
-      DROP TABLE #{table.name} cannot have options set.
-      """
-    end
-
+  def execute_ddl({:drop, %Table{} = table, _mode}) do
     execute_ddl({:drop, table})
   end
 
@@ -540,14 +528,7 @@ defmodule Ecto.Adapters.SQLite3.Connection do
   end
 
   @impl true
-  def execute_ddl({:drop, %Index{} = index, mode}) do
-    if mode != [] do
-      raise ArgumentError, """
-      `#{inspect(mode)}` is not supported for DROP INDEX with SQLite3 \
-      DROP INDEX #{index.name} cannot have options set.
-      """
-    end
-
+  def execute_ddl({:drop, %Index{} = index, _mode}) do
     execute_ddl({:drop, index})
   end
 
@@ -567,14 +548,7 @@ defmodule Ecto.Adapters.SQLite3.Connection do
   end
 
   @impl true
-  def execute_ddl({:drop_if_exists, %Index{} = index, mode}) do
-    if mode != [] do
-      raise ArgumentError, """
-      `#{inspect(mode)}` is not supported for DROP INDEX with SQLite3 \
-      DROP INDEX #{index.name} cannot have options set.
-      """
-    end
-
+  def execute_ddl({:drop_if_exists, %Index{} = index, _mode}) do
     execute_ddl({:drop_if_exists, index})
   end
 

test/ecto/adapters/sqlite3/connection_test.exs

@@ -2139,18 +2139,6 @@ defmodule Ecto.Adapters.SQLite3.ConnectionTest do
     assert execute_ddl(drop) == [~s|DROP TABLE "foo"."posts"|]
   end
 
-  test "drop table with cascade" do
-    drop = {:drop, table(:posts), :cascade}
-
-    assert_raise ArgumentError, fn ->
-      execute_ddl(drop)
-    end
-
-    assert_raise ArgumentError, fn ->
-      execute_ddl(drop)
-    end
-  end
-
   test "alter table" do
     alter =
       {:alter, table(:posts),
@@ -2314,13 +2302,6 @@ defmodule Ecto.Adapters.SQLite3.ConnectionTest do
     assert execute_ddl(drop) == [~s|DROP INDEX "foo"."posts$main"|]
   end
 
-  test "drop index mode not supported" do
-    assert_raise ArgumentError, fn ->
-      drop = {:drop, index(:posts, [:id], name: "posts$main"), :restrict}
-      execute_ddl(drop)
-    end
-  end
-
   test "drop index concurrently not supported" do
     index = index(:posts, [:id], name: "posts$main")
 
@@ -2330,18 +2311,6 @@ defmodule Ecto.Adapters.SQLite3.ConnectionTest do
     end
   end
 
-  test "drop index with cascade" do
-    assert_raise ArgumentError, fn ->
-      drop = {:drop, index(:posts, [:id], name: "posts$main"), :cascade}
-      execute_ddl(drop)
-    end
-
-    assert_raise ArgumentError, fn ->
-      drop = {:drop, index(:posts, [:id], name: "posts$main", prefix: :foo), :cascade}
-      execute_ddl(drop)
-    end
-  end
-
   test "drop constraint" do
     assert_raise ArgumentError,
                  ~r/SQLite3 does not support ALTER TABLE DROP CONSTRAINT./,