dm-constraints 1.2.0.rc1 → 1.2.0.rc2

data/Gemfile

@@ -5,11 +5,14 @@ source 'http://rubygems.org'
 SOURCE         = ENV.fetch('SOURCE', :git).to_sym
 REPO_POSTFIX   = SOURCE == :path ? ''                                : '.git'
 DATAMAPPER     = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'http://github.com/datamapper'
-DM_VERSION     = '~> 1.2.0.rc1'
+DM_VERSION     = '~> 1.2.0.rc2'
 DO_VERSION     = '~> 0.10.6'
 DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
+CURRENT_BRANCH = ENV.fetch('GIT_BRANCH', 'master')
 
-gem 'dm-core', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}"
+gem 'dm-core',     DM_VERSION,
+  SOURCE  => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}",
+  :branch => CURRENT_BRANCH
 
 group :development do
 
@@ -45,18 +48,24 @@ group :datamapper do
       gem "do_#{adapter}", DO_VERSION, do_options.dup
     end
 
-    gem 'dm-do-adapter', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-do-adapter#{REPO_POSTFIX}"
+    gem 'dm-do-adapter', DM_VERSION,
+      SOURCE  => "#{DATAMAPPER}/dm-do-adapter#{REPO_POSTFIX}",
+      :branch => CURRENT_BRANCH
   end
 
   adapters.each do |adapter|
-    gem "dm-#{adapter}-adapter", DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-#{adapter}-adapter#{REPO_POSTFIX}"
+    gem "dm-#{adapter}-adapter", DM_VERSION,
+      SOURCE  => "#{DATAMAPPER}/dm-#{adapter}-adapter#{REPO_POSTFIX}",
+      :branch => CURRENT_BRANCH
   end
 
   plugins = ENV['PLUGINS'] || ENV['PLUGIN']
   plugins = plugins.to_s.tr(',', ' ').split.push('dm-migrations').uniq
 
   plugins.each do |plugin|
-    gem plugin, DM_VERSION, SOURCE => "#{DATAMAPPER}/#{plugin}#{REPO_POSTFIX}"
+    gem plugin, DM_VERSION,
+      SOURCE  => "#{DATAMAPPER}/#{plugin}#{REPO_POSTFIX}",
+      :branch => CURRENT_BRANCH
   end
 
 end

data/VERSION

@@ -1 +1 @@
-1.2.0.rc1
+1.2.0.rc2

data/dm-constraints.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "dm-constraints"
-  s.version = "1.2.0.rc1"
+  s.version = "1.2.0.rc2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dirkjan Bussink"]
-  s.date = "2011-09-09"
+  s.date = "2011-09-14"
   s.description = "DataMapper plugin constraining relationships"
   s.email = "d.bussink [a] gmail [d] com"
   s.extra_rdoc_files = [
@@ -59,18 +59,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dm-core>, ["~> 1.2.0.rc1"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.2.0.rc2"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rake>, ["~> 0.9.2"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3.2"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 1.2.0.rc1"])
+      s.add_dependency(%q<dm-core>, ["~> 1.2.0.rc2"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rake>, ["~> 0.9.2"])
       s.add_dependency(%q<rspec>, ["~> 1.3.2"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 1.2.0.rc1"])
+    s.add_dependency(%q<dm-core>, ["~> 1.2.0.rc2"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rake>, ["~> 0.9.2"])
     s.add_dependency(%q<rspec>, ["~> 1.3.2"])

data/lib/data_mapper/constraints/adapters/oracle_adapter.rb

@@ -21,7 +21,8 @@ module DataMapper
             AND constraint_name = ?
           SQL
 
-          select(statement, storage_name, constraint_name).first > 0
+          select(statement, oracle_upcase(storage_name)[0, self.class::IDENTIFIER_MAX_LENGTH].gsub('"', '_'), oracle_upcase(constraint_name)[0, self.class::IDENTIFIER_MAX_LENGTH].gsub('"', '_')).first > 0
+
         end
 
 
@@ -30,12 +31,13 @@ module DataMapper
         # @api private
         #
         # TODO: is it desirable to always set `INITIALLY DEFERRED DEFERRABLE`?
-        def create_constraints_statement(storage_name, constraint_name, constraint_type, foreign_keys, reference_storage_name, reference_keys)
+        def create_constraints_statement(constraint_name, constraint_type, source_storage_name, source_keys, target_storage_name, target_keys)
           DataMapper::Ext::String.compress_lines(<<-SQL)
-            ALTER TABLE #{quote_name(storage_name)}
+            ALTER TABLE #{quote_name(source_storage_name)}
             ADD CONSTRAINT #{quote_name(constraint_name)}
-            FOREIGN KEY (#{foreign_keys.join(', ')})
-            REFERENCES #{quote_name(reference_storage_name)} (#{reference_keys.join(', ')})
+            FOREIGN KEY (#{source_keys.join(', ')})
+            REFERENCES #{quote_name(target_storage_name)} (#{target_keys.join(', ')})
+            #{"ON DELETE " + constraint_type if constraint_type && constraint_type != "NO ACTION"}
             INITIALLY DEFERRED DEFERRABLE
           SQL
         end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: dm-constraints
 version: !ruby/object:Gem::Version 
-  hash: 15424023
+  hash: 15424017
   prerelease: 6
   segments: 
   - 1
   - 2
   - 0
   - rc
-  - 1
-  version: 1.2.0.rc1
+  - 2
+  version: 1.2.0.rc2
 platform: ruby
 authors: 
 - Dirkjan Bussink
@@ -17,29 +17,30 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-09 00:00:00 Z
+date: 2011-09-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15424023
+        hash: 15424017
         segments: 
         - 1
         - 2
         - 0
         - rc
-        - 1
-        version: 1.2.0.rc1
-  prerelease: false
-  requirement: *id001
+        - 2
+        version: 1.2.0.rc2
+  version_requirements: *id001
   name: dm-core
 - !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -50,12 +51,12 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
-  prerelease: false
-  requirement: *id002
+  version_requirements: *id002
   name: jeweler
 - !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -66,12 +67,12 @@ dependencies:
         - 9
         - 2
         version: 0.9.2
-  prerelease: false
-  requirement: *id003
+  version_requirements: *id003
   name: rake
 - !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -82,8 +83,7 @@ dependencies:
         - 3
         - 2
         version: 1.3.2
-  prerelease: false
-  requirement: *id004
+  version_requirements: *id004
   name: rspec
 description: DataMapper plugin constraining relationships
 email: d.bussink [a] gmail [d] com