better support for case-sensitive collations in MSSQL

diff --git a/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm b/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm
index 3790b81..debfbde 100644 (file)
--- a/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm
@@ -49,7 +49,7 @@ sub _setup {
     # XXX why does databasepropertyex() not work over DBD::ODBC ?
     my ($collation_name) =
            eval { $dbh->selectrow_array('SELECT collation_name FROM sys.databases WHERE name = DB_NAME()') }
-        || eval { $dbh->selectrow_array("SELECT databasepropertyex(DB_NAME(), 'collation')") };
+        || eval { $dbh->selectrow_array("SELECT databasepropertyex(DB_NAME(), 'Collation')") };
 
     if (not $collation_name) {
         $self->case_sensitive_collation(0); # most likely not
@@ -73,7 +73,7 @@ sub _tables_list {
     my $dbh = $self->schema->storage->dbh;
     my $sth = $dbh->prepare(<<'EOF');
 SELECT t.table_name
-FROM information_schema.tables t
+FROM INFORMATION_SCHEMA.TABLES t
 WHERE lower(t.table_schema) = ?
 EOF
     $sth->execute(lc $self->db_schema);
@@ -134,9 +134,9 @@ sub _table_uniq_info {
 
     my $sth = $dbh->prepare(qq{
 SELECT ccu.constraint_name, ccu.column_name
-FROM information_schema.constraint_column_usage ccu
-JOIN information_schema.table_constraints tc on (ccu.constraint_name = tc.constraint_name)
-JOIN information_schema.key_column_usage kcu on (ccu.constraint_name = kcu.constraint_name and ccu.column_name = kcu.column_name)
+FROM INFORMATION_SCHEMA.CONSTRAINT_COLUMN_USAGE ccu
+JOIN INFORMATION_SCHEMA.TABLE_CONSTRAINTS tc on (ccu.constraint_name = tc.constraint_name)
+JOIN INFORMATION_SCHEMA.KEY_COLUMN_USAGE kcu on (ccu.constraint_name = kcu.constraint_name and ccu.column_name = kcu.column_name)
 wHERE lower(ccu.table_name) = @{[ $dbh->quote(lc $table) ]} AND constraint_type = 'UNIQUE' ORDER BY kcu.ordinal_position
     });
     $sth->execute;
@@ -162,7 +162,7 @@ sub _columns_info_for {
 
         my $sth = $dbh->prepare(qq{
 SELECT column_name 
-FROM information_schema.columns
+FROM INFORMATION_SCHEMA.COLUMNS
 WHERE columnproperty(object_id(@{[ $dbh->quote(lc $table) ]}, 'U'), @{[ $dbh->quote(lc $col) ]}, 'IsIdentity') = 1
 AND lower(table_name) = @{[ $dbh->quote(lc $table) ]} AND lower(column_name) = @{[ $dbh->quote(lc $col) ]}
         });
@@ -175,7 +175,7 @@ AND lower(table_name) = @{[ $dbh->quote(lc $table) ]} AND lower(column_name) = @
 # get default
         $sth = $dbh->prepare(qq{
 SELECT column_default
-FROM information_schema.columns
+FROM INFORMATION_SCHEMA.COLUMNS
 wHERE lower(table_name) = @{[ $dbh->quote(lc $table) ]} AND lower(column_name) = @{[ $dbh->quote(lc $col) ]}
         });
         my ($default) = eval { $sth->execute; $sth->fetchrow_array };

diff --git a/t/16mssql_common.t b/t/16mssql_common.t
index 7c2d37f..22369a0 100644 (file)
--- a/t/16mssql_common.t
+++ b/t/16mssql_common.t
@@ -81,8 +81,8 @@ my $tester = dbixcsl_common_tests->new(
         drop   => [
             '[mssql_loader_test1.dot]',
             'mssql_loader_test3',
-            'mssql_loader_test5',
-            'mssql_loader_test6',
+            'MSSQL_Loader_Test6',
+            'MSSQL_Loader_Test5',
         ],
         count  => 10,
         run    => sub {
@@ -105,21 +105,33 @@ my $tester = dbixcsl_common_tests->new(
             ok ((my $rsrc = $schema->resultset($monikers->{mssql_loader_test5})->result_source),
                 'got result_source');
 
-## not anymore
-#            is $rsrc->name, 'mssql_loader_test5',
-#                'table name is lowercased';
+            if ($schema->_loader->_is_case_sensitive) {
+                is_deeply [ $rsrc->columns ], [qw/Id FooCol BarCol/],
+                    'column name case is preserved with case-sensitive collation';
 
-            is_deeply [ $rsrc->columns ], [qw/id foocol barcol/],
-                'column names are lowercased';
+                my %uniqs = $rsrc->unique_constraints;
+                delete $uniqs{primary};
 
-            my %uniqs = $rsrc->unique_constraints;
-            delete $uniqs{primary};
+                is_deeply ((values %uniqs)[0], [qw/FooCol BarCol/],
+                    'column name case is preserved in unique constraint with case-sensitive collation');
+            }
+            else {
+                is_deeply [ $rsrc->columns ], [qw/id foocol barcol/],
+                    'column names are lowercased for case-insensitive collation';
+
+                my %uniqs = $rsrc->unique_constraints;
+                delete $uniqs{primary};
 
-            is_deeply ((values %uniqs)[0], [qw/foocol barcol/],
-                'columns in unique constraint lowercased');
+                is_deeply ((values %uniqs)[0], [qw/foocol barcol/],
+                    'columns in unique constraint lowercased for case-insensitive collation');
+            }
 
             lives_and {
-                my $five_row = $schema->resultset($monikers->{mssql_loader_test5})->create({ foocol => 1, barcol => 2 });
+                my $five_row = $schema->resultset($monikers->{mssql_loader_test5})->new_result({});
+                $five_row->foocol(1);
+                $five_row->barcol(2);
+                $five_row->insert;
+
                 my $six_row  = $five_row->create_related('mssql_loader_test6s', {});
 
                 is $six_row->five->id, 1;
@@ -151,3 +163,4 @@ if(not ($dbd_sybase_dsn || $odbc_dsn)) {
 else {
     $tester->run_tests();
 }
+# vim:et sts=4 sw=4 tw=0: