From 9770e00bfdfbafa42cb0ab1725b59bb566395510 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Fri, 3 Apr 2020 11:16:39 +0100 Subject: [PATCH] Bug 25040: monkeypatch Schema::Loader for recent MariaDB Recent versions of MariaDB changed the output of 'DESCRIBE' for timestamp columns with defaults from `CURRENT_TIMESTAMP` to `current_timestamp()`. As such the code inside DBIx::Class::Schema::Loader which catches such cases and outputs `\"current_timestamp"` as a sensible cross platform default is missed and this leads of inconsistent class files and bugs with out default lookup code in Koha::Objects. This patch serves as a backport of the code I have submitted upstream such that out developers can continue to use update_dbix_class_files.pl to build their schema classes from the database and regardless of their db server version get a consistently correct output. You will need Sub::Override (libsub-override-perl) after this patch to use update_dbix_class_files. --- misc/devel/update_dbix_class_files.pl | 35 +++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/misc/devel/update_dbix_class_files.pl b/misc/devel/update_dbix_class_files.pl index b89ec635a5..cf59228da0 100755 --- a/misc/devel/update_dbix_class_files.pl +++ b/misc/devel/update_dbix_class_files.pl @@ -20,7 +20,42 @@ use Modern::Perl; +use Sub::Override; use DBIx::Class::Schema::Loader qw/ make_schema_at /; +require DBIx::Class::Schema::Loader::DBI::mysql; + +# This is being upstreamed, but for now lets make sure whatever version of DBIx::Class::Schema::Loader you are using, +# we will catch MariaDB current_timestamp() and convert it to \"current_timestamp" correctly. +Sub::Override->new( + 'DBIx::Class::Schema::Loader::DBI::mysql::_extra_column_info', + sub { + no warnings 'uninitialized'; + my ( $self, $table, $col, $info, $dbi_info ) = @_; + my %extra_info; + + if ( $dbi_info->{mysql_is_auto_increment} ) { + $extra_info{is_auto_increment} = 1; + } + if ( $dbi_info->{mysql_type_name} =~ /\bunsigned\b/i ) { + $extra_info{extra}{unsigned} = 1; + } + if ( $dbi_info->{mysql_values} ) { + $extra_info{extra}{list} = $dbi_info->{mysql_values}; + } + if ( + ( not blessed $dbi_info) # isa $sth + && lc( $dbi_info->{COLUMN_DEF} ) =~ m/^current_timestamp/ + && lc( $dbi_info->{mysql_type_name} ) eq 'timestamp' + ) + { + + my $current_timestamp = 'current_timestamp'; + $extra_info{default_value} = \$current_timestamp; + } + + return \%extra_info; + } +); use Getopt::Long; use Pod::Usage; -- 2.20.1