composite_primary_keys 0.8.0 → 0.8.2

data/History.txt

@@ -0,0 +1,21 @@
+*** 0.8.2 / 2007-4-11
+
++ 1 major enhancement:
+        + Oracle unit tests!! [Darrin Holst]
+				+ And they work too
+
+*** 0.8.1 / 2007-4-10
+
++ 1 bug fix:
+        + Fixed the distinct(count) for oracle (removed 'as')
+
+*** 0.8.0 / 2007-4-6
+
++ 1 major enhancement:
+        + Support for calcualtions on associations
++ 2 new DB supported:
+        + Tests run on sqlite
+        + Tests run on postgresql
++ History.txt to keep track of changes like these
++ Using Hoe for Rakefile
++ Website generator rake tasks

data/Manifest.txt

@@ -1,4 +1,5 @@
 CHANGELOG
+History.txt
 Manifest.txt
 README
 Rakefile
@@ -8,6 +9,7 @@ lib/composite_primary_keys/associations.rb
 lib/composite_primary_keys/base.rb
 lib/composite_primary_keys/calculations.rb
 lib/composite_primary_keys/composite_arrays.rb
+lib/composite_primary_keys/connection_adapters/oracle_adapter.rb
 lib/composite_primary_keys/connection_adapters/postgresql_adapter.rb
 lib/composite_primary_keys/fixtures.rb
 lib/composite_primary_keys/reflection.rb

data/Rakefile

@@ -46,7 +46,7 @@ hoe = Hoe.new(GEM_NAME, VERSION) do |p|
   p.clean_globs = CLEAN  #An array of file patterns to delete on clean.
 
   # == Optional
-  #p.changes        - A description of the release's latest changes.
+  p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
   p.extra_deps = [['activerecord', '>= 1.14.3']]  #An array of rubygem dependencies.
   #p.spec_extras    - A hash of extra values to set in the gemspec.
 end
@@ -118,6 +118,20 @@ end
 desc 'Rebuild the PostgreSQL test databases'
 task :rebuild_postgresql_databases => [:drop_postgresql_databases, :build_postgresql_databases]
 
+desc 'Build the Oracle test databases'
+task :build_oracle_databases do 
+  puts File.join(SCHEMA_PATH, 'oracle.sql')
+  sh %( sqlplus holstdl/holstdl@test < #{File.join(SCHEMA_PATH, 'oracle.sql')} )
+end
+
+desc 'Drop the Oracle test databases'
+task :drop_oracle_databases do 
+  sh %( sqlplus holstdl/holstdl@test < #{File.join(SCHEMA_PATH, 'oracle.drop.sql')} )
+end
+
+desc 'Rebuild the Oracle test databases'
+task :rebuild_oracle_databases => [:drop_oracle_databases, :build_oracle_databases]
+
 desc 'Generate website files'
 task :website_generate do
   sh %{ ruby scripts/txt2html website/index.txt > website/index.html }
@@ -131,9 +145,8 @@ task :website_upload do
   host = "#{config["username"]}@rubyforge.org"
   remote_dir = "/var/www/gforge-projects/#{RUBYFORGE_PROJECT}/"
   local_dir = 'website'
-  sh %{rsync -av --delete #{local_dir}/ #{host}:#{remote_dir}}
+  sh %{rsync -av #{local_dir}/ #{host}:#{remote_dir}}
 end
 
 desc 'Generate and upload website files'
-task :website => [:website_generate, :website_upload] do
-end
+task :website => [:website_generate, :website_upload]

data/lib/composite_primary_keys/associations.rb

@@ -203,7 +203,7 @@ module ActiveRecord::Associations::ClassMethods
       end
       
       def full_keys(table_name, keys)
-        keys.collect {|key| "#{table_name}.#{key}"}.join(CompositePrimaryKeys::ID_SEP)
+        keys.is_a?(Array) ? keys.collect {|key| "#{table_name}.#{key}"}.join(CompositePrimaryKeys::ID_SEP) : "#{table_name}.#{keys}"
       end
 
       def composite_join_clause(full_keys1, full_keys2)

data/lib/composite_primary_keys/calculations.rb

@@ -54,7 +54,7 @@ module CompositePrimaryKeys
 
           sql << " ORDER BY #{options[:order]} "       if options[:order]
           add_limit!(sql, options, scope)
-          sql << ') as w1' if use_workaround
+          sql << ') w1' if use_workaround # assign a dummy table name as required for postgresql
           sql
         end
       end

data/lib/composite_primary_keys/connection_adapters/oracle_adapter.rb

@@ -0,0 +1,11 @@
+module ActiveRecord
+  module ConnectionAdapters
+    class OracleAdapter < AbstractAdapter
+      
+      # This mightn't be in Core, but count(distinct x,y) doesn't work for me
+      def supports_count_distinct? #:nodoc:
+        false
+      end
+    end
+  end
+end

data/lib/composite_primary_keys/version.rb

@@ -2,7 +2,7 @@ module CompositePrimaryKeys
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 8
-    TINY  = 0
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/connections/native_oracle/connection.rb

@@ -1,23 +1,16 @@
-print "Using Oracle\n"
-require_dependency 'fixtures/course'
+print "Using native Oracle\n"
 require 'logger'
 
-ActiveRecord::Base.logger = Logger.new STDOUT
-ActiveRecord::Base.logger.level = Logger::WARN
+ActiveRecord::Base.logger = Logger.new("debug.log")
 
-# Set these to your database connection strings
-db = ENV['ARUNIT_DB'] || 'ruby_ut'
+db1 = 'composite_primary_keys_unittest'
 
-ActiveRecord::Base.establish_connection(
-  :adapter  => 'oracle',
-  :username => 'ruby_ut',
-  :password => 'ruby_ut1',
-  :database => db
-)
+connection_options = {
+  :adapter  => 'oci',
+  :username => 'holstdl',
+  :password => 'holstdl',
+  :host     => 'test'
+}
 
-Course.establish_connection(
-  :adapter  => 'oracle',
-  :username => 'ruby_ut',
-  :password => 'ruby_ut1',
-  :database => db
-)
+ActiveRecord::Base.configurations = { db1 => connection_options }
+ActiveRecord::Base.establish_connection(connection_options)

data/test/fixtures/membership_statuses.yml

@@ -1,8 +1,10 @@
 santiago-cpk:
+  id: 1
   user_id: 1
   group_id: 1
   status: Active
 drnic-cpk:
+  id: 2
   user_id: 2
   group_id: 1
   status: Owner

data/test/test_associations.rb

@@ -72,6 +72,12 @@ class TestAssociations < Test::Unit::TestCase
       "Incorrect number of product_tariffs returnedturned"
   end
   
+  def test_find_includes_product
+    assert @product_tariffs = ProductTariff.find(:all, :include => :product)
+    assert_equal 3, @product_tariffs.length
+    assert_not_nil @product_tariffs.first.instance_variable_get('@product'), '@product not set'
+  end
+  
   def XXX_test_find_includes_extended
     # TODO - what's the correct syntax?
     assert @products = Product.find(:all, :include => {:product_tariffs => :tariffs})

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>Composite Primary Keys</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/compositekeys"; return false'>
       Get Version
-      <a href="http://rubyforge.org/projects/compositekeys" class="numbers">0.8.0</a>
+      <a href="http://rubyforge.org/projects/compositekeys" class="numbers">0.8.2</a>
     </div>
     <h1>&#x2192; Ruby on Rails</h1>
 

data/website/version-raw.js

@@ -1,3 +1,3 @@
 // Announcement JS file
-var version = "0.8.0";
+var version = "0.8.2";
 MagicAnnouncement.show('compositekeys', version);

data/website/version.js

@@ -1,4 +1,4 @@
 // Version JS file
-var version = "0.8.0";
+var version = "0.8.2";
 
 document.write(" - " + version);

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: composite_primary_keys
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
-date: 2007-04-07 00:00:00 +02:00
+  version: 0.8.2
+date: 2007-04-11 00:00:00 +02:00
 summary: Composite key support for ActiveRecords
 require_paths: 
 - lib
@@ -30,6 +30,7 @@ authors:
 - Dr Nic Williams
 files: 
 - CHANGELOG
+- History.txt
 - Manifest.txt
 - README
 - Rakefile
@@ -39,6 +40,7 @@ files:
 - lib/composite_primary_keys/base.rb
 - lib/composite_primary_keys/calculations.rb
 - lib/composite_primary_keys/composite_arrays.rb
+- lib/composite_primary_keys/connection_adapters/oracle_adapter.rb
 - lib/composite_primary_keys/connection_adapters/postgresql_adapter.rb
 - lib/composite_primary_keys/fixtures.rb
 - lib/composite_primary_keys/reflection.rb