Merge pull request #477 from martosaur/am/sqlite_tests

Setup SQLite tests

.formatter.exs

@@ -1,6 +1,9 @@
 # Used by "mix format"
 [
-  inputs: ["{mix,.formatter}.exs", "{config,lib,test}/**/*.{ex,exs}"],
+  inputs: [
+    "{mix,.formatter}.exs",
+    "{config,lib,test}/**/*.{ex,exs}"
+  ],
   line_length: 80,
   import_deps: [:ecto, :stream_data]
 ]

.github/workflows/ci.yml

@@ -54,7 +54,7 @@ jobs:
       - name: Compile
         run: mix compile --warnings-as-errors
       - name: Run Tests
-        run: mix coveralls.json --warnings-as-errors
+        run: mix coveralls.json.all --warnings-as-errors
       - uses: codecov/codecov-action@v4
         with:
           files: ./cover/excoveralls.json
@@ -112,8 +112,10 @@ jobs:
           mix local.rebar --force
           mix local.hex --force
           mix deps.get
-      - name: Run Tests
+      - name: Run Base Tests
         run: mix test
+      - name: Run Postgres Tests
+        run: mix test.postgres
 
   matrix-results:
     if: ${{ always() }}

.gitignore

@@ -24,3 +24,6 @@ flop-*.tar
 
 # Ignore dialyzer PLT
 .plts
+
+# Test SQLite DB lives here
+/tmp/

config/test.exs

@@ -4,13 +4,6 @@ config :flop,
   ecto_repos: [Flop.Repo],
   repo: Flop.Repo
 
-config :flop, Flop.Repo,
-  username: "postgres",
-  password: "postgres",
-  database: "flop_test#{System.get_env("MIX_TEST_PARTITION")}",
-  hostname: "localhost",
-  pool: Ecto.Adapters.SQL.Sandbox
-
 config :stream_data,
   max_runs: if(System.get_env("CI"), do: 100, else: 50),
   max_run_time: if(System.get_env("CI"), do: 3000, else: 200)

docker-compose.yml

@@ -1,4 +1,3 @@
-version: "3.7"
 services:
   postgres:
     image: postgres:12-alpine

mix.exs

@@ -3,6 +3,7 @@ defmodule Flop.MixProject do
 
   @source_url "https://github.com/woylie/flop"
   @version "0.26.1"
+  @adapters ~w(postgres sqlite)
 
   def project do
     [
@@ -13,16 +14,21 @@ defmodule Flop.MixProject do
       elixirc_paths: elixirc_paths(Mix.env()),
       deps: deps(),
       test_coverage: [tool: ExCoveralls],
+      test_paths: test_paths(System.get_env("ECTO_ADAPTER")),
       preferred_cli_env: [
         "coveralls.detail": :test,
         "coveralls.github": :test,
         "coveralls.html": :test,
+        "coveralls.html.all": :test,
         "coveralls.json": :test,
+        "coveralls.json.all": :test,
         "coveralls.post": :test,
         "ecto.create": :test,
         "ecto.drop": :test,
         "ecto.migrate": :test,
         "ecto.reset": :test,
+        "test.all": :test,
+        "test.adapters": :test,
         coveralls: :test,
         dialyzer: :test
       ],
@@ -65,6 +71,7 @@ defmodule Flop.MixProject do
       {:excoveralls, "~> 0.10", only: :test},
       {:nimble_options, "~> 1.0"},
       {:postgrex, ">= 0.0.0", only: :test},
+      {:ecto_sqlite3, "~> 0.17.0", only: :test},
       {:stream_data, "~> 1.0", only: [:dev, :test]}
     ]
   end
@@ -104,8 +111,57 @@ defmodule Flop.MixProject do
 
   defp aliases do
     [
-      "ecto.reset": ["ecto.drop", "ecto.create --quiet", "ecto.migrate"],
-      test: ["ecto.create --quiet", "ecto.migrate", "test"]
+      "test.all": ["test", "test.adapters"],
+      "test.postgres": &test_adapters(["postgres"], &1),
+      "test.sqlite": &test_adapters(["sqlite"], &1),
+      "test.adapters": &test_adapters/1,
+      "coveralls.html.all": [
+        "test.adapters --cover",
+        "coveralls.html --import-cover cover"
+      ],
+      "coveralls.json.all": [
+        # only run postgres and base tests for coverage until sqlite tests are
+        # fixed
+        fn _ -> test_adapters(["postgres"], ["--cover"]) end,
+        "coveralls.json --import-cover cover"
+      ]
     ]
   end
+
+  defp test_paths(adapter) when adapter in @adapters,
+    do: ["test/adapters/ecto/#{adapter}"]
+
+  defp test_paths(nil), do: ["test/base"]
+
+  defp test_paths(adapter) do
+    raise """
+    unknown Ecto adapter
+
+    Expected ECTO_ADAPTER to be one of: #{inspect(@adapters)}
+
+    Got: #{inspect(adapter)}
+    """
+  end
+
+  defp test_adapters(adapters \\ @adapters, args) do
+    for adapter <- adapters do
+      IO.puts("==> Running tests for ECTO_ADAPTER=#{adapter} mix test")
+
+      {_, res} =
+        System.cmd(
+          "mix",
+          ["test", ansi_option(), "--export-coverage=#{adapter}" | args],
+          into: IO.binstream(:stdio, :line),
+          env: [{"ECTO_ADAPTER", adapter}]
+        )
+
+      if res > 0 do
+        System.at_exit(fn _ -> exit({:shutdown, 1}) end)
+      end
+    end
+  end
+
+  defp ansi_option do
+    if IO.ANSI.enabled?(), do: "--color", else: "--no-color"
+  end
 end

mix.lock

@@ -1,16 +1,20 @@
 %{
   "bunt": {:hex, :bunt, "1.0.0", "081c2c665f086849e6d57900292b3a161727ab40431219529f13c4ddcf3e7a44", [:mix], [], "hexpm", "dc5f86aa08a5f6fa6b8096f0735c4e76d54ae5c9fa2c143e5a1fc7c1cd9bb6b5"},
+  "cc_precompiler": {:hex, :cc_precompiler, "0.1.10", "47c9c08d8869cf09b41da36538f62bc1abd3e19e41701c2cea2675b53c704258", [:mix], [{:elixir_make, "~> 0.7", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "f6e046254e53cd6b41c6bacd70ae728011aa82b2742a80d6e2214855c6e06b22"},
   "credo": {:hex, :credo, "1.7.7", "771445037228f763f9b2afd612b6aa2fd8e28432a95dbbc60d8e03ce71ba4446", [:mix], [{:bunt, "~> 0.2.1 or ~> 1.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "8bc87496c9aaacdc3f90f01b7b0582467b69b4bd2441fe8aae3109d843cc2f2e"},
   "db_connection": {:hex, :db_connection, "2.7.0", "b99faa9291bb09892c7da373bb82cba59aefa9b36300f6145c5f201c7adf48ec", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "dcf08f31b2701f857dfc787fbad78223d61a32204f217f15e881dd93e4bdd3ff"},
   "decimal": {:hex, :decimal, "2.1.1", "5611dca5d4b2c3dd497dec8f68751f1f1a54755e8ed2a966c2633cf885973ad6", [:mix], [], "hexpm", "53cfe5f497ed0e7771ae1a475575603d77425099ba5faef9394932b35020ffcc"},
   "dialyxir": {:hex, :dialyxir, "1.4.3", "edd0124f358f0b9e95bfe53a9fcf806d615d8f838e2202a9f430d59566b6b53b", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "bf2cfb75cd5c5006bec30141b131663299c661a864ec7fbbc72dfa557487a986"},
   "earmark_parser": {:hex, :earmark_parser, "1.4.41", "ab34711c9dc6212dda44fcd20ecb87ac3f3fce6f0ca2f28d4a00e4154f8cd599", [:mix], [], "hexpm", "a81a04c7e34b6617c2792e291b5a2e57ab316365c2644ddc553bb9ed863ebefa"},
   "ecto": {:hex, :ecto, "3.12.3", "1a9111560731f6c3606924c81c870a68a34c819f6d4f03822f370ea31a582208", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "9efd91506ae722f95e48dc49e70d0cb632ede3b7a23896252a60a14ac6d59165"},
   "ecto_sql": {:hex, :ecto_sql, "3.12.0", "73cea17edfa54bde76ee8561b30d29ea08f630959685006d9c6e7d1e59113b7d", [:mix], [{:db_connection, "~> 2.4.1 or ~> 2.5", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.12", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.7", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.19 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "dc9e4d206f274f3947e96142a8fdc5f69a2a6a9abb4649ef5c882323b6d512f0"},
+  "ecto_sqlite3": {:hex, :ecto_sqlite3, "0.17.2", "200226e057f76c40be55fbac77771eb1a233260ab8ec7283f5da6d9402bde8de", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ecto, "~> 3.12", [hex: :ecto, repo: "hexpm", optional: false]}, {:ecto_sql, "~> 3.12", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:exqlite, "~> 0.22", [hex: :exqlite, repo: "hexpm", optional: false]}], "hexpm", "a3838919c5a34c268c28cafab87b910bcda354a9a4e778658da46c149bb2c1da"},
+  "elixir_make": {:hex, :elixir_make, "0.8.4", "4960a03ce79081dee8fe119d80ad372c4e7badb84c493cc75983f9d3bc8bde0f", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.0", [hex: :certifi, repo: "hexpm", optional: true]}], "hexpm", "6e7f1d619b5f61dfabd0a20aa268e575572b542ac31723293a4c1a567d5ef040"},
   "erlex": {:hex, :erlex, "0.2.7", "810e8725f96ab74d17aac676e748627a07bc87eb950d2b83acd29dc047a30595", [:mix], [], "hexpm", "3ed95f79d1a844c3f6bf0cea61e0d5612a42ce56da9c03f01df538685365efb0"},
   "ex_doc": {:hex, :ex_doc, "0.34.2", "13eedf3844ccdce25cfd837b99bea9ad92c4e511233199440488d217c92571e8", [:mix], [{:earmark_parser, "~> 1.4.39", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_c, ">= 0.1.0", [hex: :makeup_c, repo: "hexpm", optional: true]}, {:makeup_elixir, "~> 0.14 or ~> 1.0", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1 or ~> 1.0", [hex: :makeup_erlang, repo: "hexpm", optional: false]}, {:makeup_html, ">= 0.1.0", [hex: :makeup_html, repo: "hexpm", optional: true]}], "hexpm", "5ce5f16b41208a50106afed3de6a2ed34f4acfd65715b82a0b84b49d995f95c1"},
   "ex_machina": {:hex, :ex_machina, "2.8.0", "a0e847b5712065055ec3255840e2c78ef9366634d62390839d4880483be38abe", [:mix], [{:ecto, "~> 2.2 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_sql, "~> 3.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}], "hexpm", "79fe1a9c64c0c1c1fab6c4fa5d871682cb90de5885320c187d117004627a7729"},
   "excoveralls": {:hex, :excoveralls, "0.18.3", "bca47a24d69a3179951f51f1db6d3ed63bca9017f476fe520eb78602d45f7756", [:mix], [{:castore, "~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "746f404fcd09d5029f1b211739afb8fb8575d775b21f6a3908e7ce3e640724c6"},
+  "exqlite": {:hex, :exqlite, "0.23.0", "6e851c937a033299d0784994c66da24845415072adbc455a337e20087bce9033", [:make, :mix], [{:cc_precompiler, "~> 0.1", [hex: :cc_precompiler, repo: "hexpm", optional: false]}, {:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.8", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:table, "~> 0.1.0", [hex: :table, repo: "hexpm", optional: true]}], "hexpm", "404341cceec5e6466aaed160cf0b58be2019b60af82588c215e1224ebd3ec831"},
   "file_system": {:hex, :file_system, "1.0.1", "79e8ceaddb0416f8b8cd02a0127bdbababe7bf4a23d2a395b983c1f8b3f73edd", [:mix], [], "hexpm", "4414d1f38863ddf9120720cd976fce5bdde8e91d8283353f0e31850fa89feb9e"},
   "jason": {:hex, :jason, "1.4.4", "b9226785a9aa77b6857ca22832cffa5d5011a667207eb2a0ad56adb5db443b8a", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "c5eb0cab91f094599f94d55bc63409236a8ec69a21a67814529e8d5f6cc90b3b"},
   "makeup": {:hex, :makeup, "1.1.2", "9ba8837913bdf757787e71c1581c21f9d2455f4dd04cfca785c70bbfff1a76a3", [:mix], [{:nimble_parsec, "~> 1.2.2 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "cce1566b81fbcbd21eca8ffe808f33b221f9eee2cbc7a1706fc3da9ff18e6cac"},