Skip to content

Commit

Permalink
Fix exception on complex update/delete under a replicated setup
Browse files Browse the repository at this point in the history
THIS COMMIT IS A HACK!!! The actual fix is migration of the logic to the
SQLMaker subclass and deal with it there. However the entire class hierarchy
is currently in flux, so go with the least invasive change until the storage
rewrite settles.

Testing for this will show up in the next commit
  • Loading branch information
ribasushi committed Mar 18, 2015
1 parent b74b15b commit 7d6c28b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 2 additions & 0 deletions Changes
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ Revision history for DBIx::Class
resolution codepath, restoring exotic uses of inflate_result
http://lists.scsys.co.uk/pipermail/dbix-class/2015-January/011876.html
- Fix updating multiple CLOB/BLOB columns on Oracle
- Fix exception on complex update/delete under a replicated setup
http://lists.scsys.co.uk/pipermail/dbix-class/2015-January/011903.html
- Fix incorrect collapsing-parser source being generated in the
presence of unicode data among the collapse-points
- Fix endless loop on BareSourcelessResultClass->throw_exception(...)
Expand Down
3 changes: 2 additions & 1 deletion lib/DBIx/Class/Storage/DBI/Replicated.pm
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,7 @@ my $method_dispatch = {
_parse_connect_do
savepoints
_sql_maker_opts
_use_multicolumn_in
_conn_pid
_dbh_autocommit
_native_data_type
Expand Down Expand Up @@ -367,7 +368,7 @@ my $method_dispatch = {
# the capability framework
# not sure if CMOP->initialize does evil things to DBIC::S::DBI, fix if a problem
grep
{ $_ =~ /^ _ (?: use | supports | determine_supports ) _ /x }
{ $_ =~ /^ _ (?: use | supports | determine_supports ) _ /x and $_ ne '_use_multicolumn_in' }
( Class::MOP::Class->initialize('DBIx::Class::Storage::DBI')->get_all_method_names )
)],
};
Expand Down

0 comments on commit 7d6c28b

Please sign in to comment.