Index: SQLite.Beta.nuspec ================================================================== --- SQLite.Beta.nuspec +++ SQLite.Beta.nuspec @@ -19,10 +19,21 @@ http://system.data.sqlite.org/images/sqlite32.png http://www.sqlite.org/copyright.html sqlite database ado.net provider interop Public Domain + + + + + + + + + + + Index: SQLite.Interop/src/win/interop.h ================================================================== --- SQLite.Interop/src/win/interop.h +++ SQLite.Interop/src/win/interop.h @@ -8,11 +8,11 @@ #ifndef INTEROP_VERSION #define INTEROP_VERSION "1.0.91.0" #endif #ifndef INTEROP_SOURCE_ID -#define INTEROP_SOURCE_ID "0000000000000000000000000000000000000000" +#define INTEROP_SOURCE_ID "16fb7e87b59e5f9f8146bd076f11d5037a470a16" #endif #ifndef INTEROP_SOURCE_TIMESTAMP -#define INTEROP_SOURCE_TIMESTAMP "0000-00-00 00:00:00 UTC" +#define INTEROP_SOURCE_TIMESTAMP "2014-01-11 04:27:23 UTC" #endif Index: SQLite.MSIL.nuspec ================================================================== --- SQLite.MSIL.nuspec +++ SQLite.MSIL.nuspec @@ -18,10 +18,21 @@ http://system.data.sqlite.org/images/sqlite32.png http://www.sqlite.org/copyright.html sqlite database ado.net provider interop Public Domain + + + + + + + + + + + Index: SQLite.nuspec ================================================================== --- SQLite.nuspec +++ SQLite.nuspec @@ -19,10 +19,21 @@ http://system.data.sqlite.org/images/sqlite32.png http://www.sqlite.org/copyright.html sqlite database ado.net provider interop Public Domain + + + + + + + + + + + Index: SQLite.x64.nuspec ================================================================== --- SQLite.x64.nuspec +++ SQLite.x64.nuspec @@ -18,10 +18,21 @@ http://system.data.sqlite.org/images/sqlite32.png http://www.sqlite.org/copyright.html sqlite database ado.net provider interop Public Domain + + + + + + + + + + + Index: SQLite.x86.nuspec ================================================================== --- SQLite.x86.nuspec +++ SQLite.x86.nuspec @@ -18,10 +18,21 @@ http://system.data.sqlite.org/images/sqlite32.png http://www.sqlite.org/copyright.html sqlite database ado.net provider interop Public Domain + + + + + + + + + + + Index: System.Data.SQLite.Linq/Properties/Resources.Designer.cs ================================================================== --- System.Data.SQLite.Linq/Properties/Resources.Designer.cs +++ System.Data.SQLite.Linq/Properties/Resources.Designer.cs @@ -1,9 +1,9 @@ /******************************************************** * ADO.NET 2.0 Data Provider for SQLite Version 3.X * Written by Robert Simpson (robert@blackcastlesoft.com) - * + * * Released to the public domain, use at your own risk! ********************************************************/ //------------------------------------------------------------------------------ // @@ -13,14 +13,18 @@ // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // //------------------------------------------------------------------------------ -namespace System.Data.SQLite.Properties { +#if USE_ENTITY_FRAMEWORK_6 +namespace System.Data.SQLite.EF6.Properties +#else +namespace System.Data.SQLite.Linq.Properties +#endif +{ using System; - - + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// // This class was auto-generated by the StronglyTypedResourceBuilder // class via a tool like ResGen or Visual Studio. @@ -28,19 +32,19 @@ // with the /str option, or rebuild your VS project. [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal sealed class Resources { - + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal Resources() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { @@ -50,11 +54,11 @@ resourceMan = temp; } return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] @@ -64,14 +68,14 @@ } set { resourceCulture = value; } } - + /// /// Looks up a localized string similar to CREATE TEMP VIEW SCHEMACONSTRAINTCOLUMNS AS - ///SELECT CONSTRAINT_CATALOG, NULL AS CONSTRAINT_SCHEMA, CONSTRAINT_NAME, TABLE_CATALOG, NULL AS TABLE_SCHEMA, TABLE_NAME, COLUMN_NAME + ///SELECT CONSTRAINT_CATALOG, NULL AS CONSTRAINT_SCHEMA, CONSTRAINT_NAME, TABLE_CATALOG, NULL AS TABLE_SCHEMA, TABLE_NAME, COLUMN_NAME ///FROM TEMP.SCHEMAINDEXCOLUMNS ///UNION ///SELECT CONSTRAINT_CATALOG, NULL, CONSTRAINT_NAME, TABLE_CATALOG, NULL, TABLE_NAME, FKEY_FROM_COLUMN ///FROM TEMP.SCHEMAFOREIGNKEYS;. /// @@ -78,17 +82,17 @@ internal static string SQL_CONSTRAINTCOLUMNS { get { return ResourceManager.GetString("SQL_CONSTRAINTCOLUMNS", resourceCulture); } } - + /// /// Looks up a localized string similar to CREATE TEMP VIEW SCHEMACONSTRAINTS AS ///SELECT INDEX_CATALOG AS CONSTRAINT_CATALOG, NULL AS CONSTRAINT_SCHEMA, INDEX_NAME AS CONSTRAINT_NAME, TABLE_CATALOG, NULL AS TABLE_SCHEMA, TABLE_NAME, 'PRIMARY KEY' AS CONSTRAINT_TYPE, 0 AS IS_DEFERRABLE, 0 AS INITIALLY_DEFERRED, NULL AS CHECK_CLAUSE ///FROM TEMP.SCHEMAINDEXES WHERE PRIMARY_KEY = 1 ///UNION - ///SELECT INDEX_CATALOG, NULL, INDEX_NAME, TABLE_CATALOG, NULL, TABLE_NAME, 'UNIQUE', 0, 0, NULL + ///SELECT INDEX_CATALOG, NULL, INDEX_NAME, TABLE_CATALOG, NULL, TABLE_NAME, 'UNIQUE', 0, 0, NULL ///FROM TEMP.SCHEMAINDEXES WHERE PRIMARY_KEY = 0 AND [UNIQUE] = 1 ///UNION /// [rest of string was truncated]";. /// internal static string SQL_CONSTRAINTS { Index: System.Data.SQLite.Linq/SQL Generation/DmlSqlGenerator.cs ================================================================== --- System.Data.SQLite.Linq/SQL Generation/DmlSqlGenerator.cs +++ System.Data.SQLite.Linq/SQL Generation/DmlSqlGenerator.cs @@ -6,11 +6,15 @@ // or License.txt for details. // All rights reserved. // //--------------------------------------------------------------------- -namespace System.Data.SQLite +#if USE_ENTITY_FRAMEWORK_6 +namespace System.Data.SQLite.EF6 +#else +namespace System.Data.SQLite.Linq +#endif { using System; using System.Collections.Generic; using System.Diagnostics; using System.Globalization; Index: System.Data.SQLite.Linq/SQL Generation/ISqlFragment.cs ================================================================== --- System.Data.SQLite.Linq/SQL Generation/ISqlFragment.cs +++ System.Data.SQLite.Linq/SQL Generation/ISqlFragment.cs @@ -6,11 +6,15 @@ // or License.txt for details. // All rights reserved. // //--------------------------------------------------------------------- -namespace System.Data.SQLite +#if USE_ENTITY_FRAMEWORK_6 +namespace System.Data.SQLite.EF6 +#else +namespace System.Data.SQLite.Linq +#endif { #if USE_ENTITY_FRAMEWORK_6 using System.Data.Entity.Core.Common.CommandTrees; #else using System.Data.Common.CommandTrees; Index: System.Data.SQLite.Linq/SQL Generation/InternalBase.cs ================================================================== --- System.Data.SQLite.Linq/SQL Generation/InternalBase.cs +++ System.Data.SQLite.Linq/SQL Generation/InternalBase.cs @@ -9,11 +9,15 @@ #if NET_40 || NET_45 || NET_451 using System.Runtime; #endif -namespace System.Data.SQLite +#if USE_ENTITY_FRAMEWORK_6 +namespace System.Data.SQLite.EF6 +#else +namespace System.Data.SQLite.Linq +#endif { internal abstract class InternalBase { // Methods #if NET_40 || NET_45 || NET_451 Index: System.Data.SQLite.Linq/SQL Generation/JoinSymbol.cs ================================================================== --- System.Data.SQLite.Linq/SQL Generation/JoinSymbol.cs +++ System.Data.SQLite.Linq/SQL Generation/JoinSymbol.cs @@ -6,11 +6,15 @@ // or License.txt for details. // All rights reserved. // //--------------------------------------------------------------------- -namespace System.Data.SQLite +#if USE_ENTITY_FRAMEWORK_6 +namespace System.Data.SQLite.EF6 +#else +namespace System.Data.SQLite.Linq +#endif { using System; using System.Collections.Generic; #if USE_ENTITY_FRAMEWORK_6 Index: System.Data.SQLite.Linq/SQL Generation/KeyToListMap.cs ================================================================== --- System.Data.SQLite.Linq/SQL Generation/KeyToListMap.cs +++ System.Data.SQLite.Linq/SQL Generation/KeyToListMap.cs @@ -12,11 +12,15 @@ #if NET_40 || NET_45 || NET_451 using System.Runtime; #endif -namespace System.Data.SQLite +#if USE_ENTITY_FRAMEWORK_6 +namespace System.Data.SQLite.EF6 +#else +namespace System.Data.SQLite.Linq +#endif { internal sealed class KeyToListMap : InternalBase { // Fields private Dictionary> m_map; Index: System.Data.SQLite.Linq/SQL Generation/MetadataHelpers.cs ================================================================== --- System.Data.SQLite.Linq/SQL Generation/MetadataHelpers.cs +++ System.Data.SQLite.Linq/SQL Generation/MetadataHelpers.cs @@ -6,11 +6,15 @@ // or License.txt for details. // All rights reserved. // //--------------------------------------------------------------------- -namespace System.Data.SQLite +#if USE_ENTITY_FRAMEWORK_6 +namespace System.Data.SQLite.EF6 +#else +namespace System.Data.SQLite.Linq +#endif { using System; using System.Data; using System.Collections.Generic; using System.Diagnostics; Index: System.Data.SQLite.Linq/SQL Generation/SkipClause.cs ================================================================== --- System.Data.SQLite.Linq/SQL Generation/SkipClause.cs +++ System.Data.SQLite.Linq/SQL Generation/SkipClause.cs @@ -6,11 +6,15 @@ // or License.txt for details. // All rights reserved. // //--------------------------------------------------------------------- -namespace System.Data.SQLite +#if USE_ENTITY_FRAMEWORK_6 +namespace System.Data.SQLite.EF6 +#else +namespace System.Data.SQLite.Linq +#endif { using System.Globalization; /// /// SkipClause represents the a SKIP expression in a SqlSelectStatement. Index: System.Data.SQLite.Linq/SQL Generation/SqlBuilder.cs ================================================================== --- System.Data.SQLite.Linq/SQL Generation/SqlBuilder.cs +++ System.Data.SQLite.Linq/SQL Generation/SqlBuilder.cs @@ -6,11 +6,15 @@ // or License.txt for details. // All rights reserved. // //--------------------------------------------------------------------- -namespace System.Data.SQLite +#if USE_ENTITY_FRAMEWORK_6 +namespace System.Data.SQLite.EF6 +#else +namespace System.Data.SQLite.Linq +#endif { using System; using System.Collections.Generic; using System.Diagnostics; Index: System.Data.SQLite.Linq/SQL Generation/SqlChecker.cs ================================================================== --- System.Data.SQLite.Linq/SQL Generation/SqlChecker.cs +++ System.Data.SQLite.Linq/SQL Generation/SqlChecker.cs @@ -3,11 +3,15 @@ * Written by Robert Simpson (robert@blackcastlesoft.com) * * Released to the public domain, use at your own risk! ********************************************************/ -namespace System.Data.SQLite +#if USE_ENTITY_FRAMEWORK_6 +namespace System.Data.SQLite.EF6 +#else +namespace System.Data.SQLite.Linq +#endif { using System; using System.Collections.Generic; #if USE_ENTITY_FRAMEWORK_6 Index: System.Data.SQLite.Linq/SQL Generation/SqlGenerator.cs ================================================================== --- System.Data.SQLite.Linq/SQL Generation/SqlGenerator.cs +++ System.Data.SQLite.Linq/SQL Generation/SqlGenerator.cs @@ -6,11 +6,15 @@ // or License.txt for details. // All rights reserved. // //--------------------------------------------------------------------- -namespace System.Data.SQLite +#if USE_ENTITY_FRAMEWORK_6 +namespace System.Data.SQLite.EF6 +#else +namespace System.Data.SQLite.Linq +#endif { using System; using System.Linq; using System.Diagnostics; using System.Globalization; Index: System.Data.SQLite.Linq/SQL Generation/SqlSelectStatement.cs ================================================================== --- System.Data.SQLite.Linq/SQL Generation/SqlSelectStatement.cs +++ System.Data.SQLite.Linq/SQL Generation/SqlSelectStatement.cs @@ -6,11 +6,15 @@ // or License.txt for details. // All rights reserved. // //--------------------------------------------------------------------- -namespace System.Data.SQLite +#if USE_ENTITY_FRAMEWORK_6 +namespace System.Data.SQLite.EF6 +#else +namespace System.Data.SQLite.Linq +#endif { using System.Collections.Generic; using System.Diagnostics; #if USE_ENTITY_FRAMEWORK_6 Index: System.Data.SQLite.Linq/SQL Generation/SqlWriter.cs ================================================================== --- System.Data.SQLite.Linq/SQL Generation/SqlWriter.cs +++ System.Data.SQLite.Linq/SQL Generation/SqlWriter.cs @@ -6,11 +6,15 @@ // or License.txt for details. // All rights reserved. // //--------------------------------------------------------------------- -namespace System.Data.SQLite +#if USE_ENTITY_FRAMEWORK_6 +namespace System.Data.SQLite.EF6 +#else +namespace System.Data.SQLite.Linq +#endif { using System.IO; using System.Text; /// Index: System.Data.SQLite.Linq/SQL Generation/StringUtil.cs ================================================================== --- System.Data.SQLite.Linq/SQL Generation/StringUtil.cs +++ System.Data.SQLite.Linq/SQL Generation/StringUtil.cs @@ -12,11 +12,15 @@ #if NET_40 || NET_45 || NET_451 using System.Runtime; #endif -namespace System.Data.SQLite +#if USE_ENTITY_FRAMEWORK_6 +namespace System.Data.SQLite.EF6 +#else +namespace System.Data.SQLite.Linq +#endif { internal static class StringUtil { // Fields private const string s_defaultDelimiter = ", "; Index: System.Data.SQLite.Linq/SQL Generation/Symbol.cs ================================================================== --- System.Data.SQLite.Linq/SQL Generation/Symbol.cs +++ System.Data.SQLite.Linq/SQL Generation/Symbol.cs @@ -6,11 +6,15 @@ // or License.txt for details. // All rights reserved. // //--------------------------------------------------------------------- -namespace System.Data.SQLite +#if USE_ENTITY_FRAMEWORK_6 +namespace System.Data.SQLite.EF6 +#else +namespace System.Data.SQLite.Linq +#endif { using System; using System.Collections.Generic; #if USE_ENTITY_FRAMEWORK_6 Index: System.Data.SQLite.Linq/SQL Generation/SymbolPair.cs ================================================================== --- System.Data.SQLite.Linq/SQL Generation/SymbolPair.cs +++ System.Data.SQLite.Linq/SQL Generation/SymbolPair.cs @@ -6,11 +6,15 @@ // or License.txt for details. // All rights reserved. // //--------------------------------------------------------------------- -namespace System.Data.SQLite +#if USE_ENTITY_FRAMEWORK_6 +namespace System.Data.SQLite.EF6 +#else +namespace System.Data.SQLite.Linq +#endif { using System.Diagnostics; #if USE_ENTITY_FRAMEWORK_6 using System.Data.Entity.Core.Common.CommandTrees; Index: System.Data.SQLite.Linq/SQL Generation/SymbolTable.cs ================================================================== --- System.Data.SQLite.Linq/SQL Generation/SymbolTable.cs +++ System.Data.SQLite.Linq/SQL Generation/SymbolTable.cs @@ -6,11 +6,15 @@ // or License.txt for details. // All rights reserved. // //--------------------------------------------------------------------- -namespace System.Data.SQLite +#if USE_ENTITY_FRAMEWORK_6 +namespace System.Data.SQLite.EF6 +#else +namespace System.Data.SQLite.Linq +#endif { using System; using System.Collections.Generic; #if USE_ENTITY_FRAMEWORK_6 Index: System.Data.SQLite.Linq/SQL Generation/TopClause.cs ================================================================== --- System.Data.SQLite.Linq/SQL Generation/TopClause.cs +++ System.Data.SQLite.Linq/SQL Generation/TopClause.cs @@ -6,11 +6,15 @@ // or License.txt for details. // All rights reserved. // //--------------------------------------------------------------------- -namespace System.Data.SQLite +#if USE_ENTITY_FRAMEWORK_6 +namespace System.Data.SQLite.EF6 +#else +namespace System.Data.SQLite.Linq +#endif { using System; using System.Globalization; /// Index: System.Data.SQLite.Linq/SQLiteProviderFactory.cs ================================================================== --- System.Data.SQLite.Linq/SQLiteProviderFactory.cs +++ System.Data.SQLite.Linq/SQLiteProviderFactory.cs @@ -3,20 +3,23 @@ * Written by Robert Simpson (robert@blackcastlesoft.com) * * Released to the public domain, use at your own risk! ********************************************************/ -namespace System.Data.SQLite +#if USE_ENTITY_FRAMEWORK_6 +namespace System.Data.SQLite.EF6 +#else +namespace System.Data.SQLite.Linq +#endif { using System; using System.Data.Common; /// /// SQLite implementation of . /// - public sealed partial class SQLiteProviderFactory : - DbProviderFactory, IDisposable + public sealed class SQLiteProviderFactory : DbProviderFactory, IDisposable { #region Public Static Data /// /// Static instance member which returns an instanced /// class. @@ -128,11 +131,14 @@ private bool disposed; private void CheckDisposed() /* throw */ { #if THROW_ON_DISPOSED if (disposed) - throw new ObjectDisposedException(typeof(SQLiteProviderFactory).Name); + { + throw new ObjectDisposedException( + typeof(SQLiteProviderFactory).Name); + } #endif } /////////////////////////////////////////////////////////////////////// Index: System.Data.SQLite.Linq/SQLiteProviderManifest.cs ================================================================== --- System.Data.SQLite.Linq/SQLiteProviderManifest.cs +++ System.Data.SQLite.Linq/SQLiteProviderManifest.cs @@ -3,11 +3,15 @@ * Written by Robert Simpson (robert@blackcastlesoft.com) * * Released to the public domain, use at your own risk! ********************************************************/ -namespace System.Data.SQLite +#if USE_ENTITY_FRAMEWORK_6 +namespace System.Data.SQLite.EF6 +#else +namespace System.Data.SQLite.Linq +#endif { using System; using System.Data; using System.Reflection; using System.IO; Index: System.Data.SQLite.Linq/SQLiteProviderServices.cs ================================================================== --- System.Data.SQLite.Linq/SQLiteProviderServices.cs +++ System.Data.SQLite.Linq/SQLiteProviderServices.cs @@ -3,27 +3,31 @@ * Written by Robert Simpson (robert@blackcastlesoft.com) * * Released to the public domain, use at your own risk! ********************************************************/ -namespace System.Data.SQLite +#if USE_ENTITY_FRAMEWORK_6 +namespace System.Data.SQLite.EF6 +#else +namespace System.Data.SQLite.Linq +#endif { using System; using System.Data.Common; using System.Diagnostics; using System.Collections.Generic; using System.Text; - using System.Globalization; - -#if USE_ENTITY_FRAMEWORK_6 - using System.Data.Entity.Core.Common; - using System.Data.Entity.Core.Metadata.Edm; - using System.Data.Entity.Core.Common.CommandTrees; -#else - using System.Data.Metadata.Edm; - using System.Data.Common.CommandTrees; -#endif + using System.Globalization; + +#if USE_ENTITY_FRAMEWORK_6 + using System.Data.Entity.Core.Common; + using System.Data.Entity.Core.Metadata.Edm; + using System.Data.Entity.Core.Common.CommandTrees; +#else + using System.Data.Metadata.Edm; + using System.Data.Common.CommandTrees; +#endif internal sealed class SQLiteProviderServices : DbProviderServices, ISQLiteSchemaExtensions { internal static readonly SQLiteProviderServices Instance = new SQLiteProviderServices(); Index: System.Data.SQLite/SQLitePatchLevel.cs ================================================================== --- System.Data.SQLite/SQLitePatchLevel.cs +++ System.Data.SQLite/SQLitePatchLevel.cs @@ -7,10 +7,10 @@ using System.Data.SQLite; /////////////////////////////////////////////////////////////////////////////// -[assembly: AssemblySourceId(null)] +[assembly: AssemblySourceId("16fb7e87b59e5f9f8146bd076f11d5037a470a16")] /////////////////////////////////////////////////////////////////////////////// -[assembly: AssemblySourceTimeStamp(null)] +[assembly: AssemblySourceTimeStamp("2014-01-11 04:27:23 UTC")]