Pick SQL for appending in a cleaner way

frioux · Jan 12, 2014 · 685f435 · 685f435
1 parent 2437a53
commit 685f435
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 16 deletions.
diff --git a/Changes b/Changes
@@ -1,6 +1,7 @@
 Revision history for {{$dist->name}}
 
 {{$NEXT}}
+  - Pick SQL for appending in a cleaner way
   - Ditch RT
 
 0.002000  2013-01-21 15:30:32 CST6CDT

diff --git a/cpanfile b/cpanfile
@@ -1,4 +1,7 @@
 requires 'DBIx::Class' => 0.08196;
+requires 'DBIx::Introspector';
+requires 'Module::Runtime';
+requires 'Try::Tiny';
 requires 'DBIx::Class::Helpers' => 2.007004;
 requires 'Class::C3::Componentised' => 1.001000;
 requires 'SQL::Translator' => 0.11011;

diff --git a/lib/DBIx/Class/MaterializedPath.pm b/lib/DBIx/Class/MaterializedPath.pm
@@ -5,6 +5,8 @@ package DBIx::Class::MaterializedPath;
 use strict;
 use warnings;
 
+use Module::Runtime 'use_module';
+use Try::Tiny;
 use base 'DBIx::Class::Helper::Row::OnColumnChange';
 
 use English;
@@ -85,27 +87,26 @@ sub _install_after_column_change {
    }
 }
 
-my %concat_operators = (
-   'DBIx::Class::Storage::DBI::MSSQL' => '+',
-);
+sub _introspector {
+   my $d = use_module('DBIx::Introspector')
+      ->new(drivers => '2013-12.01');
 
+   $d->decorate_driver_unconnected(MSSQL => concat_sql => sub { '%s + %s' });
+   $d->decorate_driver_unconnected(mysql => concat_sql => sub { 'CONCAT( %s, %s )' });
+
+   $d
+}
+
+my $d;
 sub _get_concat {
    my ($self, $rsrc, @substrings) = @_;
 
-   my $format;
+   my $storage = $rsrc->storage;
+   $storage->ensure_connected;
 
-   if ($rsrc->storage->isa('DBIx::Class::Storage::DBI::mysql')) {
-      $format = q{CONCAT( %s, %s )};
-   } else {
-      my $concat_operator = '||';
-      for (keys %concat_operators) {
-         if ($rsrc->storage->isa($_)) {
-            $concat_operator = $concat_operators{ $_ };
-            last
-         }
-      }
-      $format = qq{%s $concat_operator %s};
-   }
+   $d ||= $self->_introspector;
+
+   my $format = try { $d->get($storage->dbh, undef, 'concat_sql') } catch { '%s || %s' };
 
    return sprintf $format, @substrings;
 }