Merge 'trunk' into 'prefetch'

r5696@rkinyon-lt-osx (orig r5695):  robkinyon | 2009-03-06 12:55:52 -0500
Changed how the EXPERIMENTAL tag for subqueries and as_query is noted
r5697@rkinyon-lt-osx (orig r5696):  ribasushi | 2009-03-06 12:56:54 -0500
Remove erroneously merged file

diff --combined lib/DBIx/Class/Manual/Cookbook.pod
index d4458eb,5d56802..27119b6
--- 1/lib/DBIx/Class/Manual/Cookbook.pod
--- 2/lib/DBIx/Class/Manual/Cookbook.pod
+++ b/lib/DBIx/Class/Manual/Cookbook.pod
@@@ -295,7 -295,7 +295,7 @@@ Please see L<DBIx::Class::ResultSet/ATT
  are in any way unsure about the use of the attributes above (C< join
  >, C< select >, C< as > and C< group_by >).
  
- =head2 Subqueries
+ =head2 Subqueries (EXPERIMENTAL)
  
  You can write subqueries relatively easily in DBIC.
  
@@@ -343,10 -343,6 +343,10 @@@ That creates the following SQL
         WHERE artistid = me.artistid
        )
  
 +=head3 EXPERIMENTAL
 +
 +Please note that subqueries are considered an experimental feature.
 +
  =head2 Predefined searches
  
  You can write your own L<DBIx::Class::ResultSet> class by inheriting from it

diff --combined lib/DBIx/Class/ResultSet.pm
index c29d604,07357e2..5969744
--- 1/lib/DBIx/Class/ResultSet.pm
--- 2/lib/DBIx/Class/ResultSet.pm
+++ b/lib/DBIx/Class/ResultSet.pm
@@@ -1807,7 -1807,7 +1807,7 @@@ sub _remove_alias 
    return \%unaliased;
  }
  
- =head2 as_query
+ =head2 as_query (EXPERIMENTAL)
  
  =over 4
  
@@@ -1821,8 -1821,6 +1821,8 @@@ Returns the SQL query and bind vars ass
  
  This is generally used as the RHS for a subquery.
  
 +B<NOTE>: This feature is still experimental.
 +
  =cut
  
  sub as_query { return shift->cursor->as_query(@_) }

diff --combined lib/DBIx/Class/ResultSetColumn.pm
index 5ec2a05,ec0d3fc..fbedf88
--- 1/lib/DBIx/Class/ResultSetColumn.pm
--- 2/lib/DBIx/Class/ResultSetColumn.pm
+++ b/lib/DBIx/Class/ResultSetColumn.pm
@@@ -54,7 -54,7 +54,7 @@@ sub new 
    return $new;
  }
  
- =head2 as_query
+ =head2 as_query (EXPERIMENTAL)
  
  =over 4
  
@@@ -68,8 -68,6 +68,8 @@@ Returns the SQL query and bind vars ass
  
  This is generally used as the RHS for a subquery.
  
 +B<NOTE>: This feature is still experimental.
 +
  =cut
  
  sub as_query { return shift->_resultset->as_query }