[Bast-commits] r4197 - DBIx-Class/0.08/trunk/lib/DBIx/Class/CDBICompat

[schwern at dev.catalyst.perl.org]

Author: schwern
Date: 2008-03-14 01:41:32 +0000 (Fri, 14 Mar 2008)
New Revision: 4197

Modified:
   DBIx-Class/0.08/trunk/lib/DBIx/Class/CDBICompat/ColumnCase.pm
   DBIx-Class/0.08/trunk/lib/DBIx/Class/CDBICompat/ColumnGroups.pm
Log:
Move the code to create accessors out of ColumnCase and into ColumnGroups.
This allows one to remove ColumnCase without effecting other features.

Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/CDBICompat/ColumnCase.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/CDBICompat/ColumnCase.pm	2008-03-14 01:32:02 UTC (rev 4196)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/CDBICompat/ColumnCase.pm	2008-03-14 01:41:32 UTC (rev 4197)
@@ -79,72 +79,16 @@
   return \%new_query;
 }
 
+sub _deploy_accessor {
+  my($class, $name, $accessor) = @_;
 
-# CDBI will never overwrite an accessor, but it only uses one
-# accessor for all column types.  DBIC uses many different
-# accessor types so, for example, if you declare a column()
-# and then a has_a() for that same column it must overwrite.
-#
-# To make this work CDBICompat has decide if an accessor
-# method was put there by itself and only then overwrite.
-{
-  my %our_accessors;
+  return if $class->_has_custom_accessor($name);
 
-  sub _has_custom_accessor {
-    my($class, $name) = @_;
-    
-    no strict 'refs';
-    my $existing_accessor = *{$class .'::'. $name}{CODE};
-    return $existing_accessor && !$our_accessors{$existing_accessor};
-  }
-
-  sub _deploy_accessor {
-    my($class, $name, $accessor) = @_;
-
-    return if $class->_has_custom_accessor($name);
-
-    for my $name ($name, lc $name) {
-      no strict 'refs';
-      no warnings 'redefine';
-      *{$class .'::'. $name} = $accessor;
-    }
-    
-    $our_accessors{$accessor}++;
-
-    return 1;
-  }
+         $class->next::method(lc $name   => $accessor);
+  return $class->next::method($name      => $accessor);
 }
 
-sub _mk_group_accessors {
-  my ($class, $type, $group, @fields) = @_;
 
-  # So we don't have to do lots of lookups inside the loop.
-  my $maker = $class->can($type) unless ref $type;
-
-  # warn "$class $type $group\n";
-  foreach my $field (@fields) {
-    if( $field eq 'DESTROY' ) {
-        carp("Having a data accessor named DESTROY in ".
-             "'$class' is unwise.");
-    }
-
-    my $name = $field;
-
-    ($name, $field) = @$field if ref $field;
-
-    my $accessor = $class->$maker($group, $field);
-    my $alias = "_${name}_accessor";
-
-    # warn "  $field $alias\n";
-    {
-      no strict 'refs';
-      
-      $class->_deploy_accessor($name,  $accessor);
-      $class->_deploy_accessor($alias, $accessor);
-    }
-  }
-}
-
 sub new {
   my ($class, $attrs, @rest) = @_;
   my %att;

Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/CDBICompat/ColumnGroups.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/CDBICompat/ColumnGroups.pm	2008-03-14 01:32:02 UTC (rev 4196)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/CDBICompat/ColumnGroups.pm	2008-03-14 01:41:32 UTC (rev 4197)
@@ -55,6 +55,71 @@
   $class->_column_groups($groups);
 }
 
+# CDBI will never overwrite an accessor, but it only uses one
+# accessor for all column types.  DBIC uses many different
+# accessor types so, for example, if you declare a column()
+# and then a has_a() for that same column it must overwrite.
+#
+# To make this work CDBICompat has decide if an accessor
+# method was put there by itself and only then overwrite.
+{
+  my %our_accessors;
+
+  sub _has_custom_accessor {
+    my($class, $name) = @_;
+    
+    no strict 'refs';
+    my $existing_accessor = *{$class .'::'. $name}{CODE};
+    return $existing_accessor && !$our_accessors{$existing_accessor};
+  }
+
+  sub _deploy_accessor {
+    my($class, $name, $accessor) = @_;
+
+    return if $class->_has_custom_accessor($name);
+
+    {
+      no strict 'refs';
+      no warnings 'redefine';
+      *{$class .'::'. $name} = $accessor;
+    }
+    
+    $our_accessors{$accessor}++;
+
+    return 1;
+  }
+}
+
+sub _mk_group_accessors {
+  my ($class, $type, $group, @fields) = @_;
+
+  # So we don't have to do lots of lookups inside the loop.
+  my $maker = $class->can($type) unless ref $type;
+
+  # warn "$class $type $group\n";
+  foreach my $field (@fields) {
+    if( $field eq 'DESTROY' ) {
+        carp("Having a data accessor named DESTROY in ".
+             "'$class' is unwise.");
+    }
+
+    my $name = $field;
+
+    ($name, $field) = @$field if ref $field;
+
+    my $accessor = $class->$maker($group, $field);
+    my $alias = "_${name}_accessor";
+
+    # warn "  $field $alias\n";
+    {
+      no strict 'refs';
+      
+      $class->_deploy_accessor($name,  $accessor);
+      $class->_deploy_accessor($alias, $accessor);
+    }
+  }
+}
+
 sub all_columns { return shift->result_source_instance->columns; }
 
 sub primary_column {