X-Git-Url: https://git.decadent.org.uk/gitweb/?p=maypole.git;a=blobdiff_plain;f=debian%2Fpatches%2F106_fix-_column_info-clash.diff;h=0b457f897315194138ac72b099eb3219a2051c4a;hp=430f2547dca3bcff5e04991d3855cbd4630af2ec;hb=dd425b2cb6384f804cc1eea9e45660ed6baeb2f1;hpb=fadcae3ffddebaa38da172f9624cc60176d80b33

diff --git a/debian/patches/106_fix-_column_info-clash.diff b/debian/patches/106_fix-_column_info-clash.diff
index 430f254..0b457f8 100644
--- a/debian/patches/106_fix-_column_info-clash.diff
+++ b/debian/patches/106_fix-_column_info-clash.diff
@@ -1,6 +1,6 @@
---- maypole.orig/lib/Maypole/Model/CDBI.pm
-+++ maypole/lib/Maypole/Model/CDBI.pm
-@@ -503,7 +503,7 @@
+--- maypole.orig/lib/Maypole/Model/CDBI/Base.pm
++++ maypole/lib/Maypole/Model/CDBI/Base.pm
+@@ -460,7 +460,7 @@
  
  # Thanks to dave baird --  form builder for these private functions
  # sub _column_info {
@@ -9,7 +9,7 @@
    my $self = shift;
    my $dbh = $self->db_Main;
  
-@@ -615,7 +615,7 @@
+@@ -572,7 +572,7 @@
  sub column_type {
    my $class = shift;
    my $colname = shift or die "Need a column for column_type";
@@ -18,25 +18,25 @@
  
    if ($class->_isa_class($colname)) {
      return $class->_isa_class($colname)->column_type($colname);
-@@ -646,7 +646,7 @@
+@@ -609,7 +609,7 @@
  
  sub required_columns {
    my ($class, $columns) = @_;
--  $class->_column_info() unless ref $class->COLUMN_INFO;
-+  $class->_init_column_info() unless ref $class->COLUMN_INFO;
+-  $class->_column_info() unless (ref $class->COLUMN_INFO);
++  $class->_init_column_info() unless (ref $class->COLUMN_INFO);
    my $column_info = $class->COLUMN_INFO;
  
    if ($columns) {
-@@ -683,7 +683,7 @@
+@@ -660,7 +660,7 @@
  sub column_required {
    my ($class, $colname) = @_;
-   $colname or $class->_croak( "Need a column for column_nullable" );
+   $colname or $class->_croak( "Need a column for column_required" );
 -  $class->_column_info() unless ref $class->COLUMN_INFO;
 +  $class->_init_column_info() unless ref $class->COLUMN_INFO;
    if ($class->_isa_class($colname)) {
      return $class->_isa_class($colname)->column_required($colname);
    }
-@@ -714,7 +714,7 @@
+@@ -692,7 +692,7 @@
      my $class = shift;
      my $colname = shift or $class->_croak( "Need a column for column_nullable" );
  
@@ -45,7 +45,7 @@
    if ($class->_isa_class($colname)) {
      return $class->_isa_class($colname)->column_nullable($colname);
    }
-@@ -737,7 +737,7 @@
+@@ -716,7 +716,7 @@
  sub column_default {
    my $class = shift;
    my $colname = shift or $class->_croak( "Need a column for column_default");
@@ -54,7 +54,7 @@
    if ($class->_isa_class($colname)) {
      return $class->_isa_class($colname)->column_default($colname);
    }
-@@ -770,7 +770,7 @@
+@@ -750,7 +750,7 @@
      $res{moniker}       = $class->moniker;
      $res{plural}        = $class->plural_moniker;
      $res{table}         = $class->table;