Merge 'trunk' into 'oracle_quotes'

r8715@Thesaurus (orig r8702): ribasushi | 2010-02-14 10:46:51 +0100 This is Moose, so use CMOP r8720@Thesaurus (orig r8707): ribasushi | 2010-02-15 10:28:22 +0100 Final POD touches r8721@Thesaurus (orig r8708): ribasushi | 2010-02-15 10:31:38 +0100 Spellcheck (jawnsy++) r8722@Thesaurus (orig r8709): ribasushi | 2010-02-15 10:32:24 +0100 One more r8723@Thesaurus (orig r8710): ribasushi | 2010-02-15 14:49:26 +0100 Release 0.08119 r8725@Thesaurus (orig r8712): ribasushi | 2010-02-15 14:50:56 +0100 Bump trunl version r8726@Thesaurus (orig r8713): rafl | 2010-02-15 15:49:55 +0100 Make sure we actually run all tests, given we're using done_testing. r8727@Thesaurus (orig r8714): rafl | 2010-02-15 15:50:01 +0100 Make sure overriding deployment_statements is possible from within schemas. r8728@Thesaurus (orig r8715): rafl | 2010-02-15 15:56:06 +0100 Changelogging. r8729@Thesaurus (orig r8716): rafl | 2010-02-15 15:58:09 +0100 Make some cookbook code compile. r8730@Thesaurus (orig r8717): nuba | 2010-02-15 16:11:52 +0100 spelling fixes in the documaentation, sholud be gud now ;) r8732@Thesaurus (orig r8719): caelum | 2010-02-16 11:09:58 +0100 use OO interface of Hash::Merge for ::DBI::Replicated r8734@Thesaurus (orig r8721): ribasushi | 2010-02-16 11:41:06 +0100 Augment did-author-run-makefile check to include OptDeps r8735@Thesaurus (orig r8722): ribasushi | 2010-02-16 12:16:06 +0100 Reorg support section, add live-chat link r8739@Thesaurus (orig r8726): caelum | 2010-02-16 14:51:58 +0100 set behavior for Hash::Merge in ::DBI::Replicated, otherwise it uses the global setting r8740@Thesaurus (orig r8727): caelum | 2010-02-16 15:43:25 +0100 POD touchups r8759@Thesaurus (orig r8746): ribasushi | 2010-02-19 00:30:37 +0100 Fix bogus test r8760@Thesaurus (orig r8747): ribasushi | 2010-02-19 00:34:22 +0100 Retire useless abstraction (all rdbms need this anyway) r8761@Thesaurus (orig r8748): ribasushi | 2010-02-19 00:35:01 +0100 Fix count of group_by over aliased function r8765@Thesaurus (orig r8752): ribasushi | 2010-02-19 10:11:20 +0100 r8497@Thesaurus (orig r8484): ribasushi | 2010-01-31 10:06:29 +0100 Branch to unify mandatory PK handling r8498@Thesaurus (orig r8485): ribasushi | 2010-01-31 10:20:36 +0100 This is not really used for anything (same code in DBI) r8499@Thesaurus (orig r8486): ribasushi | 2010-01-31 10:25:55 +0100 Helper primary_columns wrapper to throw if a PK is not defined r8500@Thesaurus (orig r8487): ribasushi | 2010-01-31 11:07:25 +0100 Stupid errors r8501@Thesaurus (orig r8488): ribasushi | 2010-01-31 12:18:57 +0100 Saner handling of nonexistent/partial conditions r8762@Thesaurus (orig r8749): ribasushi | 2010-02-19 10:07:40 +0100 trap unresolvable conditions due to incomplete relationship specification r8764@Thesaurus (orig r8751): ribasushi | 2010-02-19 10:11:09 +0100 Changes r8767@Thesaurus (orig r8754): ribasushi | 2010-02-19 11:14:30 +0100 Fix for RT54697 r8769@Thesaurus (orig r8756): caelum | 2010-02-19 12:21:53 +0100 bump Test::Pod dep r8770@Thesaurus (orig r8757): caelum | 2010-02-19 12:23:07 +0100 bump Test::Pod dep in Optional::Dependencies too r8773@Thesaurus (orig r8760): rabbit | 2010-02-19 16:41:24 +0100 Fix stupid sqlt parser regression r8774@Thesaurus (orig r8761): rabbit | 2010-02-19 16:42:40 +0100 Port remaining tests to the Opt::Dep reposiory r8775@Thesaurus (orig r8762): rabbit | 2010-02-19 16:43:36 +0100 Some test cleanups r8780@Thesaurus (orig r8767): rabbit | 2010-02-20 20:59:20 +0100 Test::Deep actually isn't required r8786@Thesaurus (orig r8773): rabbit | 2010-02-20 22:21:41 +0100 These are core for perl 5.8 r8787@Thesaurus (orig r8774): rabbit | 2010-02-21 10:52:40 +0100 Shuffle tests a bit r8788@Thesaurus (orig r8775): rabbit | 2010-02-21 12:09:25 +0100 Bogus require r8789@Thesaurus (orig r8776): rabbit | 2010-02-21 12:09:48 +0100 Bogus unnecessary dep r8800@Thesaurus (orig r8787): rabbit | 2010-02-21 13:39:21 +0100 r8748@Thesaurus (orig r8735): goraxe | 2010-02-17 23:17:15 +0100 branch for dbicadmin pod fixes r8778@Thesaurus (orig r8765): goraxe | 2010-02-20 20:35:00 +0100 add G:L:D sub classes to generate pod r8779@Thesaurus (orig r8766): goraxe | 2010-02-20 20:56:16 +0100 dbicadmin: use subclassed G:L:D to generate some pod r8782@Thesaurus (orig r8769): goraxe | 2010-02-20 21:48:29 +0100 adjust Makefile.pl to generate dbicadmin.pod r8783@Thesaurus (orig r8770): goraxe | 2010-02-20 21:50:55 +0100 add svn-ignore for dbicadmin.pod r8784@Thesaurus (orig r8771): goraxe | 2010-02-20 22:01:41 +0100 change Options to Arguments r8785@Thesaurus (orig r8772): goraxe | 2010-02-20 22:10:29 +0100 add DBIx::Class::Admin::{Descriptive,Usage} to podcover ignore list r8790@Thesaurus (orig r8777): rabbit | 2010-02-21 12:35:38 +0100 Cleanup the makefile regen a bit r8792@Thesaurus (orig r8779): rabbit | 2010-02-21 12:53:01 +0100 Bah humbug r8793@Thesaurus (orig r8780): rabbit | 2010-02-21 12:55:18 +0100 And another one r8797@Thesaurus (orig r8784): rabbit | 2010-02-21 13:32:03 +0100 The minimal pod seems to confuse the manpage generator, commenting out for now r8798@Thesaurus (orig r8785): rabbit | 2010-02-21 13:38:03 +0100 Add license/author to dbicadmin autogen POD r8799@Thesaurus (orig r8786): rabbit | 2010-02-21 13:38:58 +0100 Reorder makefile author actions to make output more readable r8803@Thesaurus (orig r8790): ribasushi | 2010-02-21 14:24:15 +0100 Fix exception text r8804@Thesaurus (orig r8791): ribasushi | 2010-02-21 15:14:58 +0100 Extra testdep
Perl5 · Feb 21, 2010 · f270305 · f270305
2 parents 38aead8 + f58a165
commit f270305
Show file tree

Hide file tree

Showing 81 changed files with 707 additions and 445 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,5 +10,6 @@ _build/
 blib/
 inc/
 lib/DBIx/Class/Optional/Dependencies.pod
+lib/dbicadmin.pod
 pm_to_blib
 t/var/
diff --git a/Changes b/Changes
@@ -1,5 +1,15 @@
 Revision history for DBIx::Class
 
+        - Make sure possibly overwritten deployment_statements methods in
+          schemas get called on $schema->deploy
+        - Fix count() with group_by aliased-function resultsets
+        - Massive refactor and cleanup of primary key handling
+        - Fixed regression losing custom result_class (really this time)
+          (RT#54697)
+        - Fixed regression in DBIC SQLT::Parser failing with a classname
+          (as opposed to a schema object)
+
+0.08119 2010-02-15 09:36:00 (UTC)
         - Add $rs->is_ordered to test for existing order_by on a resultset
         - Add as_subselect_rs to DBIC::ResultSet from
           DBIC::Helper::ResultSet::VirtualView::as_virtual_view

diff --git a/Makefile.PL b/Makefile.PL
@@ -8,6 +8,11 @@ use 5.008001;
 use FindBin;
 use lib "$FindBin::Bin/lib";
 
+# adjust ENV for $AUTHOR system() calls
+use Config;
+$ENV{PERL5LIB} = join ($Config{path_sep}, @INC);
+
+
 ###
 ### DO NOT ADD OPTIONAL DEPENDENCIES HERE, EVEN AS recommends()
 ### All of them should go to DBIx::Class::Optional::Dependencies
@@ -25,19 +30,12 @@ my $build_requires = {
 my $test_requires = {
   'File::Temp'               => '0.22',
   'Test::Builder'            => '0.33',
-  'Test::Deep'               => '0',
   'Test::Exception'          => '0',
   'Test::More'               => '0.92',
   'Test::Warn'               => '0.21',
 };
 
 my $runtime_requires = {
-  # Core
-  'List::Util'               => '0',
-  'Scalar::Util'             => '0',
-  'Storable'                 => '0',
-
-  # Dependencies
   'Carp::Clan'               => '6.0',
   'Class::Accessor::Grouped' => '0.09002',
   'Class::C3::Componentised' => '1.0005',
@@ -47,7 +45,6 @@ my $runtime_requires = {
   'MRO::Compat'              => '0.09',
   'Module::Find'             => '0.06',
   'Path::Class'              => '0.18',
-  'Scope::Guard'             => '0.03',
   'SQL::Abstract'            => '1.61',
   'SQL::Abstract::Limit'     => '0.13',
   'Sub::Name'                => '0.04',
@@ -62,25 +59,9 @@ my $reqs = {
   test_requires => { %$test_requires },
 };
 
-# re-build README and require extra modules for testing if we're in a checkout
-if ($Module::Install::AUTHOR) {
-
-  print "Regenerating README\n";
-  system('pod2text lib/DBIx/Class.pm > README');
-
-  if (-f 'MANIFEST') {
-    print "Removing MANIFEST\n";
-    unlink 'MANIFEST';
-  }
-
-  print "Regenerating Optional/Dependencies.pod\n";
-  require DBIx::Class::Optional::Dependencies;
-  DBIx::Class::Optional::Dependencies->_gen_pod;
-
-# FIXME Disabled due to unsolved issues, ask theorbtwo
-#  require Module::Install::Pod::Inherit;
-#  PodInherit();
 
+# require extra modules for testing if we're in a checkout
+if ($Module::Install::AUTHOR) {
   warn <<'EOW';
 ******************************************************************************
 ******************************************************************************
@@ -92,6 +73,7 @@ if ($Module::Install::AUTHOR) {
 
 EOW
 
+  require DBIx::Class::Optional::Dependencies;
   $reqs->{test_requires} = {
     %{$reqs->{test_requires}},
     %{DBIx::Class::Optional::Dependencies->_all_optional_requirements},
@@ -119,6 +101,31 @@ for my $mod (sort keys %final_req) {
   $rtype->($mod, $ver);
 }
 
+auto_install();
+
+# re-create various autogenerated documentation bits
+if ($Module::Install::AUTHOR) {
+
+  print "Regenerating README\n";
+  system('pod2text lib/DBIx/Class.pm > README');
+
+  if (-f 'MANIFEST') {
+    print "Removing MANIFEST\n";
+    unlink 'MANIFEST';
+  }
+
+  print "Regenerating dbicadmin.pod\n";
+  system('perl script/dbicadmin --pod > lib/dbicadmin.pod');
+
+  print "Regenerating Optional/Dependencies.pod\n";
+  require DBIx::Class::Optional::Dependencies;
+  DBIx::Class::Optional::Dependencies->_gen_pod;
+
+  # FIXME Disabled due to unsolved issues, ask theorbtwo
+  #  require Module::Install::Pod::Inherit;
+  #  PodInherit();
+}
+
 install_script (qw|
     script/dbicadmin
 |);
@@ -138,13 +145,10 @@ no_index directory => $_ for (qw|
   lib/DBIx/Class/PK/Auto
 |);
 no_index package => $_ for (qw/
-  DBIx::Class::Storage::DBI::AmbiguousGlob
   DBIx::Class::SQLAHacks DBIx::Class::Storage::DBIHacks
 /);
 
 
-auto_install();
-
 WriteAll();
 
 

diff --git a/lib/DBIx/Class.pm b/lib/DBIx/Class.pm
@@ -27,7 +27,7 @@ sub component_base_class { 'DBIx::Class' }
 # Always remember to do all digits for the version even if they're 0
 # i.e. first release of 0.XX *must* be 0.XX000. This avoids fBSD ports
 # brain damage and presumably various other packaging systems too
-$VERSION = '0.08118_01';
+$VERSION = '0.08119_1';
 
 $VERSION = eval $VERSION; # numify for warning-free dev releases
 
@@ -56,13 +56,20 @@ DBIx::Class - Extensible and flexible object <-> relational mapper.
 
 The community can be found via:
 
-  Mailing list: http://lists.scsys.co.uk/mailman/listinfo/dbix-class/
+=over
 
-  SVN: http://dev.catalyst.perl.org/repos/bast/DBIx-Class/
+=item * IRC: L<irc.perl.org#dbix-class (click for instant chatroom login)
+|http://mibbit.com/chat/#dbix-class@irc.perl.org>
 
-  SVNWeb: http://dev.catalyst.perl.org/svnweb/bast/browse/DBIx-Class/
+=item * Mailing list: L<http://lists.scsys.co.uk/mailman/listinfo/dbix-class>
 
-  IRC: irc.perl.org#dbix-class
+=item * RT Bug Tracker: L<https://rt.cpan.org/Dist/Display.html?Queue=DBIx-Class>
+
+=item * SVNWeb: L<http://dev.catalyst.perl.org/svnweb/bast/browse/DBIx-Class/0.08>
+
+=item * SVN: L<http://dev.catalyst.perl.org/repos/bast/DBIx-Class/0.08>
+
+=back
 
 =head1 SYNOPSIS
 
@@ -303,6 +310,8 @@ Nniuq: Ron "Quinn" Straight" <quinnfazigu@gmail.org>
 
 norbi: Norbert Buchmuller <norbi@nix.hu>
 
+nuba: Nuba Princigalli <nuba@cpan.org>
+
 Numa: Dan Sully <daniel@cpan.org>
 
 ovid: Curtis "Ovid" Poe <ovid@cpan.org>
@@ -371,7 +380,7 @@ zamolxes: Bogdan Lucaciu <bogdan@wiz.ro>
 
 =head1 COPYRIGHT
 
-Copyright (c) 2005 - 2009 the DBIx::Class L</AUTHOR> and L</CONTRIBUTORS>
+Copyright (c) 2005 - 2010 the DBIx::Class L</AUTHOR> and L</CONTRIBUTORS>
 as listed above.
 
 =head1 LICENSE

diff --git a/lib/DBIx/Class/Admin.pm b/lib/DBIx/Class/Admin.pm
@@ -87,8 +87,8 @@ has 'schema' => (
 
 sub _build_schema {
   my ($self)  = @_;
-  require Class::C3::Componentised;
-  Class::C3::Componentised->ensure_class_loaded($self->schema_class);
+  require Class::MOP;
+  Class::MOP::load_class($self->schema_class);
 
   $self->connect_info->[3]->{ignore_version} =1;
   return $self->schema_class->connect(@{$self->connect_info()} ); # ,  $self->connect_info->[3], { ignore_version => 1} );

diff --git a/lib/DBIx/Class/Admin/Descriptive.pm b/lib/DBIx/Class/Admin/Descriptive.pm
@@ -0,0 +1,10 @@
+package     # hide from PAUSE
+    DBIx::Class::Admin::Descriptive;
+
+use DBIx::Class::Admin::Usage;
+
+use base 'Getopt::Long::Descriptive';
+
+sub usage_class { 'DBIx::Class::Admin::Usage'; }
+
+1;
diff --git a/lib/DBIx/Class/Admin/Usage.pm b/lib/DBIx/Class/Admin/Usage.pm
@@ -0,0 +1,85 @@
+package     # hide from PAUSE
+    DBIx::Class::Admin::Usage;
+
+
+use base 'Getopt::Long::Descriptive::Usage';
+
+use base 'Class::Accessor::Grouped';
+
+use Class::C3;
+
+__PACKAGE__->mk_group_accessors('simple', 'synopsis', 'short_description');
+
+sub prog_name {
+    Getopt::Long::Descriptive::prog_name();
+}
+
+sub set_simple {
+    my ($self,$field, $value) = @_;
+    my $prog_name = prog_name();
+    $value =~ s/%c/$prog_name/g;
+    $self->next::method($field, $value);
+}
+
+
+=head2 pod
+
+This returns the usage formated as a pod document
+
+=cut
+
+
+sub pod {
+  my ($self) = @_;
+  return join qq{\n}, $self->pod_leader_text, $self->pod_option_text, $self->pod_authorlic_text;
+}
+
+sub pod_leader_text {
+  my ($self) = @_;
+
+  return qq{=head1 NAME\n\n}.prog_name()." - ".$self->short_description().qq{\n\n}.
+         qq{=head1 SYNOPSIS\n\n}.$self->leader_text().qq{\n}.$self->synopsis().qq{\n\n};
+
+}
+
+sub pod_authorlic_text {
+
+  return <<'EOA'
+=head1 AUTHORS
+
+See L<DBIx::Class/CONTRIBUTORS>
+
+=head1 LICENSE
+
+You may distribute this code under the same terms as Perl itself
+EOA
+}
+
+
+sub pod_option_text {
+  my ($self) = @_;
+  my @options = @{ $self->{options} || [] };
+  my $string = q{};
+  return $string unless @options;
+
+  $string .= "=head1 OPTIONS\n\n=over\n\n";
+
+  foreach my $opt (@options) {
+    my $spec = $opt->{spec};
+    my $desc = $opt->{desc};
+    if ($desc eq 'spacer') {
+        $string .= "=back\n\n=head2 $spec\n\n=cut\n\n=over\n\n";
+        next;
+    }
+
+    $spec = Getopt::Long::Descriptive->_strip_assignment($spec);
+    $string .= "=item " . join " or ", map { length > 1 ? "B<--$_>" : "B<-$_>" }
+                             split /\|/, $spec; 
+    $string .= "\n\n$desc\n\n=cut\n\n";
+
+  }
+  $string .= "=back\n\n";
+  return $string;
+}
+
+1;
diff --git a/lib/DBIx/Class/CDBICompat.pm b/lib/DBIx/Class/CDBICompat.pm
@@ -91,7 +91,7 @@ This plugin will work, but it is more efficiently done using DBIC's native searc
 
 =head2 Choosing Features
 
-In fact, this class is just a receipe containing all the features emulated.
+In fact, this class is just a recipe containing all the features emulated.
 If you like, you can choose which features to emulate by building your 
 own class and loading it like this:
 
@@ -145,7 +145,7 @@ The semi-documented Class::DBI::Relationship objects returned by C<meta_info($ty
 
 =item Relationships
 
-Relationships between tables (has_a, has_many...) must be delcared after all tables in the relationship have been declared.  Thus the usual CDBI idiom of declaring columns and relationships for each class together will not work.  They must instead be done like so:
+Relationships between tables (has_a, has_many...) must be declared after all tables in the relationship have been declared.  Thus the usual CDBI idiom of declaring columns and relationships for each class together will not work.  They must instead be done like so:
 
     package Foo;
     use base qw(Class::DBI);

diff --git a/lib/DBIx/Class/CDBICompat/AbstractSearch.pm b/lib/DBIx/Class/CDBICompat/AbstractSearch.pm
@@ -10,7 +10,7 @@ DBIx::Class::CDBICompat::AbstractSearch - Emulates Class::DBI::AbstractSearch
 
 =head1 SYNOPSIS
 
-See DBIx::Class::CDBICompat for directions for use.
+See DBIx::Class::CDBICompat for usage directions.
 
 =head1 DESCRIPTION
 

diff --git a/lib/DBIx/Class/CDBICompat/ColumnsAsHash.pm b/lib/DBIx/Class/CDBICompat/ColumnsAsHash.pm
@@ -11,7 +11,7 @@ DBIx::Class::CDBICompat::ColumnsAsHash - Emulates the behavior of Class::DBI whe
 
 =head1 SYNOPSIS
 
-See DBIx::Class::CDBICompat for directions for use.
+See DBIx::Class::CDBICompat for usage directions.
 
 =head1 DESCRIPTION
 

diff --git a/lib/DBIx/Class/CDBICompat/Copy.pm b/lib/DBIx/Class/CDBICompat/Copy.pm
@@ -12,7 +12,7 @@ DBIx::Class::CDBICompat::Copy - Emulates Class::DBI->copy($new_id)
 
 =head1 SYNOPSIS
 
-See DBIx::Class::CDBICompat for directions for use.
+See DBIx::Class::CDBICompat for usage directions.
 
 =head1 DESCRIPTION
 

diff --git a/lib/DBIx/Class/CDBICompat/Iterator.pm b/lib/DBIx/Class/CDBICompat/Iterator.pm
@@ -10,7 +10,7 @@ DBIx::Class::CDBICompat::Iterator - Emulates the extra behaviors of the Class::D
 
 =head1 SYNOPSIS
 
-See DBIx::Class::CDBICompat for directions for use.
+See DBIx::Class::CDBICompat for usage directions.
 
 =head1 DESCRIPTION
 

diff --git a/lib/DBIx/Class/InflateColumn.pm b/lib/DBIx/Class/InflateColumn.pm
@@ -26,7 +26,7 @@ for the database.
 
 It can be used, for example, to automatically convert to and from
 L<DateTime> objects for your date and time fields. There's a
-conveniece component to actually do that though, try
+convenience component to actually do that though, try
 L<DBIx::Class::InflateColumn::DateTime>.
 
 It will handle all types of references except scalar references. It
@@ -114,7 +114,7 @@ sub _deflated_column {
 
 Fetch a column value in its inflated state.  This is directly
 analogous to L<DBIx::Class::Row/get_column> in that it only fetches a
-column already retreived from the database, and then inflates it.
+column already retrieved from the database, and then inflates it.
 Throws an exception if the column requested is not an inflated column.
 
 =cut

diff --git a/lib/DBIx/Class/InflateColumn/File.pm b/lib/DBIx/Class/InflateColumn/File.pm
@@ -176,7 +176,7 @@ InflateColumn::File
 
 =head2 _file_column_callback ($file,$ret,$target)
 
-method made to be overridden for callback purposes.
+Method made to be overridden for callback purposes.
 
 =cut
 

diff --git a/lib/DBIx/Class/Manual/Component.pod b/lib/DBIx/Class/Manual/Component.pod
@@ -106,7 +106,7 @@ L<DBIx::Class::WebForm> - CRUD methods.
 
 =head2 Experimental
 
-These components are under development, there interfaces may
+These components are under development, their interfaces may
 change, they may not work, etc.  So, use them if you want, but
 be warned.