From ca851f24944765c2aba0bb18fa759f8d66e9634c Mon Sep 17 00:00:00 2001 From: Marek Habersack Date: Tue, 7 Sep 2010 20:44:31 +0200 Subject: [PATCH] [xsp] Fix for bug #636763. Mono.Data.Sqlite must be used since Mono.Data.SqliteClient is deprecated. --- test/1.1/webcontrols/dbpage1.aspx | 13 +++++++------ test/1.1/webcontrols/dbpage2.aspx | 12 +++++++----- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/test/1.1/webcontrols/dbpage1.aspx b/test/1.1/webcontrols/dbpage1.aspx index 5675b1f0..6d5c906b 100644 --- a/test/1.1/webcontrols/dbpage1.aspx +++ b/test/1.1/webcontrols/dbpage1.aspx @@ -29,13 +29,15 @@ Version ver = Environment.Version; if (providerAssembly == null || providerAssembly == "") - if (ver.Major == 1) - providerAssembly = "Mono.Data.SqliteClient, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"; - else if (ver.Major == 2) - providerAssembly = "Mono.Data.SqliteClient, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"; + if (ver.Major == 2) + providerAssembly = "Mono.Data.Sqlite, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"; + else if (ver.Major == 4) + providerAssembly = "Mono.Data.Sqlite, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"; + else + throw new InvalidOperationException (String.Format ("Framework version {0} is not supported by this demo.", ver)); if (cncTypeName == null || cncTypeName == "") - cncTypeName = "Mono.Data.SqliteClient.SqliteConnection"; + cncTypeName = "Mono.Data.Sqlite.SqliteConnection"; if (cncString == null || cncString == "") { string dbPath = Path.Combine (Path.GetDirectoryName (Request.MapPath (Request.FilePath)), "dbpage1.sqlite"); @@ -182,4 +184,3 @@ CellPadding="5" runat="server"/> - diff --git a/test/1.1/webcontrols/dbpage2.aspx b/test/1.1/webcontrols/dbpage2.aspx index 73f6cee6..ce008fa6 100644 --- a/test/1.1/webcontrols/dbpage2.aspx +++ b/test/1.1/webcontrols/dbpage2.aspx @@ -35,13 +35,15 @@ Version ver = Environment.Version; if (providerAssembly == null || providerAssembly == "") - if (ver.Major == 1) - providerAssembly = "Mono.Data.SqliteClient, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"; - else if (ver.Major == 2) - providerAssembly = "Mono.Data.SqliteClient, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"; + if (ver.Major == 2) + providerAssembly = "Mono.Data.Sqlite, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"; + else if (ver.Major == 4) + providerAssembly = "Mono.Data.Sqlite, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"; + else + throw new InvalidOperationException (String.Format ("Framework version {0} is not supported by this demo.", ver)); if (cncTypeName == null || cncTypeName == "") - cncTypeName = "Mono.Data.SqliteClient.SqliteConnection"; + cncTypeName = "Mono.Data.Sqlite.SqliteConnection"; if (cncString == null || cncString == "") { string dbPath = Path.Combine (Path.GetDirectoryName (Request.MapPath (Request.FilePath)), "dbpage2.sqlite");