composite_primary_keys 6.0.3 → 6.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWNiZWUyNjQ5MTQ5Y2UzYTI4Nzg1NjcyOGMxOTBhYzJmZTAzMmZmNQ==
+    ZTRiYTBhMGQzN2IxNDdkMGZhNjE1MGQ3NDc2ZWZkYTI2NWQ2Nzg1ZQ==
   data.tar.gz: !binary |-
-    OWM0NTg5MmYyMzI5OTViODJmYTJlYmZhOGEyOWNjMjY2MWQzMzNjYQ==
+    YzNmMGQzNmIxODQ1NTk1ODk1ZDJjMTk4OTg4NDIxZDZlM2I5NzI4Nw==
 SHA512:
   metadata.gz: !binary |-
-    MzE2Y2ViOTJiMDVkZGU4ZTQwMTJjODBjZjViN2ZmOGViMGI5MDJmOGQ1YTMw
-    OGMxYzg1YjhjNDVkMTYzZjIyNzU3Njg5YWI5YzY4NjY5NTJmYWY0NDllZGI1
-    ZmIxZmY0MjMxYzkyN2IzNmU0ZTgyZjk3MGUyYWZkMzkyNmMwMjU=
+    MWYyNTQwMDYyNTgxYmMyM2FjMTdlMjg2ZWU5Yjg4OTZjOTc5YzIzNzRlZDAx
+    MjhmNzk3NzI4NjFmOTc3OWVhMDY4ZThhYjI2NDhiMDQ3YzM0MTA1ZWQzOGM3
+    ZWZjOWE2NDhlNGJkZGU2MGI1Mjk1ZDJmODU2MDIzOTQ0NjExZDU=
   data.tar.gz: !binary |-
-    NTBlNGNhNjBiMTEwMWM5YjcyZmY5OGNjMmQzNTQ4YjhkN2IxZWQ5OGE0MjYw
-    ZGNhOTE5NzY2M2MxZWNjMmNkYjU3NWIyYTQ0OWYyYzYwYzM1YWJjYTkyOTI0
-    MDExYTkyYzIwNTgzNzI2OTY4ZTBmOGIwYmQ5Njc1Mjc5ZmI5ODg=
+    NTZmZTQ0ZTNlYjhiZjBmYmE5YWEwZDNkMjViMTM0YjIyYTc1NDRhOTQ3YWU1
+    YzlmMTdkZDc3MmIxNDMwYTUwYWIyOWMwM2IzYzM2YTI3MzVlNmI3YzUzZTVk
+    YmIxZWJjNzc4YWU0YWE3YmRhZjVlODJjMGQwYzZmNWIwMGZmYWM=

data/lib/composite_primary_keys/active_record_overides.rb

@@ -9,15 +9,20 @@ module CompositePrimaryKeys
       # For some reason when we overide here we lose dirty!
       # So, for now, timestamps are recorded explicitly
       def create_record(attribute_names = nil)
-        record_timestamps!
-        attribute_names ||= keys_for_partial_write
-        attributes_values = arel_attributes_with_values_for_create(attribute_names)
+        run_callbacks(:create) do
+          record_timestamps!
+          attribute_names ||= keys_for_partial_write
+          attributes_values = arel_attributes_with_values_for_create(attribute_names)
 
-        new_id = self.class.unscoped.insert attributes_values
-        self.id = new_id if self.class.primary_key
+          new_id = self.class.unscoped.insert attributes_values
 
-        @new_record = false
-        id
+          # DB like MySQL doesn't return the newly inserted result.
+          # self.id cannot be updated for this case.
+          self.id = new_id if self.class.primary_key and new_id.kind_of?(Array)
+          
+          @new_record = false
+          id
+        end
       end
 
       def record_timestamps!

data/lib/composite_primary_keys/connection_adapters/postgresql_adapter.rb

@@ -1,5 +1,13 @@
 module ActiveRecord
   module ConnectionAdapters
+    class PostgreSQLColumn
+      # This overide is needed to ensure ActiveRecord::Dirty behaves as expected
+      def type_cast(value)
+        return value if value.kind_of?(Array)
+        super
+      end
+    end
+    
     class PostgreSQLAdapter
       def insert_sql(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil)
         unless pk
@@ -36,7 +44,7 @@ module ActiveRecord
       # otherwise returns an array coresponding to the composite keys
       #
       def last_inserted_id(result)
-        row = result.rows.first
+        row = result && result.rows.first
         if Array === row
           row.size == 1 ? row[0] : row
         end

data/lib/composite_primary_keys/version.rb

@@ -2,7 +2,7 @@ module CompositePrimaryKeys
   module VERSION
     MAJOR = 6
     MINOR = 0
-    TINY  = 3
+    TINY  = 5
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 end

data/test/connections/databases.yml

@@ -0,0 +1,18 @@
+# To run tests:
+#  1. Copy this file to test/connections/databases.yml.
+#  2. Update to match the databases you want to test against.
+
+mysql:
+  adapter: mysql2
+  username: root
+  database: composite_primary_keys_unittest
+
+sqlite3:
+  adapter: sqlite3
+  database: db/composite_primary_keys_unittest.sqlite
+
+postgresql:
+  adapter: postgresql
+  database: composite_primary_keys_unittest
+  username: daniel
+  host: localhost

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 6.0.3
+  version: 6.0.5
 platform: ruby
 authors:
 - Dr Nic Williams
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2014-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -85,6 +85,7 @@ files:
 - test/abstract_unit.rb
 - test/connections/connection_spec.rb
 - test/connections/databases.example.yml
+- test/connections/databases.yml
 - test/connections/native_ibm_db/connection.rb
 - test/connections/native_mysql/connection.rb
 - test/connections/native_oracle/connection.rb