X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FMaypole%2FManual%2FInheritance.pod;h=6c6c6b77eba53e34624cf88766ec64bb52017412;hb=ea4ae8a93a09e21354465c485471e5f10582b784;hp=a20740578a0cde8813474e368439245200592354;hpb=58417aa5f41b42076f991a81b403633bfcb94f39;p=maypole.git

diff --git a/lib/Maypole/Manual/Inheritance.pod b/lib/Maypole/Manual/Inheritance.pod
index a207405..6c6c6b7 100644
--- a/lib/Maypole/Manual/Inheritance.pod
+++ b/lib/Maypole/Manual/Inheritance.pod
@@ -37,7 +37,7 @@ custom driver class (BeerDB.pm), a set of auto-generated model classes, and a
 view class: 
 
 
-                  THE DRIVER
+           THE DRIVER
                                           +------- init() is a factory method,
                    1      Maypole         |           it sets up the view
    Maypole::Config <----- config();       |              classes
@@ -58,14 +58,14 @@ view class:
     |     it sets up the model
     |         classes
     |
-    |                                 THE MODEL
+    |                                             THE MODEL
     |
-    |  Maypole::Model::Base   Class::DBI
-    |             +             +
-    |             |             |
-    +-------> Maypole::Model::CDBI
-                      +
-                      |
+    |  Maypole::Model::Base    Class::DBI
+    |             +             +      +
+    |             |             |      |
+    +-------> Maypole::Model::CDBI   Class::DBI::<db_driver>
+                      +                     +
+                      |                     |
            +------------+--------+-------+---------+
            |            |        |       |         |
        BeerDB::Pub      |   BeerDB::Beer | BeerDB::Brewery
@@ -98,10 +98,13 @@ customised model.
 
 The standard model is built in 3 stages. 
 
-First, C<Maypole::setup> calls C<setup_database> on the Maypole model class, in
-this case L<Maypole::Model::CDBI>. C<setup_database> then uses
+First, C<Maypole::setup_model> calls C<setup_database> on the Maypole model
+class, in this case L<Maypole::Model::CDBI>. C<setup_database> then uses
 L<Class::DBI::Loader> to autogenerate individual L<Class::DBI> classes for each
 of the tables in the database (C<BeerDB::Beer>, C<BeerDB::Pub> etc).
+L<Class::DBI::Loader> identifies the appropriate L<Class::DBI> subclass and
+inserts it into each of these table classes' C<@ISA> ( C<<
+Class::DBI::<db_driver> >> in the diagrams)..
 
 Next, C<Maypole::setup> B<unshifts> L<Maypole::Model::CDBI> onto the C<@ISA> 
 array of each of these classes. 
@@ -177,8 +180,8 @@ C<BeerDB2::Beer>, you would write:
     use base 'OfflineBeer::Beer';
     1;
     
-This package will be loaded automatically during C<setup()>, and
-C<BeerDB2::Maypole::Model> is B<unshifted> onto it's C<@ISA>. 
+From Maypole 2.11, this package will be loaded automatically during C<setup()>,
+and C<BeerDB2::Maypole::Model> is B<unshifted> onto it's C<@ISA>.
 
 Configure relationships either in the individual C<OfflineBeer::*> classes, or
 else all together in C<OfflineBeer> itself i.e. not in the Maypole model. This 
@@ -191,15 +194,16 @@ The resulting model looks like this:
                                           |
    Maypole::Model::Base                   |
            +                              |
-           |       +----------------------+-----------------+
-           |       |                                        |
-           |       |                                        |
-     Maypole::Model::CDBI                                   |     OFFLINE
-             +                                              |        MODEL
-             |                                              |
-     BeerDB2::Maypole::Model                           OfflineBeer
-       +                                                    +
-       |                                                    |
+           |       +-----------------+----+-----------------+
+           |       |                 |                      |
+           |       |                 |                      |
+     Maypole::Model::CDBI            |                      |     OFFLINE
+             +                       |                      |        MODEL
+             |                       |                      |
+     BeerDB2::Maypole::Model  Class::DBI::<db_driver>  OfflineBeer
+       +                             +                      +
+       |                             |                      |
+       +-----------------------------+                      |
        |                                                    |
        +--- BeerDB2::Pub --------+ OfflineBeer::Pub --------+
        |                           beers();                 |
@@ -223,10 +227,10 @@ The resulting model looks like this:
 
 =head3 Features
 
-Non-Maypole applications using the Offline model are completely isolated from
+1. Non-Maypole applications using the Offline model are completely isolated from
 the Maypole application, and need not know it exists at all.
 
-Methods defined in the Maypole table classes, override methods defined in the
+2. Methods defined in the Maypole table classes, override methods defined in the
 Offline table classes, because C<BeerDB2::Maypole::Model> was unshifted onto the
 beginning of each Maypole table class's C<@ISA>. Perl's depth first,
 left-to-right method lookup from e.g. C<BeerDB2::Beer> starts in
@@ -242,13 +246,14 @@ C<OfflineBeer::CDBI>. Place this B<first> in the C<@ISA> of both
 C<BeerDB2::Maypole::Model> and C<OfflineBeer>. Note that C<OfflineBeer::CDBI>
 does not itself need to inherit from L<Class::DBI>.
 
-Methods defined in the Maypole model base class (C<BeerDB2::Maypole::Model>),
+3. Methods defined in the Maypole model base class (C<BeerDB2::Maypole::Model>),
 override methods in the individual Offline table classes, and in the Offline
 model base class (C<Offline>). 
 
-Relationships defined in the Offline classes are inherited by the Maypole model.
+4. Relationships defined in the Offline classes are inherited by the Maypole
+model.
 
-The Maypole model has full access to the underlying Offline model. 
+5. The Maypole model has full access to the underlying Offline model. 
 
 =head3 Theory