Hi! The patch seems fine. Regards the error I'll check it this afternoon. Thanks Atsushi.
On Wed, Oct 8, 2008 at 11:01 AM, Atsushi Eno <[EMAIL PROTECTED]> wrote: > Hi, > > I cooked a patch for every vendor (excluding SqlServer that is > already done) to make types internal so that we can include them > into mono's System.Data.Linq.dll. Can any of you review and apply it? > > I'm having a look at NullReferenceException that occurs while > running northwind example (the one that Pablo posted to mono-soc-2008 > list: http://groups.google.decenturl.com/dblinq-integration-testing ). > The stack trace is here: http://monoport.com/37626 > > If I'm likely caught by any obvious trap, please tell me ;) > > Atsushi Eno > > > > > Index: src/DbLinq.Ingres/IngresSqlProvider.cs > =================================================================== > --- src/DbLinq.Ingres/IngresSqlProvider.cs (revision 899) > +++ src/DbLinq.Ingres/IngresSqlProvider.cs (working copy) > @@ -27,12 +27,21 @@ > using System; > using System.Collections.Generic; > using System.Linq; > +#if MONO_STRICT > +using System.Data.Linq.Sql; > +#else > using DbLinq.Data.Linq.Sql; > +#endif > using DbLinq.Vendor.Implementation; > > namespace DbLinq.Ingres > { > - public class IngresSqlProvider : SqlProvider > +#if MONO_STRICT > + internal > +#else > + public > +#endif > + class IngresSqlProvider : SqlProvider > { > public override SqlStatement GetInsertIds(IList<SqlStatement> > outputParameters, IList<SqlStatement> outputExpressions) > { > Index: src/DbLinq.Ingres/IngresVendor.cs > =================================================================== > --- src/DbLinq.Ingres/IngresVendor.cs (revision 899) > +++ src/DbLinq.Ingres/IngresVendor.cs (working copy) > @@ -31,10 +31,18 @@ > using System.Reflection; > using System.Collections.Generic; > using System.Text; > +#if MONO_STRICT > +using System.Data.Linq.SqlClient; > +#else > using DbLinq.Data.Linq.SqlClient; > +#endif > using DbLinq.Util; > +using DbLinq.Vendor; > +#if MONO_STRICT > +using DataContext = System.Data.Linq.DataContext; > +#else > using DataContext = DbLinq.Data.Linq.DataContext; > -using DbLinq.Vendor; > +#endif > > namespace DbLinq.Ingres > { > @@ -42,7 +50,12 @@ > /// Ingres - specific code. > /// </summary> > [Vendor(typeof(IngresProvider))] > - public class IngresVendor : Vendor.Implementation.Vendor > +#if MONO_STRICT > + internal > +#else > + public > +#endif > + class IngresVendor : Vendor.Implementation.Vendor > { > public override string VendorName { get { return "Ingres"; } } > > Index: src/DbLinq.Sqlite/SqliteSqlProvider.cs > =================================================================== > --- src/DbLinq.Sqlite/SqliteSqlProvider.cs (revision 899) > +++ src/DbLinq.Sqlite/SqliteSqlProvider.cs (working copy) > @@ -25,12 +25,21 @@ > #endregion > > using System.Collections.Generic; > +#if MONO_STRICT > +using System.Data.Linq.Sql; > +#else > using DbLinq.Data.Linq.Sql; > +#endif > using DbLinq.Vendor.Implementation; > > namespace DbLinq.Sqlite > { > - public class SqliteSqlProvider : SqlProvider > +#if MONO_STRICT > + internal > +#else > + public > +#endif > + class SqliteSqlProvider : SqlProvider > { > public override SqlStatement GetInsertIds(IList<SqlStatement> > outputParameters, IList<SqlStatement> outputExpressions) > { > Index: src/DbLinq.Sqlite/SqliteVendor.cs > =================================================================== > --- src/DbLinq.Sqlite/SqliteVendor.cs (revision 899) > +++ src/DbLinq.Sqlite/SqliteVendor.cs (working copy) > @@ -30,8 +30,13 @@ > using System.Data; > using System.Data.Linq.Mapping; > using System.Reflection; > +#if MONO_STRICT > +using System.Data.Linq; > +using System.Data.Linq.SqlClient; > +#else > using DbLinq.Data.Linq; > using DbLinq.Data.Linq.SqlClient; > +#endif > using DbLinq.Logging; > using DbLinq.Sqlite; > using DbLinq.Util; > @@ -43,7 +48,12 @@ > /// SQLite - specific code. > /// </summary> > [Vendor(typeof(SqliteProvider))] > - public class SqliteVendor : Vendor.Implementation.Vendor > +#if MONO_STRICT > + internal > +#else > + public > +#endif > + class SqliteVendor : Vendor.Implementation.Vendor > { > public override string VendorName { get { return "SQLite"; } } > > Index: src/DbLinq.PostgreSql/PgsqlSqlProvider.cs > =================================================================== > --- src/DbLinq.PostgreSql/PgsqlSqlProvider.cs (revision 899) > +++ src/DbLinq.PostgreSql/PgsqlSqlProvider.cs (working copy) > @@ -26,13 +26,22 @@ > > using System.Collections.Generic; > using System.Linq; > +#if MONO_STRICT > +using System.Data.Linq.Sql; > +#else > using DbLinq.Data.Linq.Sql; > +#endif > using DbLinq.Vendor.Implementation; > using System; > > namespace DbLinq.PostgreSql > { > - public class PgsqlSqlProvider : SqlProvider > +#if MONO_STRICT > + internal > +#else > + public > +#endif > + class PgsqlSqlProvider : SqlProvider > { > public override SqlStatement GetInsertIds(IList<SqlStatement> > outputParameters, IList<SqlStatement> outputExpressions) > { > Index: src/DbLinq.PostgreSql/PgsqlVendor.cs > =================================================================== > --- src/DbLinq.PostgreSql/PgsqlVendor.cs (revision 899) > +++ src/DbLinq.PostgreSql/PgsqlVendor.cs (working copy) > @@ -30,12 +30,20 @@ > using System.Data.Linq.Mapping; > using System.Reflection; > using System.Collections.Generic; > +#if MONO_STRICT > +using System.Data.Linq.SqlClient; > +#else > using DbLinq.Data.Linq.SqlClient; > +#endif > using DbLinq.Logging; > using DbLinq.PostgreSql; > using DbLinq.Util; > using DbLinq.Vendor; > +#if MONO_STRICT > +using DataContext=System.Data.Linq.DataContext; > +#else > using DataContext=DbLinq.Data.Linq.DataContext; > +#endif > > namespace DbLinq.PostgreSql > { > @@ -43,7 +51,12 @@ > /// PostgreSQL - specific code. > /// </summary> > [Vendor(typeof(PostgreSqlProvider))] > - public class PgsqlVendor : Vendor.Implementation.Vendor > +#if MONO_STRICT > + internal > +#else > + public > +#endif > + class PgsqlVendor : Vendor.Implementation.Vendor > { > public override string VendorName { get { return "PostgreSQL"; } } > > Index: src/DbLinq.Oracle/OracleSqlProvider.cs > =================================================================== > --- src/DbLinq.Oracle/OracleSqlProvider.cs (revision 899) > +++ src/DbLinq.Oracle/OracleSqlProvider.cs (working copy) > @@ -27,13 +27,22 @@ > using System.Collections.Generic; > using System.Linq; > using System.Text; > +#if MONO_STRICT > +using System.Data.Linq.Sql; > +#else > using DbLinq.Data.Linq.Sql; > +#endif > using DbLinq.Util; > using DbLinq.Vendor.Implementation; > > namespace DbLinq.Oracle > { > - public class OracleSqlProvider : SqlProvider > +#if MONO_STRICT > + internal > +#else > + public > +#endif > + class OracleSqlProvider : SqlProvider > { > //public override string GetInsert(string table, IList<string> > inputColumns, IList<string> inputValues) > //{ > Index: src/DbLinq.Oracle/OracleVendor.cs > =================================================================== > --- src/DbLinq.Oracle/OracleVendor.cs (revision 899) > +++ src/DbLinq.Oracle/OracleVendor.cs (working copy) > @@ -30,14 +30,27 @@ > using System.Text; > using System.Data.Linq; > using System.Data.Linq.Mapping; > +#if MONO_STRICT > +using System.Data.Linq.SqlClient; > +#else > using DbLinq.Data.Linq.SqlClient; > +#endif > using DbLinq.Vendor; > +#if MONO_STRICT > +using DataContext = System.Data.Linq.DataContext; > +#else > using DataContext = DbLinq.Data.Linq.DataContext; > +#endif > > namespace DbLinq.Oracle > { > [Vendor(typeof(OracleProvider))] > - public class OracleVendor : Vendor.Implementation.Vendor > +#if MONO_STRICT > + internal > +#else > + public > +#endif > + class OracleVendor : Vendor.Implementation.Vendor > { > public override string VendorName { get { return "Oracle"; } } > > Index: src/DbLinq.MySql/MySqlSqlProvider.cs > =================================================================== > --- src/DbLinq.MySql/MySqlSqlProvider.cs (revision 899) > +++ src/DbLinq.MySql/MySqlSqlProvider.cs (working copy) > @@ -27,13 +27,22 @@ > using System.Collections.Generic; > using System.Linq; > using System.Text; > +#if MONO_STRICT > +using System.Data.Linq.Sql; > +#else > using DbLinq.Data.Linq.Sql; > +#endif > using DbLinq.Util; > using DbLinq.Vendor.Implementation; > > namespace DbLinq.MySql > { > - public class MySqlSqlProvider : SqlProvider > +#if MONO_STRICT > + internal > +#else > + public > +#endif > + class MySqlSqlProvider : SqlProvider > { > public override string GetParameterName(string nameBase) > { > Index: src/DbLinq.MySql/MySqlVendor.cs > =================================================================== > --- src/DbLinq.MySql/MySqlVendor.cs (revision 899) > +++ src/DbLinq.MySql/MySqlVendor.cs (working copy) > @@ -31,8 +31,13 @@ > using System.Data.Linq.Mapping; > using System.Reflection; > using System.Data; > +#if MONO_STRICT > +using System.Data.Linq; > +using System.Data.Linq.SqlClient; > +#else > using DbLinq.Data.Linq; > using DbLinq.Data.Linq.SqlClient; > +#endif > using DbLinq.Logging; > using DbLinq.Util; > using DbLinq.Vendor; > @@ -40,7 +45,12 @@ > namespace DbLinq.MySql > { > [Vendor(typeof(MySqlProvider))] > - public class MySqlVendor : Vendor.Implementation.Vendor > +#if MONO_STRICT > + internal > +#else > + public > +#endif > + class MySqlVendor : Vendor.Implementation.Vendor > { > public override string VendorName { get { return "MySQL"; } } > > > -- Saludos. Pablo Iñigo Blasco . --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "DbLinq" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/dblinq?hl=en -~----------~----~----~----~------~----~------~--~---
