add collate options to :string column

Author: kevinlang

lib/ecto/adapters/sqlite3/data_type.ex

@@ -14,6 +14,18 @@ defmodule Ecto.Adapters.SQLite3.DataType do
   def column_type(:bigint, _opts), do: "INTEGER"
   # TODO: We should make this configurable
   def column_type(:binary_id, _opts), do: "TEXT"
+
+  def column_type(:string, opts) when is_list(opts) do
+    collate = Keyword.get(opts, :collate)
+
+    if collate do
+      str = collate |> Atom.to_string() |> String.upcase()
+      "TEXT COLLATE #{str}"
+    else
+      "TEXT"
+    end
+  end
+
   def column_type(:string, _opts), do: "TEXT"
   def column_type(:float, _opts), do: "NUMERIC"
   def column_type(:binary, _opts), do: "BLOB"

test/ecto/adapters/sqlite3/data_type_test.exs

@@ -24,6 +24,10 @@ defmodule Ecto.Adapters.SQLite3.DataTypeTest do
       assert DataType.column_type(:string, nil) == "TEXT"
     end
 
+    test ":string, collate: :nocase is TEXT COLLATE NOCASE" do
+      assert DataType.column_type(:string, collate: :nocase) == "TEXT COLLATE NOCASE"
+    end
+
     test ":uuid is TEXT" do
       assert DataType.column_type(:uuid, nil) == "TEXT"
     end

test/ecto/integration/crud_test.exs

@@ -191,5 +191,17 @@ defmodule Ecto.Integration.CrudTest do
       assert [] = TestRepo.all from a in Account, where: a.name in ["404"]
       assert [_] = TestRepo.all from a in Account, where: a.name in ["hi"]
     end
+
+    test "handles case sensitive text" do
+      TestRepo.insert!(%Account{name: "hi"})
+      assert [_] = TestRepo.all from a in Account, where: a.name == "hi"
+      assert [] = TestRepo.all from a in Account, where: a.name == "HI"
+    end
+
+    test "handles case insensitive text" do
+      TestRepo.insert!(%Account{name: "hi", email: "[email protected]"})
+      assert [_] = TestRepo.all from a in Account, where: a.email == "[email protected]"
+      assert [_] = TestRepo.all from a in Account, where: a.email == "[email protected]"
+    end
   end
 end

test/support/migration.ex

@@ -4,6 +4,7 @@ defmodule EctoSQLite3.Integration.Migration do
   def change do
     create table(:accounts) do
       add(:name, :string)
+      add(:email, :string, collate: :nocase)
       timestamps()
     end
 

test/support/schemas.ex

@@ -8,6 +8,7 @@ defmodule EctoSQLite3.Integration.Account do
 
   schema "accounts" do
     field(:name, :string)
+    field(:email, :string)
 
     timestamps()