Merge pull request maxdemarzi#7 from blizkreeg/working

use Hash merge instead of assignment to allow for property mixins
willkessler · Jul 17, 2013 · 2261f3c · 2261f3c
2 parents 49e4951 + 53cb809
commit 2261f3c
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/deja/schema_generator.rb b/lib/deja/schema_generator.rb
@@ -23,7 +23,8 @@ def schema
       end
 
       def attributes(attrs)
-        @@all_attributes[self.name] = attrs
+        @@all_attributes[self.name] ||= {}
+        @@all_attributes[self.name].merge!(attrs)
         attrs.each do |attr, type|
           send(:attr_accessor, attr)
         end