- rename ResultSetInstance class to ResultSetProxy

- rename ResultSourceInstance class to ResultSourceProxy
- rename TableInstance class to ResultSourceProxy::Table

diff --git a/lib/DBIx/Class/Core.pm b/lib/DBIx/Class/Core.pm
index 298192b..44a5f96 100644 (file)
--- a/lib/DBIx/Class/Core.pm
+++ b/lib/DBIx/Class/Core.pm
@@ -11,7 +11,7 @@ __PACKAGE__->load_components(qw/
   Relationship
   PK
   Row
-  TableInstance
+  ResultSourceProxy::Table
   Exception
   AccessorGroup/);
 
@@ -43,7 +43,7 @@ The core modules currently are:
 
 =item L<DBIx::Class::Row>
 
-=item L<DBIx::Class::TableInstance>
+=item L<DBIx::Class::ResultSourceProxy::Table>
 
 =item L<DBIx::Class::Exception>
 

diff --git a/lib/DBIx/Class/DB.pm b/lib/DBIx/Class/DB.pm
index 99b4d33..c97a708 100644 (file)
--- a/lib/DBIx/Class/DB.pm
+++ b/lib/DBIx/Class/DB.pm
@@ -6,7 +6,7 @@ use DBIx::Class::Storage::DBI;
 use DBIx::Class::ClassResolver::PassThrough;
 use DBI;
 
-__PACKAGE__->load_components(qw/ResultSetInstance/);
+__PACKAGE__->load_components(qw/ResultSetProxy/);
 
 *dbi_commit = \&txn_commit;
 *dbi_rollback = \&txn_rollback;

diff --git a/lib/DBIx/Class/Manual/SchemaIntro.pod b/lib/DBIx/Class/Manual/SchemaIntro.pod
index 8bd928f..02ac2e6 100644 (file)
--- a/lib/DBIx/Class/Manual/SchemaIntro.pod
+++ b/lib/DBIx/Class/Manual/SchemaIntro.pod
@@ -15,7 +15,7 @@ L<DBIx::Class::Schema>:
   package My::Schema;
   use base qw/DBIx::Class::Schema/;
 
-In this class you load your resultsource ("table", "model") classes, which
+In this class you load your result_source ("table", "model") classes, which
 we will define later, using the load_classes() method. You can specify which
 classes to load manually: 
 

diff --git a/lib/DBIx/Class/ResultSet.pm b/lib/DBIx/Class/ResultSet.pm
index 4df3d58..176d20c 100644 (file)
--- a/lib/DBIx/Class/ResultSet.pm
+++ b/lib/DBIx/Class/ResultSet.pm
@@ -48,7 +48,7 @@ In the examples below, the following table classes are used:
 =head2 new($source, \%$attrs)
 
 The resultset constructor. Takes a source object (usually a
-L<DBIx::Class::TableInstance>) and an attribute hash (see L</ATRRIBUTES>
+L<DBIx::Class::ResultSourceProxy::Table>) and an attribute hash (see L</ATRRIBUTES>
 below).  Does not perform any queries -- these are executed as needed by the
 other methods.
 

diff --git a/lib/DBIx/Class/ResultSetInstance.pm b/lib/DBIx/Class/ResultSetProxy.pm
similarity index 93%
rename from lib/DBIx/Class/ResultSetInstance.pm
rename to lib/DBIx/Class/ResultSetProxy.pm
index 0476f82..7672052 100644 (file)
--- a/lib/DBIx/Class/ResultSetInstance.pm
+++ b/lib/DBIx/Class/ResultSetProxy.pm
@@ -1,4 +1,4 @@
-package DBIx::Class::ResultSetInstance;
+package DBIx::Class::ResultSetProxy;
 
 use base qw/DBIx::Class/;
 

diff --git a/lib/DBIx/Class/ResultSourceInstance.pm b/lib/DBIx/Class/ResultSourceProxy.pm
similarity index 97%
rename from lib/DBIx/Class/ResultSourceInstance.pm
rename to lib/DBIx/Class/ResultSourceProxy.pm
index 6033cba..5aed87b 100644 (file)
--- a/lib/DBIx/Class/ResultSourceInstance.pm
+++ b/lib/DBIx/Class/ResultSourceProxy.pm
@@ -1,4 +1,4 @@
-package DBIx::Class::ResultSourceInstance;
+package DBIx::Class::ResultSourceProxy;
 
 use strict;
 use warnings;

diff --git a/lib/DBIx/Class/TableInstance.pm b/lib/DBIx/Class/ResultSourceProxy/Table.pm
similarity index 93%
rename from lib/DBIx/Class/TableInstance.pm
rename to lib/DBIx/Class/ResultSourceProxy/Table.pm
index 4858c30..e8a2da0 100644 (file)
--- a/lib/DBIx/Class/TableInstance.pm
+++ b/lib/DBIx/Class/ResultSourceProxy/Table.pm
@@ -1,9 +1,9 @@
-package DBIx::Class::TableInstance;
+package DBIx::Class::ResultSourceProxy::Table;
 
 use strict;
 use warnings;
 
-use base qw/DBIx::Class::ResultSourceInstance/;
+use base qw/DBIx::Class::ResultSourceProxy/;
 use DBIx::Class::ResultSource::Table;
 
 __PACKAGE__->mk_classdata('table_alias'); # FIXME: Doesn't actually do anything yet!
@@ -12,7 +12,7 @@ __PACKAGE__->mk_classdata('table_class' => 'DBIx::Class::ResultSource::Table');
 
 =head1 NAME 
 
-DBIx::Class::TableInstance - provides a classdata table object and method proxies
+DBIx::Class::ResultSourceProxy::Table - provides a classdata table object and method proxies
 
 =head1 SYNOPSIS
 

diff --git a/lib/DBIx/Class/Schema.pm b/lib/DBIx/Class/Schema.pm
index 1b55afa..ad13b94 100644 (file)
--- a/lib/DBIx/Class/Schema.pm
+++ b/lib/DBIx/Class/Schema.pm
@@ -58,7 +58,7 @@ particular which module inherits off which.
 
 =head2 register_class <moniker> <component_class>
 
-Registers a class which isa ResultSourceInstance; equivalent to calling
+Registers a class which isa ResultSourceProxy; equivalent to calling
 
   $schema->register_source($moniker, $class->result_source_instance);
 
@@ -229,7 +229,7 @@ you expect.
 
 sub compose_connection {
   my ($self, $target, @info) = @_;
-  my $base = 'DBIx::Class::ResultSetInstance';
+  my $base = 'DBIx::Class::ResultSetProxy';
   $base->require;
   my $schema = $self->compose_namespace($target, $base);
   $schema->connection(@info);