composite_primary_keys 0.8.2 → 0.8.3

data/History.txt

@@ -1,3 +1,10 @@
+*** 0.8.3 / 2007-5-3
+
++ 1 bugfix
+				+ Explicit reference to ::ActiveRecord::RecordNotFound
++ 1 website addition:
+        + Added routing help [Pete Sumskas]
+
 *** 0.8.2 / 2007-4-11
 
 + 1 major enhancement:

data/Manifest.txt

@@ -25,6 +25,8 @@ test/connections/native_sqlite/connection.rb
 test/fixtures/article.rb
 test/fixtures/articles.yml
 test/fixtures/db_definitions/mysql.sql
+test/fixtures/db_definitions/oracle.drop.sql
+test/fixtures/db_definitions/oracle.sql
 test/fixtures/db_definitions/postgresql.sql
 test/fixtures/db_definitions/sqlite.sql
 test/fixtures/group.rb

data/Rakefile

@@ -19,8 +19,8 @@ RUBYFORGE_PROJECT = "compositekeys"
 HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
 
 REV = nil #File.read(".svn/entries")[/committed-rev="(\d+)"/, 1] rescue nil
-VERSION = ENV['VERSION'] || (CompositePrimaryKeys::VERSION::STRING + (REV ? ".#{REV}" : ""))
-CLEAN.include ['**/.*.sw?', '*.gem', '.config']
+VER = ENV['VERSION'] || (CompositePrimaryKeys::VERSION::STRING + (REV ? ".#{REV}" : ""))
+CLEAN.include ['**/.*.sw?', '*.gem', '.config','debug.log','*.db','logfile','.DS_Store']
 RDOC_OPTS = ['--quiet', '--title', "newgem documentation",
     "--opname", "index.html",
     "--line-numbers", 
@@ -35,7 +35,7 @@ end
 
 # Generate all the Rake tasks
 # Run 'rake -T' to see list of generated tasks (from gem root directory)
-hoe = Hoe.new(GEM_NAME, VERSION) do |p|
+hoe = Hoe.new(GEM_NAME, VER) do |p|
   p.author = AUTHOR 
   p.description = DESCRIPTION
   p.email = EMAIL

data/lib/composite_primary_keys/base.rb

@@ -303,7 +303,7 @@ module CompositePrimaryKeys
               if result.size == ids.size
                 ids.size == 1 ? result[0] : result
               else
-                raise RecordNotFound, "Couldn't find all #{name.pluralize} with IDs (#{ids_list})#{conditions}"
+                raise ::ActiveRecord::RecordNotFound, "Couldn't find all #{name.pluralize} with IDs (#{ids_list})#{conditions}"
               end
             end
             

data/lib/composite_primary_keys/version.rb

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

data/test/fixtures/db_definitions/oracle.drop.sql

@@ -0,0 +1,21 @@
+drop table reference_types;
+drop sequence reference_types_seq;
+drop table reference_codes;
+drop table products;
+drop sequence products_seq;
+drop table tariffs;
+drop table product_tariffs;
+drop table suburbs;
+drop table streets;
+drop sequence streets_seq;
+drop table users;
+drop sequence users_seq;
+drop table articles;
+drop sequence articles_seq;
+drop table readings;
+drop sequence readings_seq;
+drop table groups;
+drop sequence groups_seq;
+drop table memberships;
+drop table membership_statuses;
+drop sequence membership_statuses_seq;

data/test/fixtures/db_definitions/oracle.sql

@@ -0,0 +1,111 @@
+create table reference_types (
+  reference_type_id  number(11)    primary key,
+  type_label         varchar2(50)  default null,
+  abbreviation       varchar2(50)  default null,
+  description        varchar2(50)  default null
+);
+
+create sequence reference_types_seq
+  start with 1000;
+
+create table reference_codes (
+  reference_type_id  number(11),
+  reference_code     number(11),
+  code_label         varchar2(50)  default null,
+  abbreviation       varchar2(50)  default null,
+  description        varchar2(50)  default null,
+  constraint reference_codes_pk primary key(reference_type_id, reference_code)
+);
+
+create table products (
+  id    number(11)    primary key,
+  name  varchar2(50)  default null
+);
+
+create sequence products_seq
+  start with 1000;
+
+create table tariffs (
+  tariff_id   number(11),
+  start_date  date,
+  amount      number(11)  default null,
+  constraint tariffs_pk primary key(tariff_id, start_date)  
+);
+
+create table product_tariffs (
+  product_id         number(11),
+  tariff_id          number(11),
+  tariff_start_date  date,
+  constraint product_tariffs_pk primary key(product_id, tariff_id, tariff_start_date)
+);
+
+create table suburbs (
+  city_id    number(11),
+  suburb_id  number(11),
+  name       varchar2(50)  not null,
+  constraint suburbs_pk primary key(city_id, suburb_id)
+);
+
+create table streets (
+  id         number(11)    primary key,
+  city_id    number(11)    not null,
+  suburb_id  number(11)    not null,
+  name       varchar2(50)  not null
+);
+
+create sequence streets_seq
+  start with 1000;
+
+create table users (
+  id    number(11)    primary key,
+  name  varchar2(50)  not null
+);
+
+create sequence users_seq
+  start with 1000;
+
+create table articles (
+  id    number(11)    primary key,
+  name  varchar2(50)  not null
+);
+
+create sequence articles_seq
+  start with 1000;
+
+
+create table readings (
+  id          number(11)  primary key,
+  user_id     number(11)  not null,
+  article_id  number(11)  not null,
+  rating      number(11)  not null
+);
+
+create sequence readings_seq
+  start with 1000;
+
+
+create table groups (
+  id    number(11)    primary key,
+  name  varchar2(50)  not null
+);
+
+create sequence groups_seq
+  start with 1000;
+
+
+create table memberships (
+  user_id   number(11)  not null,
+  group_id  number(11)  not null,
+  constraint memberships_pk primary key(user_id, group_id)
+);
+
+create table membership_statuses (
+  id        number(11)    primary key,
+  user_id   number(11)    not null,
+  group_id  number(11)    not null,
+  status    varchar2(50)  not null
+);
+
+create sequence membership_statuses_seq
+  start with 1000;
+  

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.2</a>
+      <a href="http://rubyforge.org/projects/compositekeys" class="numbers">0.8.3</a>
     </div>
     <h1>&#x2192; Ruby on Rails</h1>
 
@@ -141,7 +141,7 @@ throughout your application. Just like a normal ActiveRecord.</p>
 	<h2>Other tricks</h2>
 
 
-	<p>Pass a list of composite ids to the <code>#find</code> method</p>
+	<h3>Pass a list of composite ids to the <code>#find</code> method</h3>
 
 
 	<p><pre class="syntax"><span class="constant">Membership</span><span class="punct">.</span><span class="ident">find</span> <span class="punct">[</span><span class="number">1</span><span class="punct">,</span><span class="number">1</span><span class="punct">],</span> <span class="punct">[</span><span class="number">2</span><span class="punct">,</span><span class="number">1</span><span class="punct">]</span>
@@ -157,6 +157,31 @@ throughout your application. Just like a normal ActiveRecord.</p>
 	<p><pre class="syntax"><span class="constant">MembershipStatus</span><span class="punct">.</span><span class="ident">find</span><span class="punct">(</span><span class="symbol">:first</span><span class="punct">).</span><span class="ident">memberships</span><span class="punct">.</span><span class="ident">count</span> <span class="comment"># =&gt; 1</span></pre></p>
 
 
+	<h3>Routes with Rails</h3>
+
+
+	<p>From Pete Sumskas:</p>
+
+
+<blockquote>
+    I ran into one problem that I didn&#8217;t see mentioned on <a href="http://groups.google.com/group/compositekeys">this list</a> &#8211; 
+    and I    didn&#8217;t see any information about what I should do to address it in the
+    documentation (might have missed it).
+
+    The problem was that the urls being generated for a &#8216;show&#8217; action (for
+    example) had a syntax like:
+
+    <pre>/controller/show/123000,Bu70</pre>
+
+    for a two-field composite PK. The default routing would not match that,
+    so after working out how to do the routing I added:
+
+    <pre class="syntax"><span class="ident">map</span><span class="punct">.</span><span class="ident">connect</span> <span class="punct">'</span><span class="string">:controller/:action/:id</span><span class="punct">',</span> <span class="symbol">:id</span> <span class="punct">=&gt;</span> <span class="punct">/</span><span class="regex"><span class="escape">\w</span>+(,<span class="escape">\w</span>+)*</span><span class="punct">/</span></pre>
+
+    to my <code>route.rb</code> file.
+
+</blockquote>
+
 	<p><a name="dbs"></a></p>
 
 
@@ -189,8 +214,8 @@ throughout your application. Just like a normal ActiveRecord.</p>
 		</tr>
 		<tr>
 			<td>oracle    </td>
-			<td><span class=unknown>???</span> (<a href="mailto:compositekeys@googlegroups.com?subject=Help+with+Oracle">I can help</a>)</td>
-			<td><span class=unknown>???</span> (<a href="mailto:compositekeys@googlegroups.com?subject=Oracle+is+working">Yes!</a> or <a href="mailto:compositekeys@googlegroups.com?subject=Oracle+is+failing">No&#8230;</a>)</td>
+			<td><span class=success><span class="caps">YES</span></span> (new 0.8.2)</td>
+			<td><span class=success><span class="caps">YES</span></span> (<a href="mailto:compositekeys@googlegroups.com?subject=Oracle+is+working">Yes!</a> or <a href="mailto:compositekeys@googlegroups.com?subject=Oracle+is+failing">No&#8230;</a>)</td>
 		</tr>
 		<tr>
 			<td>sqlserver </td>
@@ -227,6 +252,12 @@ throughout your application. Just like a normal ActiveRecord.</p>
 
 
 
+	<h3>Thanks go to&#8230;</h3>
+
+
+	<p><strong>Darrin Holst</strong> &#8211; for Oracle unit tests and calculations support</p>
+
+
 	<h2>Dr Nic&#8217;s Blog</h2>
 
 
@@ -251,7 +282,7 @@ other stories and things.</p>
 
 	<p>Comments are welcome. Send an email to <a href="mailto:drnicwilliams@gmail.com">Dr Nic Williams</a>.</p>
     <p class="coda">
-      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 7th April 2007<br>
+      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 3rd May 2007<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/index.txt

@@ -78,7 +78,7 @@ throughout your application. Just like a normal ActiveRecord.
 
 h2. Other tricks
 
-Pass a list of composite ids to the <code>#find</code> method
+h3. Pass a list of composite ids to the <code>#find</code> method
 
 <pre syntax="ruby">Membership.find [1,1], [2,1]
 => [
@@ -90,6 +90,29 @@ Perform <code>#count</code> operations
 
 <pre syntax="ruby">MembershipStatus.find(:first).memberships.count # => 1</pre>
 
+h3. Routes with Rails
+
+From Pete Sumskas:
+
+<blockquote>
+	I ran into one problem that I didn't see mentioned on "this list":http://groups.google.com/group/compositekeys - 
+	and I	didn't see any information about what I should do to address it in the
+	documentation (might have missed it).
+
+	The problem was that the urls being generated for a 'show' action (for
+	example) had a syntax like:
+	
+	<pre>/controller/show/123000,Bu70</pre>
+
+	for a two-field composite PK. The default routing would not match that,
+	so after working out how to do the routing I added:
+	
+	<pre syntax="ruby">map.connect ':controller/:action/:id', :id => /\w+(,\w+)*/</pre>
+	
+	to my <code>route.rb</code> file.
+	
+</blockquote>
+
 <a name="dbs"></a>
 
 h2. Which databases?
@@ -101,7 +124,7 @@ A suite of unit tests have been run on the following databases supported by Acti
 |mysql     |<span class=success>YES</span>|<span class=unknown>???</span> ("Yes!":mailto:compositekeys@googlegroups.com?subject=Mysql+is+working or "No...":mailto:compositekeys@googlegroups.com?subject=Mysql+is+failing)|
 |sqlite3   |<span class=success>YES</span> (new 0.8.0)|<span class=unknown>???</span> ("Yes!":mailto:compositekeys@googlegroups.com?subject=Sqlite3+is+working or "No...":mailto:compositekeys@googlegroups.com?subject=Sqlite3+is+failing)|
 |postgresql|<span class=success>YES</span> (new 0.8.0)|<span class=unknown>???</span> ("Yes!":mailto:compositekeys@googlegroups.com?subject=Postgresql+is+working or "No...":mailto:compositekeys@googlegroups.com?subject=Postgresql+is+failing)|
-|oracle    |<span class=unknown>???</span> ("I can help":mailto:compositekeys@googlegroups.com?subject=Help+with+Oracle)|<span class=unknown>???</span> ("Yes!":mailto:compositekeys@googlegroups.com?subject=Oracle+is+working or "No...":mailto:compositekeys@googlegroups.com?subject=Oracle+is+failing)|
+|oracle    |<span class=success>YES</span> (new 0.8.2)|<span class=success>YES</span> ("Yes!":mailto:compositekeys@googlegroups.com?subject=Oracle+is+working or "No...":mailto:compositekeys@googlegroups.com?subject=Oracle+is+failing)|
 |sqlserver |<span class=unknown>???</span> ("I can help":mailto:compositekeys@googlegroups.com?subject=Help+with+SQLServer)|<span class=unknown>???</span> ("Yes!":mailto:compositekeys@googlegroups.com?subject=SQLServer+is+working or "No...":mailto:compositekeys@googlegroups.com?subject=SQLServer+is+failing)|
 |db2       |<span class=unknown>???</span> ("I can help":mailto:compositekeys@googlegroups.com?subject=Help+with+DB2)|<span class=unknown>???</span> ("Yes!":mailto:compositekeys@googlegroups.com?subject=DB2+is+working or "No...":mailto:compositekeys@googlegroups.com?subject=DB2+is+failing)|
 |firebird  |<span class=unknown>???</span> ("I can help":mailto:compositekeys@googlegroups.com?subject=Help+with+Firebird)|<span class=unknown>???</span> ("Yes!":mailto:compositekeys@googlegroups.com?subject=Firebird+is+working or "No...":mailto:compositekeys@googlegroups.com?subject=Firebird+is+failing)|
@@ -109,6 +132,10 @@ A suite of unit tests have been run on the following databases supported by Acti
 |openbase  |<span class=unknown>???</span> ("I can help":mailto:compositekeys@googlegroups.com?subject=Help+with+Openbase)|<span class=unknown>???</span> ("Yes!":mailto:compositekeys@googlegroups.com?subject=Openbase+is+working or "No...":mailto:compositekeys@googlegroups.com?subject=Openbase+is+failing)|
 |frontbase |<span class=unknown>???</span> ("I can help":mailto:compositekeys@googlegroups.com?subject=Help+with+Frontbase)|<span class=unknown>???</span> ("Yes!":mailto:compositekeys@googlegroups.com?subject=Frontbase+is+working or "No...":mailto:compositekeys@googlegroups.com?subject=Frontbase+is+failing)|
 
+h3. Thanks go to...
+
+*Darrin Holst* - for Oracle unit tests and calculations support
+
 h2. Dr Nic's Blog
 
 "http://www.drnicwilliams.com":http://www.drnicwilliams.com - for future announcements and

data/website/version-raw.js

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

data/website/version.js

@@ -1,4 +1,4 @@
 // Version JS file
-var version = "0.8.2";
+var version = "0.8.3";
 
 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.2
-date: 2007-04-11 00:00:00 +02:00
+  version: 0.8.3
+date: 2007-05-03 00:00:00 +02:00
 summary: Composite key support for ActiveRecords
 require_paths: 
 - lib
@@ -56,6 +56,8 @@ files:
 - test/fixtures/article.rb
 - test/fixtures/articles.yml
 - test/fixtures/db_definitions/mysql.sql
+- test/fixtures/db_definitions/oracle.drop.sql
+- test/fixtures/db_definitions/oracle.sql
 - test/fixtures/db_definitions/postgresql.sql
 - test/fixtures/db_definitions/sqlite.sql
 - test/fixtures/group.rb