baza 0.0.9 → 0.0.10

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.10

data/baza.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "baza"
-  s.version = "0.0.9"
+  s.version = "0.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]

data/include/drivers/mysql/mysql_columns.rb

@@ -6,7 +6,7 @@ class Baza::Driver::Mysql::Columns
   end
   
   #Returns the SQL for this column.
-  DATA_SQL_ALLOWED_KEYS = [:type, :maxlength, :name, :primarykey, :autoincr, :default, :comment, :after, :first, :storage, :null]
+  DATA_SQL_ALLOWED_KEYS = [:type, :maxlength, :name, :primarykey, :autoincr, :default, :comment, :after, :first, :storage, :null, :renames]
   def data_sql(data)
     data.each do |key, val|
       raise "Invalid key: '#{key}' (#{key.class.name})." if !DATA_SQL_ALLOWED_KEYS.include?(key)

data/include/drivers/sqlite3/sqlite3_columns.rb

@@ -7,7 +7,7 @@ class Baza::Driver::Sqlite3::Columns
     @args = args
   end
   
-  DATA_SQL_ALLOWED_KEYS = [:name, :type, :maxlength, :autoincr, :primarykey, :null, :default, :default_func, :renames, :after]
+  DATA_SQL_ALLOWED_KEYS = [:name, :type, :maxlength, :autoincr, :primarykey, :null, :default, :default_func, :renames, :after, :renames]
   #Returns SQL for a knjdb-compatible hash.
   def data_sql(data)
     data.each do |key, val|

data/include/model_handler.rb

@@ -408,7 +408,7 @@ class Baza::ModelHandler
   
   #Searches for an object with the given data. If not found it creates it. Returns the found or created object in the end.
   def get_or_add(classname, data, args = nil)
-    obj = self.get_by(classname, data)
+    obj = self.get_by(classname, data.clone)
     obj = self.add(classname, data) if !obj
     return obj
   end

data/spec/model_handler_spec.rb

@@ -387,6 +387,26 @@ describe "Objects" do
     $ob.delete_ids(:class => :Person, :ids => ids)
   end
   
+  it "get_or_add" do
+    person1 = $ob.add(:Person, {
+      :name => "get_or_add"
+    })
+    
+    person2 = $ob.get_or_add(:Person, {
+      :name => "get_or_add"
+    })
+    
+    person2.id.should eql(person1.id)
+    person2[:name].should eql("get_or_add")
+    
+    person3 = $ob.get_or_add(:Person, {
+      :name => "get_or_add3"
+    })
+    
+    raise "Failure ID was the same" if person3.id == person2.id
+    person3[:name].should eql("get_or_add3")
+  end
+  
   it "should delete the temp database again." do
     db_path = "#{Knj::Os.tmpdir}/knjrbfw_test_sqlite3.sqlite3"
     File.unlink(db_path) if File.exists?(db_path)

metadata

@@ -2,7 +2,7 @@
 name: baza
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Kasper Johansen
@@ -250,7 +250,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: -33240531491757229
+      hash: 2079390994227772700
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false