Skip to content

Commit 64661f3

Browse files
committed
no parenthesis on ecto DSL function + assert_fields
1 parent 4096ed3 commit 64661f3

6 files changed

Lines changed: 126 additions & 137 deletions

File tree

.formatter.exs

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,36 @@
11
# Used by "mix format"
22
[
3-
inputs: ["mix.exs", "{config,lib,test,examples}/**/*.{ex,exs}"]
3+
inputs: [
4+
"mix.exs",
5+
".formatter.exs",
6+
"{config,lib,test,examples}/**/*.{ex,exs}"
7+
],
8+
locals_without_parens: [
9+
# Query
10+
from: 2,
11+
12+
# Schema
13+
field: 1,
14+
field: 2,
15+
field: 3,
16+
timestamps: 0,
17+
timestamps: 1,
18+
belongs_to: 2,
19+
belongs_to: 3,
20+
has_one: 2,
21+
has_one: 3,
22+
has_many: 2,
23+
has_many: 3,
24+
many_to_many: 2,
25+
many_to_many: 3,
26+
embeds_one: 2,
27+
embeds_one: 3,
28+
embeds_one: 4,
29+
embeds_many: 2,
30+
embeds_many: 3,
31+
embeds_many: 4,
32+
33+
# Test assertion
34+
assert_fields: 2
35+
]
436
]

examples/simple/lib/simple.ex

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ defmodule Weather do
2121
@primary_key {:id, :binary_id, autogenerate: true}
2222

2323
schema "weather" do
24-
field(:city, :string)
25-
field(:temp_lo, :integer)
26-
field(:temp_hi, :integer)
27-
field(:prcp, :float, default: 0.0)
24+
field :city, :string
25+
field :temp_lo, :integer
26+
field :temp_hi, :integer
27+
field :prcp, :float, default: 0.0
2828
timestamps
2929
end
3030
end
@@ -34,11 +34,9 @@ defmodule Simple do
3434

3535
def sample_query do
3636
query =
37-
from(
38-
w in Weather,
37+
from w in Weather,
3938
where: w.prcp > 0.0 or is_nil(w.prcp),
4039
select: w
41-
)
4240

4341
Simple.Repo.all(query)
4442
end

lib/mongo_ecto.ex

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,6 @@ defmodule Mongo.Ecto do
542542
}}
543543
end
544544

545-
546545
# Copy from the Elixir 1.4.5. TODO: Replace with native methods, when we stick on ~> 1.4.
547546
# Source: https://github.com/elixir-lang/elixir/blob/v1.4/lib/elixir/lib/calendar.ex#L1477
548547
defp datetime_from_naive!(naive_datetime, time_zone) do

test/mongo_ecto/migrations_test.exs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ defmodule Mongo.Ecto.MigrationsTest do
5656
use Ecto.Integration.Schema
5757

5858
schema "rename_migration" do
59-
field(:to_be_renamed, :integer)
60-
field(:was_renamed, :integer)
59+
field :to_be_renamed, :integer
60+
field :was_renamed, :integer
6161
end
6262
end
6363

@@ -131,7 +131,7 @@ defmodule Mongo.Ecto.MigrationsTest do
131131
assert :ok == up(TestRepo, 20_150_718_120_000, RenameColumnMigration, log: false)
132132

133133
assert {nil, 1} ==
134-
TestRepo.one(from(p in RenameSchema, select: {p.to_be_renamed, p.was_renamed}))
134+
TestRepo.one(from p in RenameSchema, select: {p.to_be_renamed, p.was_renamed})
135135

136136
:ok = down(TestRepo, 20_150_718_120_000, RenameColumnMigration, log: false)
137137
end

0 commit comments

Comments
 (0)