Merge branch 'master' into server+prepared-stmt-cache

Author: scouten

.gitignore

@@ -1,4 +1,5 @@
 /_build
+/cover
 /deps
 erl_crash.dump
 *.ez

lib/sqlitex/row.ex

@@ -6,7 +6,7 @@ defmodule Sqlitex.Row do
   end
 
   defp build_row(_types, _columns, row, :raw_list) do
-    row |> Tuple.to_list
+    Tuple.to_list(row)
   end
   defp build_row(types, columns, row, into) do
     types = Enum.map(types, fn type ->

lib/sqlitex/sql_builder.ex

@@ -23,7 +23,7 @@ defmodule Sqlitex.SqlBuilder do
   defp table_opt(:temp), do: {:temp, "TEMP"}
   defp table_opt({:primary_key, cols}) when is_list(cols) do
     {
-      :primary_key, ",PRIMARY KEY (" 
+      :primary_key, ",PRIMARY KEY ("
       # Also quote the columns in a PRIMARY KEY list
       <> (cols |> Enum.map(&(~s("#{&1}"))) |> Enum.join(","))
       <> ")"

mix.exs

@@ -7,6 +7,12 @@ defmodule Sqlitex.Mixfile do
      elixir: "~> 1.2",
      deps: deps(),
      package: package(),
+     test_coverage: [tool: ExCoveralls],
+     preferred_cli_env: [
+        "coveralls": :test,
+        "coveralls.detail": :test,
+        "coveralls.post": :test,
+        "coveralls.html": :test],
      description: """
       A thin Elixir wrapper around esqlite
     """]
@@ -26,6 +32,7 @@ defmodule Sqlitex.Mixfile do
       {:credo, "~> 0.4", only: :dev},
       {:dialyze, "~> 0.2.0", only: :dev},
       {:earmark, "~> 0.2.1", only: :dev},
+      {:excoveralls, "~> 0.6", only: :test},
       {:ex_doc, "~> 0.11", only: :dev},
       {:inch_ex, "~> 0.5", only: :dev},
 

test/sql_builder_test.exs

@@ -16,7 +16,7 @@ defmodule SqlBuilderTest do
     sql = Sql.create_table(:dinosaurs, [primary_key: :id], id: :integer, name: :text)
     assert sql == "CREATE  TABLE \"dinosaurs\" (\"id\" integer, \"name\" text ,PRIMARY KEY (\"id\"))"
   end
- 
+
   test "creating a table with multiple primary keys" do
     sql = Sql.create_table(:dinosaurs, [primary_key: [:id, :type]], id: :integer, type: :integer, name: :text)
     assert sql == "CREATE  TABLE \"dinosaurs\" (\"id\" integer, \"type\" integer, \"name\" text ,PRIMARY KEY (\"id\",\"type\"))"

test/sqlitex_test.exs

@@ -32,12 +32,12 @@ defmodule SqlitexTest do
   end
 
   test "a basic query returns a list of keyword lists", context do
-    {:ok, [row]} = context[:golf_db] |> Sqlitex.query("SELECT * FROM players ORDER BY id LIMIT 1")
+    {:ok, [row]} = Sqlitex.query(context[:golf_db], "SELECT * FROM players ORDER BY id LIMIT 1")
     assert row == [id: 1, name: "Mikey", created_at: {{2012,10,14},{05,46,28,318_107}}, updated_at: {{2013,09,06},{22,29,36,610_911}}, type: nil]
   end
 
   test "a basic query returns a list of maps when into: %{} is given", context do
-    {:ok, [row]} = context[:golf_db] |> Sqlitex.query("SELECT * FROM players ORDER BY id LIMIT 1", into: %{})
+    {:ok, [row]} = Sqlitex.query(context[:golf_db], "SELECT * FROM players ORDER BY id LIMIT 1", into: %{})
     assert row == %{id: 1, name: "Mikey", created_at: {{2012,10,14},{05,46,28,318_107}}, updated_at: {{2013,09,06},{22,29,36,610_911}}, type: nil}
   end
 
@@ -62,12 +62,12 @@ defmodule SqlitexTest do
   end
 
   test "a parameterized query", context do
-    {:ok, [row]} = context[:golf_db] |> Sqlitex.query("SELECT id, name FROM players WHERE name LIKE ?1 AND type == ?2", bind: ["s%", "Team"])
+    {:ok, [row]} = Sqlitex.query(context[:golf_db], "SELECT id, name FROM players WHERE name LIKE ?1 AND type == ?2", bind: ["s%", "Team"])
     assert row == [id: 25, name: "Slothstronauts"]
   end
 
   test "a parameterized query into %{}", context do
-    {:ok, [row]} = context[:golf_db] |> Sqlitex.query("SELECT id, name FROM players WHERE name LIKE ?1 AND type == ?2", bind: ["s%", "Team"], into: %{})
+    {:ok, [row]} = Sqlitex.query(context[:golf_db], "SELECT id, name FROM players WHERE name LIKE ?1 AND type == ?2", bind: ["s%", "Team"], into: %{})
     assert row == %{id: 25, name: "Slothstronauts"}
   end
 
@@ -155,20 +155,20 @@ defmodule SqlitexTest do
   end
 
   test "query_rows returns {:ok, data}", context do
-    {:ok, result} = context[:golf_db] |> Sqlitex.query_rows("SELECT id, name FROM players WHERE name LIKE ?1 AND type == ?2", bind: ["s%", "Team"])
+    {:ok, result} = Sqlitex.query_rows(context[:golf_db], "SELECT id, name FROM players WHERE name LIKE ?1 AND type == ?2", bind: ["s%", "Team"])
     %{rows: rows, columns: columns, types: types} = result
     assert rows == [[25, "Slothstronauts"]]
     assert columns == [:id, :name]
     assert types == [:INTEGER, :"varchar(255)"]
   end
 
   test "query_rows return {:error, reason}", context do
-    {:error, reason} = context[:golf_db] |> Sqlitex.query_rows("SELECT wat FROM players")
+    {:error, reason} = Sqlitex.query_rows(context[:golf_db], "SELECT wat FROM players")
     assert reason == {:sqlite_error, 'no such column: wat'}
   end
 
   test "query_rows! returns data", context do
-    result = context[:golf_db] |> Sqlitex.query_rows!("SELECT id, name FROM players WHERE name LIKE ?1 AND type == ?2", bind: ["s%", "Team"])
+    result = Sqlitex.query_rows!(context[:golf_db], "SELECT id, name FROM players WHERE name LIKE ?1 AND type == ?2", bind: ["s%", "Team"])
     %{rows: rows, columns: columns, types: types} = result
     assert rows == [[25, "Slothstronauts"]]
     assert columns == [:id, :name]
@@ -177,7 +177,7 @@ defmodule SqlitexTest do
 
   test "query_rows! raises on error", context do
     assert_raise Sqlitex.QueryError, "Query failed: {:sqlite_error, 'no such column: wat'}", fn ->
-      [_res] = context[:golf_db] |> Sqlitex.query_rows!("SELECT wat FROM players")
+      [_res] = Sqlitex.query_rows!(context[:golf_db], "SELECT wat FROM players")
     end
   end
 

test/statement_test.exs

@@ -5,8 +5,9 @@ defmodule StatementTest do
   test "fetch_all! works" do
     {:ok, db} = Sqlitex.open(":memory:")
 
-    result = Sqlitex.Statement.prepare!(db, "PRAGMA user_version;")
-             |> Sqlitex.Statement.fetch_all!
+    result = db
+              |> Sqlitex.Statement.prepare!("PRAGMA user_version;")
+              |> Sqlitex.Statement.fetch_all!
 
     assert result == [[user_version: 0]]
   end