bzr push into connector-net-trunk branch (reggie.burnett:813 to 814) Bug#48974

[Reggie Burnett]

  814 Reggie Burnett	2009-12-09 [merge]
      Fixed problem caused by us not including a 'REFERENCED_TABLE_CATALOG' column in our  foreign keys collection (bug #48974)

    modified:
      CHANGES
      MySql.Data/Provider/Source/ISSchemaProvider.cs
      MySql.Data/Tests/Source/GetSchemaTests.cs
  813 Reggie Burnett	2009-12-09 [merge]
      Fixed precision calculation on decimal and newdecimal columns (bug #48171)

    modified:
      CHANGES
      MySql.Data/Provider/Source/NativeDriver.cs
      MySql.Data/Tests/Source/DataTypeTests.cs
=== modified file 'CHANGES'
=== modified file 'CHANGES'
--- a/CHANGES	2009-12-09 15:08:49 +0000
+++ b/CHANGES	2009-12-09 18:37:24 +0000
@@ -1,6 +1,8 @@
 - When sending file to server (LOAD DATA INFILE) open the file for read only, not for read/write
  (bug #48944)
 - Fixed precision calculation on decimal and newdecimal columns (bug #48171)
+- Fixed problem caused by us not including a 'REFERENCED_TABLE_CATALOG' column in our
+  foreign keys collection (bug #48974)
 
 Version 6.2.1
 - fixed SessionProvider to be compatible with 4.x MySQL, replaced TIMESTAMPDIFF with TIME_TO_SEC

=== modified file 'MySql.Data/Provider/Source/ISSchemaProvider.cs'
--- a/MySql.Data/Provider/Source/ISSchemaProvider.cs	2009-07-28 20:40:35 +0000
+++ b/MySql.Data/Provider/Source/ISSchemaProvider.cs	2009-12-09 18:36:12 +0000
@@ -418,6 +418,7 @@
             string sql = @"SELECT rc.constraint_catalog, rc.constraint_schema,
                 rc.constraint_name, kcu.table_catalog, kcu.table_schema, rc.table_name,
                 rc.match_option, rc.update_rule, rc.delete_rule, 
+                NULL as referenced_table_catalog,
                 kcu.referenced_table_schema, rc.referenced_table_name 
                 FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS rc
                 LEFT JOIN INFORMATION_SCHEMA.KEY_COLUMN_USAGE kcu ON 

=== modified file 'MySql.Data/Tests/Source/GetSchemaTests.cs'
--- a/MySql.Data/Tests/Source/GetSchemaTests.cs	2009-11-25 15:14:35 +0000
+++ b/MySql.Data/Tests/Source/GetSchemaTests.cs	2009-12-09 18:37:24 +0000
@@ -463,7 +463,8 @@
 				"ON UPDATE CASCADE ON DELETE RESTRICT, INDEX (customer_id), " +
 				"FOREIGN KEY (customer_id) REFERENCES customer(id)) ENGINE=INNODB");
 
-			conn.GetSchema("Foreign Keys");
+			DataTable dt = conn.GetSchema("Foreign Keys");
+            Assert.IsTrue(dt.Columns.Contains("REFERENCED_TABLE_CATALOG"));
 		}
 
 		[Test]


Attachment: [text/bzr-bundle] bzr/[e-mail]