easy_orderable 0.1.0 → 0.2.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/easy_orderable/joiner.rb +1 -1
- data/lib/easy_orderable/order_arguments_transformer.rb +9 -5
- data/lib/easy_orderable/version.rb +1 -1
- data/spec/dummy/db/test.sqlite3 +0 -0
- data/spec/dummy/log/development.log +80 -0
- data/spec/dummy/log/test.log +519 -1827
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 4eada5c0b4316f63cf8b707fc376491417229fb2
|
4
|
+
data.tar.gz: ece2914966aed6814f6738849773e8690b67518d
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 945107acac61f88938172da23935ac44375eeeb24fd856420170434a750143270022fa576e747e5e5886751296869314ad2367ccbe783fd8110525c3c01eab79
|
7
|
+
data.tar.gz: 154dbf850ec4445332e5434e3d6c005f82809412e9f3a0bc96260097d46d24be0eb87c2bcc3a604ae84cc172fa991ecb113e9f1faf7c5f8c4de32b6d4951b9b8
|
@@ -16,7 +16,7 @@ module EasyOrderable
|
|
16
16
|
|
17
17
|
def association_names
|
18
18
|
table_names.map do |name|
|
19
|
-
if custom_association_names && custom_association_names.
|
19
|
+
if custom_association_names && custom_association_names.key?(name.to_sym)
|
20
20
|
custom_association_names[name.to_sym].to_sym
|
21
21
|
else
|
22
22
|
name.to_sym
|
@@ -5,12 +5,12 @@ module EasyOrderable
|
|
5
5
|
end
|
6
6
|
|
7
7
|
def call
|
8
|
-
args.
|
9
|
-
if
|
10
|
-
table_name, column_name =
|
11
|
-
"#{table_name.pluralize}.#{column_name} #{
|
8
|
+
args.map do |association, direction|
|
9
|
+
if association.include?('.')
|
10
|
+
table_name, column_name = association.split('.')
|
11
|
+
"#{quote(table_name.pluralize)}.#{quote(column_name)} #{direction}"
|
12
12
|
else
|
13
|
-
"#{
|
13
|
+
"#{quote(association)} #{direction}"
|
14
14
|
end
|
15
15
|
end
|
16
16
|
end
|
@@ -18,5 +18,9 @@ module EasyOrderable
|
|
18
18
|
private
|
19
19
|
|
20
20
|
attr_reader :args
|
21
|
+
|
22
|
+
def quote(name)
|
23
|
+
ActiveRecord::Base.connection.quote_column_name(name)
|
24
|
+
end
|
21
25
|
end
|
22
26
|
end
|
data/spec/dummy/db/test.sqlite3
CHANGED
Binary file
|
@@ -0,0 +1,80 @@
|
|
1
|
+
[1m[35m (0.2ms)[0m [1m[34mSELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC[0m
|
2
|
+
↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22
|
3
|
+
[1m[36mActiveRecord::InternalMetadata Load (0.2ms)[0m [1m[34mSELECT "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ? LIMIT ?[0m [["key", "environment"], ["LIMIT", 1]]
|
4
|
+
↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22
|
5
|
+
[1m[35m (0.1ms)[0m [1m[36mbegin transaction[0m
|
6
|
+
↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22
|
7
|
+
[1m[35m (0.0ms)[0m [1m[36mcommit transaction[0m
|
8
|
+
↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22
|
9
|
+
[1m[35m (0.1ms)[0m [1m[34mSELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC[0m
|
10
|
+
↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22
|
11
|
+
[1m[35m (0.2ms)[0m [1m[34mSELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC[0m
|
12
|
+
↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22
|
13
|
+
[1m[36mActiveRecord::InternalMetadata Load (0.2ms)[0m [1m[34mSELECT "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ? LIMIT ?[0m [["key", "environment"], ["LIMIT", 1]]
|
14
|
+
↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22
|
15
|
+
[1m[35m (0.1ms)[0m [1m[36mbegin transaction[0m
|
16
|
+
↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22
|
17
|
+
[1m[35m (0.0ms)[0m [1m[36mcommit transaction[0m
|
18
|
+
↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22
|
19
|
+
[1m[35m (0.1ms)[0m [1m[34mSELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC[0m
|
20
|
+
↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22
|
21
|
+
[1m[35m (0.1ms)[0m [1m[34mSELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC[0m
|
22
|
+
↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22
|
23
|
+
[1m[35m (0.2ms)[0m [1m[34mSELECT "ar_internal_metadata"."value" FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ?[0m [["key", "environment"]]
|
24
|
+
↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22
|
25
|
+
[1m[35m (0.1ms)[0m [1m[34mSELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC[0m
|
26
|
+
↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22
|
27
|
+
[1m[35m (0.1ms)[0m [1m[34mSELECT "ar_internal_metadata"."value" FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ?[0m [["key", "environment"]]
|
28
|
+
↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22
|
29
|
+
[1m[35m (0.1ms)[0m [1m[34mSELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC[0m
|
30
|
+
↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22
|
31
|
+
[1m[35m (0.1ms)[0m [1m[34mSELECT "ar_internal_metadata"."value" FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ?[0m [["key", "environment"]]
|
32
|
+
↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22
|
33
|
+
[1m[35m (0.1ms)[0m [1m[35mDROP TABLE IF EXISTS "bookings"[0m
|
34
|
+
↳ db/schema.rb:15
|
35
|
+
[1m[35m (0.2ms)[0m [1m[34mSELECT sqlite_version(*)[0m
|
36
|
+
↳ db/schema.rb:15
|
37
|
+
[1m[35m (1.1ms)[0m [1m[35mCREATE TABLE "bookings" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "slots_count" integer, "user_id" integer, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL)[0m
|
38
|
+
↳ db/schema.rb:15
|
39
|
+
[1m[35m (0.9ms)[0m [1m[35mCREATE INDEX "index_bookings_on_user_id" ON "bookings" ("user_id")[0m
|
40
|
+
↳ db/schema.rb:15
|
41
|
+
[1m[35m (0.1ms)[0m [1m[35mDROP TABLE IF EXISTS "requests"[0m
|
42
|
+
↳ db/schema.rb:23
|
43
|
+
[1m[35m (0.9ms)[0m [1m[35mCREATE TABLE "requests" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "description" varchar, "user_id" integer, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL)[0m
|
44
|
+
↳ db/schema.rb:23
|
45
|
+
[1m[35m (0.9ms)[0m [1m[35mCREATE INDEX "index_requests_on_user_id" ON "requests" ("user_id")[0m
|
46
|
+
↳ db/schema.rb:23
|
47
|
+
[1m[35m (0.1ms)[0m [1m[35mDROP TABLE IF EXISTS "users"[0m
|
48
|
+
↳ db/schema.rb:31
|
49
|
+
[1m[35m (0.9ms)[0m [1m[35mCREATE TABLE "users" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL)[0m
|
50
|
+
↳ db/schema.rb:31
|
51
|
+
[1m[35m (1.0ms)[0m [1m[35mCREATE TABLE "schema_migrations" ("version" varchar NOT NULL PRIMARY KEY)[0m
|
52
|
+
↳ db/schema.rb:13
|
53
|
+
[1m[35m (0.1ms)[0m [1m[34mSELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC[0m
|
54
|
+
↳ db/schema.rb:13
|
55
|
+
[1m[35m (0.8ms)[0m [1m[32mINSERT INTO "schema_migrations" (version) VALUES (20181213104620)[0m
|
56
|
+
↳ db/schema.rb:13
|
57
|
+
[1m[35m (0.9ms)[0m [1m[32mINSERT INTO "schema_migrations" (version) VALUES
|
58
|
+
(20181213104543),
|
59
|
+
(20181213104420);
|
60
|
+
|
61
|
+
[0m
|
62
|
+
↳ db/schema.rb:13
|
63
|
+
[1m[35m (1.0ms)[0m [1m[35mCREATE TABLE "ar_internal_metadata" ("key" varchar NOT NULL PRIMARY KEY, "value" varchar, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL)[0m
|
64
|
+
↳ db/schema.rb:13
|
65
|
+
[1m[36mActiveRecord::InternalMetadata Load (0.3ms)[0m [1m[34mSELECT "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ? LIMIT ?[0m [["key", "environment"], ["LIMIT", 1]]
|
66
|
+
↳ db/schema.rb:13
|
67
|
+
[1m[35m (0.0ms)[0m [1m[36mbegin transaction[0m
|
68
|
+
↳ db/schema.rb:13
|
69
|
+
[1m[36mActiveRecord::InternalMetadata Create (0.3ms)[0m [1m[32mINSERT INTO "ar_internal_metadata" ("key", "value", "created_at", "updated_at") VALUES (?, ?, ?, ?)[0m [["key", "environment"], ["value", "development"], ["created_at", "2019-01-21 10:03:34.308090"], ["updated_at", "2019-01-21 10:03:34.308090"]]
|
70
|
+
↳ db/schema.rb:13
|
71
|
+
[1m[35m (0.7ms)[0m [1m[36mcommit transaction[0m
|
72
|
+
↳ db/schema.rb:13
|
73
|
+
[1m[36mActiveRecord::InternalMetadata Load (0.1ms)[0m [1m[34mSELECT "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ? LIMIT ?[0m [["key", "environment"], ["LIMIT", 1]]
|
74
|
+
↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22
|
75
|
+
[1m[35m (0.0ms)[0m [1m[36mbegin transaction[0m
|
76
|
+
↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22
|
77
|
+
[1m[36mActiveRecord::InternalMetadata Update (0.3ms)[0m [1m[33mUPDATE "ar_internal_metadata" SET "value" = ?, "updated_at" = ? WHERE "ar_internal_metadata"."key" = ?[0m [["value", "test"], ["updated_at", "2019-01-21 10:03:34.312471"], ["key", "environment"]]
|
78
|
+
↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22
|
79
|
+
[1m[35m (0.6ms)[0m [1m[36mcommit transaction[0m
|
80
|
+
↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22
|