Add build automation support to test Elixir 1.5.1. (#189)

* Add build automation support to test Elixir 1.5.1.

* Replace now-deprecated String.rstrip/2 with String.trim_trailing/2.

* Fix issues flagged by newer version of Credo.

* Fix error in the new String.trim_trailing/2 invocation.

Author: scouten

.travis.yml

@@ -2,17 +2,24 @@ language: elixir
 
 elixir:
   - 1.3.4
-  - 1.4.2
+  - 1.4.4
+  - 1.5.1
 
 otp_release:
   - 18.0
-  - 19.1
-  - 19.2
+  - 19.3
+  - 20.0
 
 matrix:
   exclude:
   - elixir: 1.3.4
-    otp_release: 19.2
+    otp_release: 19.3
+  - elixir: 1.3.4
+    otp_release: 20.0
+  - elixir: 1.4.4
+    otp_release: 20.0
+  - elixir: 1.5.1
+    otp_release: 18.0
 
 script:
   - mix deps.get && ./integration/hack_out_incompatible_tests.sh && mix test --cover

lib/sqlite_db_connection/query.ex

@@ -20,7 +20,7 @@ defmodule Sqlite.DbConnection.Query do
     result_formats: [:binary | :text] | nil,
     types:          Sqlite.DbConnection.TypeServer.table | nil}
 
-  defstruct [:name, :statement, :prepared,:columns, :result_formats, :types]
+  defstruct [:name, :statement, :prepared, :columns, :result_formats, :types]
 end
 
 defimpl DBConnection.Query, for: Sqlite.DbConnection.Query do
@@ -79,7 +79,7 @@ defimpl DBConnection.Query, for: Sqlite.DbConnection.Query do
   defp translate_value({float, "decimal(" <> rest}) do
     [precision, scale] =
       rest
-      |> String.rstrip(?))
+      |> String.trim_trailing(")")
       |> String.split(",")
       |> Enum.map(&String.to_integer/1)
 
@@ -120,7 +120,7 @@ defimpl DBConnection.Query, for: Sqlite.DbConnection.Query do
   end
   defp string_to_datetime(str) do
     <<yr::binary-size(4), "-", mo::binary-size(2), "-", da::binary-size(2), " ", hr::binary-size(2), ":", mi::binary-size(2), ":", se::binary-size(2), ".", fr::binary-size(6)>> = str
-    {{String.to_integer(yr), String.to_integer(mo), String.to_integer(da)},{String.to_integer(hr), String.to_integer(mi), String.to_integer(se), String.to_integer(fr)}}
+    {{String.to_integer(yr), String.to_integer(mo), String.to_integer(da)}, {String.to_integer(hr), String.to_integer(mi), String.to_integer(se), String.to_integer(fr)}}
   end
 end
 

lib/sqlite_ecto/connection.ex

@@ -72,7 +72,9 @@ if Code.ensure_loaded?(Sqlitex.Server) do
     end
 
     alias Ecto.Query
-    alias Ecto.Query.{BooleanExpr, JoinExpr, QueryExpr}
+    alias Ecto.Query.BooleanExpr
+    alias Ecto.Query.JoinExpr
+    alias Ecto.Query.QueryExpr
 
     def all(%Ecto.Query{lock: lock}) when lock != nil do
       raise ArgumentError, "locks are not supported by SQLite"
@@ -564,7 +566,10 @@ if Code.ensure_loaded?(Sqlitex.Server) do
 
     # DDL
 
-    alias Ecto.Migration.{Table, Index, Reference, Constraint}
+    alias Ecto.Migration.Table
+    alias Ecto.Migration.Index
+    alias Ecto.Migration.Reference
+    alias Ecto.Migration.Constraint
 
     @drops [:drop, :drop_if_exists]
 

test/sqlite_ecto_test.exs

@@ -306,7 +306,7 @@ defmodule Sqlite.Ecto2.Test do
     assert SQL.all(query) == ~s{SELECT CAST (?1 AS TEXT) FROM "schema" AS s0}
 
     assert_raise ArgumentError, "Array type is not supported by SQLite", fn ->
-      query = Schema |> select([], type(^[1,2,3], {:array, :integer})) |> normalize
+      query = Schema |> select([], type(^[1, 2, 3], {:array, :integer})) |> normalize
       SQL.all(query)
     end
   end
@@ -321,7 +321,7 @@ defmodule Sqlite.Ecto2.Test do
     query = Schema |> select([e], 1 in []) |> normalize
     assert SQL.all(query) == ~s{SELECT 1 IN () FROM "schema" AS s0}
 
-    query = Schema |> select([e], 1 in [1,e.x,3]) |> normalize
+    query = Schema |> select([e], 1 in [1, e.x, 3]) |> normalize
     assert SQL.all(query) == ~s{SELECT 1 IN (1,s0."x",3) FROM "schema" AS s0}
 
     query = Schema |> select([e], 1 in ^[]) |> normalize