From 1d6ab6818968a72e20270a30993008fb4fb6238c Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 27 Aug 2007 14:38:10 +0000 Subject: [PATCH] Added patch for Maypole::Model::CDBI to avoid clash of _column_info method with Class::DBI::mysql. --- .../patches/106_fix-_column_info-clash.diff | 65 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 66 insertions(+) create mode 100644 debian/patches/106_fix-_column_info-clash.diff diff --git a/debian/patches/106_fix-_column_info-clash.diff b/debian/patches/106_fix-_column_info-clash.diff new file mode 100644 index 0000000..430f254 --- /dev/null +++ b/debian/patches/106_fix-_column_info-clash.diff @@ -0,0 +1,65 @@ +--- maypole.orig/lib/Maypole/Model/CDBI.pm ++++ maypole/lib/Maypole/Model/CDBI.pm +@@ -503,7 +503,7 @@ + + # Thanks to dave baird -- form builder for these private functions + # sub _column_info { +-sub _column_info { ++sub _init_column_info { + my $self = shift; + my $dbh = $self->db_Main; + +@@ -615,7 +615,7 @@ + sub column_type { + my $class = shift; + my $colname = shift or die "Need a column for column_type"; +- $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_type($colname); +@@ -646,7 +646,7 @@ + + sub required_columns { + my ($class, $columns) = @_; +- $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 @@ + sub column_required { + my ($class, $colname) = @_; + $colname or $class->_croak( "Need a column for column_nullable" ); +- $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 @@ + my $class = shift; + my $colname = shift or $class->_croak( "Need a column for column_nullable" ); + +- $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_nullable($colname); + } +@@ -737,7 +737,7 @@ + sub column_default { + my $class = shift; + my $colname = shift or $class->_croak( "Need a column for column_default"); +- $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_default($colname); + } +@@ -770,7 +770,7 @@ + $res{moniker} = $class->moniker; + $res{plural} = $class->plural_moniker; + $res{table} = $class->table; +- $res{column_metadata} = (ref $class->COLUMN_INFO) ? $class->COLUMN_INFO : $class->_column_info() ; ++ $res{column_metadata} = (ref $class->COLUMN_INFO) ? $class->COLUMN_INFO : $class->_init_column_info() ; + return \%res; + } + diff --git a/debian/patches/series b/debian/patches/series index 0f93769..bac8b0a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,4 +3,5 @@ 103_fix-view_object-warning.diff 104_add-cgi-error-status.diff 105_dont-use-warn-method.diff +106_fix-_column_info-clash.diff 201_no-file-mmagic-xs.diff -- 2.39.5