schemerd 0.1.2 → 0.1.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/schemerd/generator.rb +21 -3
- data/lib/schemerd/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: e389e5da8e102a6cdf0b1d8cffde0204ed9f5d6f1fbbebfa014d0bb05cb380de
|
|
4
|
+
data.tar.gz: 686688594764b9159e2f06540436a348b7281a1ccc4337125bb9217581d39825
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 0f7357b7e446b7f62b9e9c56c01646a790b7eec2ea7f0a7adb8429067e83d4db2dd60b92e23be2cf81eb6168ac785550db96145a1a11b5e37f71f52952cf2130
|
|
7
|
+
data.tar.gz: 5e6025d37381bfd9310403a33032d106eaf315c26a65ceed14d61c4978c01e8d0b01e5e81654eea95704d81d82128afa9c8a6a763375535bff01a09741c774cb
|
data/lib/schemerd/generator.rb
CHANGED
|
@@ -60,7 +60,7 @@ module Schemerd
|
|
|
60
60
|
model_names = models.map(&:name).to_set
|
|
61
61
|
|
|
62
62
|
models.each do |model|
|
|
63
|
-
model.reflect_on_all_associations.each do |assoc|
|
|
63
|
+
model.reflect_on_all_associations.reject { |a| a.options[:through] }.each do |assoc|
|
|
64
64
|
target_name = assoc.klass.name rescue next
|
|
65
65
|
next unless model_names.include?(target_name)
|
|
66
66
|
|
|
@@ -81,8 +81,8 @@ module Schemerd
|
|
|
81
81
|
|
|
82
82
|
models.each do |model|
|
|
83
83
|
lines << " #{model.name} {"
|
|
84
|
-
model.columns.each do |col|
|
|
85
|
-
pk = col.name ==
|
|
84
|
+
sort_columns(model.columns).each do |col|
|
|
85
|
+
pk = col.name == model.primary_key ? "PK" : ""
|
|
86
86
|
type = col.type || "string"
|
|
87
87
|
lines << " #{type} #{col.name} #{pk}".rstrip
|
|
88
88
|
end
|
|
@@ -93,6 +93,22 @@ module Schemerd
|
|
|
93
93
|
lines
|
|
94
94
|
end
|
|
95
95
|
|
|
96
|
+
TIMESTAMP_COLUMNS = %w[created_at updated_at].freeze
|
|
97
|
+
|
|
98
|
+
def sort_columns(columns)
|
|
99
|
+
pk, timestamps, rest = [], [], []
|
|
100
|
+
columns.each do |col|
|
|
101
|
+
if col.name == "id"
|
|
102
|
+
pk << col
|
|
103
|
+
elsif TIMESTAMP_COLUMNS.include?(col.name)
|
|
104
|
+
timestamps << col
|
|
105
|
+
else
|
|
106
|
+
rest << col
|
|
107
|
+
end
|
|
108
|
+
end
|
|
109
|
+
pk + rest.sort_by(&:name) + timestamps.sort_by(&:name)
|
|
110
|
+
end
|
|
111
|
+
|
|
96
112
|
def relationship_line(source, target, assoc)
|
|
97
113
|
case assoc.macro
|
|
98
114
|
when :belongs_to
|
|
@@ -105,6 +121,8 @@ module Schemerd
|
|
|
105
121
|
"#{source} ||--o{ #{target} : \"#{assoc.name}\""
|
|
106
122
|
when :has_one
|
|
107
123
|
"#{source} ||--o| #{target} : \"#{assoc.name}\""
|
|
124
|
+
when :has_and_belongs_to_many
|
|
125
|
+
"#{source} }o--o{ #{target} : \"#{assoc.name}\""
|
|
108
126
|
end
|
|
109
127
|
end
|
|
110
128
|
end
|
data/lib/schemerd/version.rb
CHANGED