Bugzilla – Attachment 102341 Details for
Bug 25040
Problematic current_timestamp syntax generated by DBIx::Class::Schema::Loader
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 25040: monkeypatch Schema::Loader for recent MariaDB
Bug-25040-monkeypatch-SchemaLoader-for-recent-Mari.patch (text/plain), 2.70 KB, created by
Martin Renvoize
on 2020-04-03 11:10:07 UTC
(
hide
)
Description:
Bug 25040: monkeypatch Schema::Loader for recent MariaDB
Filename:
MIME Type:
Creator:
Martin Renvoize
Created:
2020-04-03 11:10:07 UTC
Size:
2.70 KB
patch
obsolete
>From 9770e00bfdfbafa42cb0ab1725b59bb566395510 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 25040
:
102277
|
102339
|
102340
|
102341
|
102342
|
102343
|
102344
|
102345
|
102645
|
102696