Sprinkle some more CI

Author: Connor Rigby

.circleci/config.yml

@@ -24,6 +24,7 @@ jobs:
             - v3-plt-cache
       - run: mix dialyzer --plt
       - run: mix dialyzer --halt-exit-status
+      - run: mix credo -a
       - run:
           command: mix coveralls.circle
           environment:

lib/esqlite3/esqlite3.ex

@@ -332,7 +332,7 @@ defmodule Esqlite3 do
 
       {:esqlite3, _ref, _resp} = stale ->
         :ok = Logger.warn("Ignoring stale answer: #{inspect(stale)}")
-        passed_mics = :timer.now_diff(:os.timestamp(), start) |> div(1000)
+        passed_mics = :os.timestamp() |> :timer.now_diff(start) |> div(1000)
 
         new_timeout =
           case timeout - passed_mics do

lib/sqlite.ex

@@ -78,8 +78,9 @@ defmodule Sqlite do
   def query(conn, sql, params, opts \\ []) do
     opts = opts |> defaults()
 
-    GenServer.call(conn.pid, {:query, sql, params, opts}, call_timeout(opts))
-    |> case do
+    r = GenServer.call(conn.pid, {:query, sql, params, opts}, call_timeout(opts))
+
+    case r do
       {:ok, %Sqlite.Result{}} = ok -> ok
       {:error, %Sqlite.Error{}} = ok -> ok
     end
@@ -110,8 +111,9 @@ defmodule Sqlite do
   def prepare(conn, sql, opts \\ []) do
     opts = opts |> defaults()
 
-    GenServer.call(conn.pid, {:prepare, sql, opts}, call_timeout(opts))
-    |> case do
+    r = GenServer.call(conn.pid, {:prepare, sql, opts}, call_timeout(opts))
+
+    case r do
       {:ok, %Sqlite.Query{}} = ok -> ok
       {:error, %Sqlite.Error{}} = ok -> ok
     end
@@ -140,8 +142,9 @@ defmodule Sqlite do
   def release_query(conn, query, opts \\ []) do
     opts = opts |> defaults()
 
-    GenServer.call(conn.pid, {:release_query, query, opts}, call_timeout(opts))
-    |> case do
+    r = GenServer.call(conn.pid, {:release_query, query, opts}, call_timeout(opts))
+
+    case r do
       :ok -> :ok
       {:error, %Sqlite.Error{}} = ok -> ok
     end
@@ -184,8 +187,9 @@ defmodule Sqlite do
   def execute(conn, query, params, opts \\ []) do
     opts = defaults(opts)
 
-    GenServer.call(conn.pid, {:execute, query, params, opts}, call_timeout(opts))
-    |> case do
+    r = GenServer.call(conn.pid, {:execute, query, params, opts}, call_timeout(opts))
+
+    case r do
       {:ok, %Sqlite.Result{}} = ok -> ok
       {:error, %Sqlite.Error{}} = ok -> ok
     end
@@ -210,8 +214,9 @@ defmodule Sqlite do
   def close(conn, opts \\ []) when is_list(opts) do
     opts = defaults(opts)
 
-    GenServer.call(conn.pid, {:close, opts}, call_timeout(opts))
-    |> case do
+    r = GenServer.call(conn.pid, {:close, opts}, call_timeout(opts))
+
+    case r do
       :ok -> :ok
       {:error, %Sqlite.Error{}} = ok -> ok
     end

lib/sqlite/server.ex

@@ -41,7 +41,7 @@ defmodule Sqlite.Server do
     try do
       with {:ok, %Query{} = q} <- build_query(sql, opts, state.database),
            :ok <- Esqlite3.bind(q.statement, params) do
-        r = Esqlite3.fetchall(q.statement) |> build_result(q, state)
+        r = q.statement |> Esqlite3.fetchall() |> build_result(q, state)
         {:reply, r, state}
       else
         err -> {:reply, error(err, state), state}
@@ -67,6 +67,7 @@ defmodule Sqlite.Server do
       case build_query(sql, opts, state.database) do
         {:ok, %Query{} = q} ->
           {:reply, {:ok, q}, state}
+
         err ->
           {:reply, error(err, state), state}
       end
@@ -79,7 +80,7 @@ defmodule Sqlite.Server do
     try do
       case Esqlite3.bind(query.statement, params, opts[:timeout]) do
         :ok ->
-          r = Esqlite3.fetchall(query.statement) |> build_result(query, state)
+          r = query.statement |> Esqlite3.fetchall() |> build_result(query, state)
           {:reply, r, state}
 
         err ->
@@ -117,8 +118,8 @@ defmodule Sqlite.Server do
 
     case Esqlite3.prepare(sql, database, timeout) do
       {:ok, statement} ->
-        cn = Esqlite3.column_names(statement, timeout) |> Tuple.to_list()
-        ct = Esqlite3.column_types(statement, timeout) |> Tuple.to_list()
+        cn = statement |> Esqlite3.column_names(timeout) |> Tuple.to_list()
+        ct = statement |> Esqlite3.column_types(timeout) |> Tuple.to_list()
         {:ok, %Sqlite.Query{column_names: cn, column_types: ct, statement: statement, sql: sql}}
 
       err ->

mix.exs

@@ -56,7 +56,8 @@ defmodule Esqlite.MixProject do
       {:dialyxir, "~> 0.5.1", runtime: false, only: :dev},
       {:excoveralls, "~> 0.8", only: :test, optional: true},
       {:ex_doc, "~> 0.18.3", runtime: false, only: :docs},
-      {:inch_ex, only: :docs, runtime: false}
+      {:inch_ex, only: :docs, runtime: false},
+      {:credo, "~> 0.9.0-rc1", only: [:dev, :test], runtime: false}
     ]
   end
 end

mix.lock

@@ -1,5 +1,7 @@
 %{
+  "bunt": {:hex, :bunt, "0.2.0", "951c6e801e8b1d2cbe58ebbd3e616a869061ddadcc4863d0a2182541acae9a38", [:mix], [], "hexpm"},
   "certifi": {:hex, :certifi, "2.0.0", "a0c0e475107135f76b8c1d5bc7efb33cd3815cb3cf3dea7aefdd174dabead064", [:rebar3], [], "hexpm"},
+  "credo": {:hex, :credo, "0.9.0-rc8", "30d8633408353d08db03f3ea5a14a2aaee84268c19b5198f5963916634a16558", [:mix], [{:bunt, "~> 0.2.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:poison, ">= 0.0.0", [hex: :poison, repo: "hexpm", optional: false]}], "hexpm"},
   "dialyxir": {:hex, :dialyxir, "0.5.1", "b331b091720fd93e878137add264bac4f644e1ddae07a70bf7062c7862c4b952", [:mix], [], "hexpm"},
   "earmark": {:hex, :earmark, "1.2.4", "99b637c62a4d65a20a9fb674b8cffb8baa771c04605a80c911c4418c69b75439", [:mix], [], "hexpm"},
   "elixir_make": {:hex, :elixir_make, "0.4.1", "6628b86053190a80b9072382bb9756a6c78624f208ec0ff22cb94c8977d80060", [:mix], [], "hexpm"},