Index: System.Data.SQLite.Linq/SQL
==================================================================
--- System.Data.SQLite.Linq/SQL
+++ System.Data.SQLite.Linq/SQL
@@ -1,359 +1,717 @@
-/********************************************************
- * 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!
- ********************************************************/
+//---------------------------------------------------------------------
+// <copyright file="DmlSqlGenerator.cs" company="Microsoft">
+//      Copyright (c) Microsoft Corporation.  All rights reserved.
+// </copyright>
+//---------------------------------------------------------------------
 
 namespace System.Data.SQLite
 {
   using System;
   using System.Collections.Generic;
+  using System.Diagnostics;
+  using System.Globalization;
+  using System.IO;
+  using System.Text;
   using System.Data;
+  using System.Data.Common;
+  using System.Data.Metadata.Edm;
   using System.Data.Common.CommandTrees;
-  using System.Data.Entity;
-  using System.Runtime.CompilerServices;
+  using System.Data.Common.Utils;
+  using System.Data.Mapping.Update.Internal;
 
-  internal class SqlChecker : DbExpressionVisitor<bool>
+  /// <summary>
+  /// Class generating SQL for a DML command tree.
+  /// </summary>
+  internal static class DmlSqlGenerator
   {
-    private static Type sql8rewriter;
+    private static readonly int s_commandTextBuilderInitialCapacity = 256;
 
-    static SqlChecker()
+    internal static string GenerateUpdateSql(DbUpdateCommandTree tree, out List<DbParameter> parameters)
+    {
+      StringBuilder commandText = new StringBuilder(s_commandTextBuilderInitialCapacity);
+      ExpressionTranslator translator = new ExpressionTranslator(commandText, tree, null != tree.Returning, "UpdateFunction");
+
+      // update [schemaName].[tableName]
+      commandText.Append("UPDATE ");
+      tree.Target.Expression.Accept(translator);
+      commandText.AppendLine();
+
+      // set c1 = ..., c2 = ..., ...
+      bool first = true;
+      commandText.Append("SET ");
+      foreach (DbSetClause setClause in tree.SetClauses)
+      {
+        if (first) { first = false; }
+        else { commandText.Append(", "); }
+        setClause.Property.Accept(translator);
+        commandText.Append(" = ");
+        setClause.Value.Accept(translator);
+      }
+
+      if (first)
+      {
+        // If first is still true, it indicates there were no set
+        // clauses. Introduce a fake set clause so that:
+        // - we acquire the appropriate locks
+        // - server-gen columns (e.g. timestamp) get recomputed
+        //
+        // We use the following pattern:
+        //
+        //  update Foo
+        //  set @i = 0
+        //  where ...
+        DbParameter parameter = translator.CreateParameter(default(Int32), DbType.Int32);
+        commandText.Append(parameter.ParameterName);
+        commandText.Append(" = 0");
+      }
+      commandText.AppendLine();
+
+      // where c1 = ..., c2 = ...
+      commandText.Append("WHERE ");
+      tree.Predicate.Accept(translator);
+      commandText.AppendLine();
+
+      // generate returning sql
+      GenerateReturningSql(commandText, tree, translator, tree.Returning);
+
+      parameters = translator.Parameters;
+      return commandText.ToString();
+    }
+
+    internal static string GenerateDeleteSql(DbDeleteCommandTree tree, out List<DbParameter> parameters)
+    {
+      StringBuilder commandText = new StringBuilder(s_commandTextBuilderInitialCapacity);
+      ExpressionTranslator translator = new ExpressionTranslator(commandText, tree, false, "DeleteFunction");
+
+      // delete [schemaName].[tableName]
+      commandText.Append("DELETE FROM ");
+      tree.Target.Expression.Accept(translator);
+      commandText.AppendLine();
+
+      // where c1 = ... AND c2 = ...
+      commandText.Append("WHERE ");
+      tree.Predicate.Accept(translator);
+
+      parameters = translator.Parameters;
+
+      commandText.AppendLine(";");
+      return commandText.ToString();
+    }
+
+    internal static string GenerateInsertSql(DbInsertCommandTree tree, out List<DbParameter> parameters)
+    {
+      StringBuilder commandText = new StringBuilder(s_commandTextBuilderInitialCapacity);
+      ExpressionTranslator translator = new ExpressionTranslator(commandText, tree, null != tree.Returning, "InsertFunction");
+
+      // insert [schemaName].[tableName]
+      commandText.Append("INSERT INTO ");
+      tree.Target.Expression.Accept(translator);
+
+      if (tree.SetClauses.Count > 0)
+      {
+        // (c1, c2, c3, ...)
+        commandText.Append("(");
+        bool first = true;
+        foreach (DbSetClause setClause in tree.SetClauses)
+        {
+          if (first) { first = false; }
+          else { commandText.Append(", "); }
+          setClause.Property.Accept(translator);
+        }
+        commandText.AppendLine(")");
+
+        // values c1, c2, ...
+        first = true;
+        commandText.Append(" VALUES (");
+        foreach (DbSetClause setClause in tree.SetClauses)
+        {
+          if (first) { first = false; }
+          else { commandText.Append(", "); }
+          setClause.Value.Accept(translator);
+
+          translator.RegisterMemberValue(setClause.Property, setClause.Value);
+        }
+        commandText.AppendLine(");");
+      }
+      else // No columns specified.  Insert an empty row containing default values by inserting null into the rowid
+      {
+        commandText.AppendLine(" DEFAULT VALUES;");
+      }
+
+      // generate returning sql
+      GenerateReturningSql(commandText, tree, translator, tree.Returning);
+
+      parameters = translator.Parameters;
+      return commandText.ToString();
+    }
+
+    // Generates T-SQL describing a member
+    // Requires: member must belong to an entity type (a safe requirement for DML
+    // SQL gen, where we only access table columns)
+    private static string GenerateMemberTSql(EdmMember member)
     {
-      sql8rewriter = Type.GetType("System.Data.SqlClient.SqlGen.Sql8ExpressionRewriter, System.Data.Entity, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", false);
+      return SqlGenerator.QuoteIdentifier(member.Name);
     }
 
-    private SqlChecker()
+    /// <summary>
+    /// Generates SQL fragment returning server-generated values.
+    /// Requires: translator knows about member values so that we can figure out
+    /// how to construct the key predicate.
+    /// <code>
+    /// Sample SQL:
+    ///     
+    ///     select IdentityValue
+    ///     from dbo.MyTable
+    ///     where @@ROWCOUNT > 0 and IdentityValue = scope_identity()
+    /// 
+    /// or
+    /// 
+    ///     select TimestamptValue
+    ///     from dbo.MyTable
+    ///     where @@ROWCOUNT > 0 and Id = 1
+    /// 
+    /// Note that we filter on rowcount to ensure no rows are returned if no rows were modified.
+    /// </code>
+    /// </summary>
+    /// <param name="commandText">Builder containing command text</param>
+    /// <param name="tree">Modification command tree</param>
+    /// <param name="translator">Translator used to produce DML SQL statement
+    /// for the tree</param>
+    /// <param name="returning">Returning expression. If null, the method returns
+    /// immediately without producing a SELECT statement.</param>
+    private static void GenerateReturningSql(StringBuilder commandText, DbModificationCommandTree tree,
+        ExpressionTranslator translator, DbExpression returning)
     {
+      // Nothing to do if there is no Returning expression
+      if (null == returning) { return; }
+
+      // select
+      commandText.Append("SELECT ");
+      returning.Accept(translator);
+      commandText.AppendLine();
+
+      // from
+      commandText.Append("FROM ");
+      tree.Target.Expression.Accept(translator);
+      commandText.AppendLine();
+
+      // where
+      commandText.Append("WHERE last_rows_affected() > 0");
+      EntitySetBase table = ((DbScanExpression)tree.Target.Expression).Target;
+      bool identity = false;
+      foreach (EdmMember keyMember in table.ElementType.KeyMembers)
+      {
+        commandText.Append(" AND ");
+        commandText.Append(GenerateMemberTSql(keyMember));
+        commandText.Append(" = ");
+
+        // retrieve member value sql. the translator remembers member values
+        // as it constructs the DML statement (which precedes the "returning"
+        // SQL)
+        DbParameter value;
+        if (translator.MemberValues.TryGetValue(keyMember, out value))
+        {
+          commandText.Append(value.ParameterName);
+        }
+        else
+        {
+          // if no value is registered for the key member, it means it is an identity
+          // which can be retrieved using the scope_identity() function
+          if (identity)
+          {
+            // there can be only one server generated key
+            throw new NotSupportedException(string.Format("Server generated keys are only supported for identity columns. More than one key column is marked as server generated in table '{0}'.", table.Name));
+          }
+          commandText.AppendLine("last_insert_rowid();");
+          identity = true;
+        }
+      }
     }
 
     /// <summary>
-    /// SQLite doesn't support things like SKIP and a few other things.  So determine if the query has to be rewritten
+    /// Lightweight expression translator for DML expression trees, which have constrained
+    /// scope and support.
     /// </summary>
-    /// <remarks>
-    /// Microsoft went to all the trouble of making things like SKIP work on Sql Server 2000 by doing a rewrite of the commandtree.
-    /// However, all that fancy stuff is hidden from us.  Thanks to reflection however, we can go ahead and use the Sql 2000 rewriter code
-    /// they made.
-    /// </remarks>
-    /// <param name="tree">The tree to inspect for a rewrite</param>
-    /// <returns>Returns a new query tree if it needs rewriting</returns>
-    internal static DbQueryCommandTree Rewrite(DbQueryCommandTree tree)
+    private class ExpressionTranslator : DbExpressionVisitor
     {
-      SqlChecker visitor = new SqlChecker();
-      if (tree.Query.Accept<bool>(visitor))
+      /// <summary>
+      /// Initialize a new expression translator populating the given string builder
+      /// with command text. Command text builder and command tree must not be null.
+      /// </summary>
+      /// <param name="commandText">Command text with which to populate commands</param>
+      /// <param name="commandTree">Command tree generating SQL</param>
+      /// <param name="preserveMemberValues">Indicates whether the translator should preserve
+      /// member values while compiling t-SQL (only needed for server generation)</param>
+      internal ExpressionTranslator(StringBuilder commandText, DbModificationCommandTree commandTree,
+          bool preserveMemberValues, string kind)
+      {
+        Debug.Assert(null != commandText);
+        Debug.Assert(null != commandTree);
+        _kind = kind;
+        _commandText = commandText;
+        _commandTree = commandTree;
+        _parameters = new List<DbParameter>();
+        _memberValues = preserveMemberValues ? new Dictionary<EdmMember, DbParameter>() :
+            null;
+      }
+
+      private readonly StringBuilder _commandText;
+      private readonly DbModificationCommandTree _commandTree;
+      private readonly List<DbParameter> _parameters;
+      private readonly Dictionary<EdmMember, DbParameter> _memberValues;
+      private int parameterNameCount = 0;
+      private string _kind;
+
+      internal List<DbParameter> Parameters { get { return _parameters; } }
+      internal Dictionary<EdmMember, DbParameter> MemberValues { get { return _memberValues; } }
+
+      // generate parameter (name based on parameter ordinal)
+      internal SQLiteParameter CreateParameter(object value, TypeUsage type)
+      {
+        PrimitiveTypeKind primitiveType = MetadataHelpers.GetPrimitiveTypeKind(type);
+        DbType dbType = MetadataHelpers.GetDbType(primitiveType);
+        return CreateParameter(value, dbType);
+      }
+
+      // Creates a new parameter for a value in this expression translator
+      internal SQLiteParameter CreateParameter(object value, DbType dbType)
+      {
+        string parameterName = string.Concat("@p", parameterNameCount.ToString(CultureInfo.InvariantCulture));
+        parameterNameCount++;
+        SQLiteParameter parameter = new SQLiteParameter(parameterName, value);
+        parameter.DbType = dbType;
+        _parameters.Add(parameter);
+        return parameter;
+      }
+
+      #region Basics
+
+      public override void Visit(DbApplyExpression expression)
+      {
+        if (expression == null) throw new ArgumentException("expression");
+
+        VisitExpressionBindingPre(expression.Input);
+        if (expression.Apply != null)
+        {
+          VisitExpression(expression.Apply.Expression);
+        }
+        VisitExpressionBindingPost(expression.Input);
+      }
+
+      public override void Visit(DbArithmeticExpression expression)
+      {
+        if (expression == null) throw new ArgumentException("expression");
+        VisitExpressionList(expression.Arguments);
+      }
+
+      public override void Visit(DbCaseExpression expression)
+      {
+        if (expression == null) throw new ArgumentException("expression");
+        VisitExpressionList(expression.When);
+        VisitExpressionList(expression.Then);
+        VisitExpression(expression.Else);
+      }
+
+      public override void Visit(DbCastExpression expression)
+      {
+        VisitUnaryExpression(expression);
+      }
+
+      public override void Visit(DbCrossJoinExpression expression)
+      {
+        if (expression == null) throw new ArgumentException("expression");
+        foreach (DbExpressionBinding binding in expression.Inputs)
+        {
+          VisitExpressionBindingPre(binding);
+        }
+        foreach (DbExpressionBinding binding2 in expression.Inputs)
+        {
+          VisitExpressionBindingPost(binding2);
+        }
+      }
+
+      public override void Visit(DbDerefExpression expression)
+      {
+        VisitUnaryExpression(expression);
+      }
+
+      public override void Visit(DbDistinctExpression expression)
+      {
+        VisitUnaryExpression(expression);
+      }
+
+      public override void Visit(DbElementExpression expression)
+      {
+        VisitUnaryExpression(expression);
+      }
+
+      public override void Visit(DbEntityRefExpression expression)
+      {
+        VisitUnaryExpression(expression);
+      }
+
+      public override void Visit(DbExceptExpression expression)
+      {
+        VisitBinary(expression);
+      }
+
+      protected virtual void VisitBinary(DbBinaryExpression expression)
+      {
+        if (expression == null) throw new ArgumentException("expression");
+        this.VisitExpression(expression.Left);
+        this.VisitExpression(expression.Right);
+      }
+
+      public override void Visit(DbExpression expression)
+      {
+        if (expression == null) throw new ArgumentException("expression");
+        throw new NotSupportedException("DbExpression");
+      }
+
+      public override void Visit(DbFilterExpression expression)
+      {
+        if (expression == null) throw new ArgumentException("expression");
+        VisitExpressionBindingPre(expression.Input);
+        VisitExpression(expression.Predicate);
+        VisitExpressionBindingPost(expression.Input);
+      }
+
+      public override void Visit(DbFunctionExpression expression)
+      {
+        if (expression == null) throw new ArgumentException("expression");
+        VisitExpressionList(expression.Arguments);
+        //if (expression.IsLambda)
+        //{
+        //  VisitLambdaFunctionPre(expression.Function, expression.LambdaBody);
+        //  VisitExpression(expression.LambdaBody);
+        //  VisitLambdaFunctionPost(expression.Function, expression.LambdaBody);
+        //}
+      }
+
+      public override void Visit(DbGroupByExpression expression)
+      {
+        if (expression == null) throw new ArgumentException("expression");
+        VisitGroupExpressionBindingPre(expression.Input);
+        VisitExpressionList(expression.Keys);
+        VisitGroupExpressionBindingMid(expression.Input);
+        VisitAggregateList(expression.Aggregates);
+        VisitGroupExpressionBindingPost(expression.Input);
+      }
+
+      public override void Visit(DbIntersectExpression expression)
+      {
+        VisitBinary(expression);
+      }
+
+      public override void Visit(DbIsEmptyExpression expression)
+      {
+        VisitUnaryExpression(expression);
+      }
+
+      public override void Visit(DbIsOfExpression expression)
+      {
+        VisitUnaryExpression(expression);
+      }
+
+      public override void Visit(DbJoinExpression expression)
+      {
+        if (expression == null) throw new ArgumentException("expression");
+        VisitExpressionBindingPre(expression.Left);
+        VisitExpressionBindingPre(expression.Right);
+        VisitExpression(expression.JoinCondition);
+        VisitExpressionBindingPost(expression.Left);
+        VisitExpressionBindingPost(expression.Right);
+      }
+
+      public override void Visit(DbLikeExpression expression)
+      {
+        if (expression == null) throw new ArgumentException("expression");
+        VisitExpression(expression.Argument);
+        VisitExpression(expression.Pattern);
+        VisitExpression(expression.Escape);
+      }
+
+      public override void Visit(DbLimitExpression expression)
+      {
+        if (expression == null) throw new ArgumentException("expression");
+        VisitExpression(expression.Argument);
+        VisitExpression(expression.Limit);
+      }
+
+      public override void Visit(DbOfTypeExpression expression)
+      {
+        VisitUnaryExpression(expression);
+      }
+
+      public override void Visit(DbParameterReferenceExpression expression)
+      {
+        if (expression == null) throw new ArgumentException("expression");
+      }
+
+      public override void Visit(DbProjectExpression expression)
+      {
+        if (expression == null) throw new ArgumentException("expression");
+        VisitExpressionBindingPre(expression.Input);
+        VisitExpression(expression.Projection);
+        VisitExpressionBindingPost(expression.Input);
+      }
+
+      public override void Visit(DbQuantifierExpression expression)
+      {
+        if (expression == null) throw new ArgumentException("expression");
+        VisitExpressionBindingPre(expression.Input);
+        VisitExpression(expression.Predicate);
+        VisitExpressionBindingPost(expression.Input);
+      }
+
+      public override void Visit(DbRefExpression expression)
+      {
+        VisitUnaryExpression(expression);
+      }
+
+      public override void Visit(DbRefKeyExpression expression)
+      {
+        VisitUnaryExpression(expression);
+      }
+
+      public override void Visit(DbRelationshipNavigationExpression expression)
+      {
+        if (expression == null) throw new ArgumentException("expression");
+        VisitExpression(expression.NavigationSource);
+      }
+
+      public override void Visit(DbSkipExpression expression)
+      {
+        if (expression == null) throw new ArgumentException("expression");
+        VisitExpressionBindingPre(expression.Input);
+        foreach (DbSortClause clause in expression.SortOrder)
+        {
+          VisitExpression(clause.Expression);
+        }
+        VisitExpressionBindingPost(expression.Input);
+        VisitExpression(expression.Count);
+      }
+
+      public override void Visit(DbSortExpression expression)
+      {
+        if (expression == null) throw new ArgumentException("expression");
+        VisitExpressionBindingPre(expression.Input);
+        for (int i = 0; i < expression.SortOrder.Count; i++)
+        {
+          VisitExpression(expression.SortOrder[i].Expression);
+        }
+        VisitExpressionBindingPost(expression.Input);
+      }
+
+      public override void Visit(DbTreatExpression expression)
+      {
+        VisitUnaryExpression(expression);
+      }
+
+      public override void Visit(DbUnionAllExpression expression)
+      {
+        VisitBinary(expression);
+      }
+
+      public override void Visit(DbVariableReferenceExpression expression)
+      {
+        if (expression == null) throw new ArgumentException("expression");
+      }
+
+      public virtual void VisitAggregate(DbAggregate aggregate)
+      {
+        if (aggregate == null) throw new ArgumentException("aggregate");
+        VisitExpressionList(aggregate.Arguments);
+      }
+
+      public virtual void VisitAggregateList(IList<DbAggregate> aggregates)
+      {
+        if (aggregates == null) throw new ArgumentException("aggregates");
+        for (int i = 0; i < aggregates.Count; i++)
+        {
+          VisitAggregate(aggregates[i]);
+        }
+      }
+
+      public virtual void VisitExpression(DbExpression expression)
+      {
+        if (expression == null) throw new ArgumentException("expression");
+        expression.Accept(this);
+      }
+
+      protected virtual void VisitExpressionBindingPost(DbExpressionBinding binding)
+      {
+      }
+
+      protected virtual void VisitExpressionBindingPre(DbExpressionBinding binding)
+      {
+        if (binding == null) throw new ArgumentException("binding");
+        VisitExpression(binding.Expression);
+      }
+
+      public virtual void VisitExpressionList(IList<DbExpression> expressionList)
+      {
+        if (expressionList == null) throw new ArgumentException("expressionList");
+        for (int i = 0; i < expressionList.Count; i++)
+        {
+          VisitExpression(expressionList[i]);
+        }
+      }
+
+      protected virtual void VisitGroupExpressionBindingMid(DbGroupExpressionBinding binding)
+      {
+      }
+
+      protected virtual void VisitGroupExpressionBindingPost(DbGroupExpressionBinding binding)
+      {
+      }
+
+      protected virtual void VisitGroupExpressionBindingPre(DbGroupExpressionBinding binding)
+      {
+        if (binding == null) throw new ArgumentException("binding");
+        VisitExpression(binding.Expression);
+      }
+
+      protected virtual void VisitLambdaFunctionPost(EdmFunction function, DbExpression body)
+      {
+      }
+
+      protected virtual void VisitLambdaFunctionPre(EdmFunction function, DbExpression body)
+      {
+        if (function == null) throw new ArgumentException("function");
+        if (body == null) throw new ArgumentException("body");
+      }
+
+      //internal virtual void VisitRelatedEntityReference(DbRelatedEntityRef relatedEntityRef)
+      //{
+      //  VisitExpression(relatedEntityRef.TargetEntityReference);
+      //}
+
+      //internal virtual void VisitRelatedEntityReferenceList(IList<DbRelatedEntityRef> relatedEntityReferences)
+      //{
+      //  for (int i = 0; i < relatedEntityReferences.Count; i++)
+      //  {
+      //    VisitRelatedEntityReference(relatedEntityReferences[i]);
+      //  }
+      //}
+
+      protected virtual void VisitUnaryExpression(DbUnaryExpression expression)
+      {
+        if (expression == null) throw new ArgumentException("expression");
+        VisitExpression(expression.Argument);
+      }
+      #endregion
+
+      public override void Visit(DbAndExpression expression)
+      {
+        VisitBinary(expression, " AND ");
+      }
+
+      public override void Visit(DbOrExpression expression)
+      {
+        VisitBinary(expression, " OR ");
+      }
+
+      public override void Visit(DbComparisonExpression expression)
+      {
+        Debug.Assert(expression.ExpressionKind == DbExpressionKind.Equals,
+            "only equals comparison expressions are produced in DML command trees in V1");
+
+        VisitBinary(expression, " = ");
+
+        RegisterMemberValue(expression.Left, expression.Right);
+      }
+
+      /// <summary>
+      /// Call this method to register a property value pair so the translator "remembers"
+      /// the values for members of the row being modified. These values can then be used
+      /// to form a predicate for server-generation (based on the key of the row)
+      /// </summary>
+      /// <param name="propertyExpression">DbExpression containing the column reference (property expression).</param>
+      /// <param name="value">DbExpression containing the value of the column.</param>
+      internal void RegisterMemberValue(DbExpression propertyExpression, DbExpression value)
+      {
+        if (null != _memberValues)
+        {
+          // register the value for this property
+          Debug.Assert(propertyExpression.ExpressionKind == DbExpressionKind.Property,
+              "DML predicates and setters must be of the form property = value");
+
+          // get name of left property 
+          EdmMember property = ((DbPropertyExpression)propertyExpression).Property;
+
+          // don't track null values
+          if (value.ExpressionKind != DbExpressionKind.Null)
+          {
+            Debug.Assert(value.ExpressionKind == DbExpressionKind.Constant,
+                "value must either constant or null");
+            // retrieve the last parameter added (which describes the parameter)
+            _memberValues[property] = _parameters[_parameters.Count - 1];
+          }
+        }
+      }
+
+      public override void Visit(DbIsNullExpression expression)
+      {
+        expression.Argument.Accept(this);
+        _commandText.Append(" IS NULL");
+      }
+
+      public override void Visit(DbNotExpression expression)
       {
-        tree = sql8rewriter.InvokeMember("Rewrite", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.InvokeMethod | System.Reflection.BindingFlags.Static, null, null, new object[] { tree }) as DbQueryCommandTree;
-      }      
-      return tree;
-    }
+        _commandText.Append("NOT (");
+        expression.Accept(this);
+        _commandText.Append(")");
+      }
 
-    public override bool Visit(DbAndExpression expression)
-    {
-      return VisitBinaryExpression(expression);
-    }
+      public override void Visit(DbConstantExpression expression)
+      {
+        SQLiteParameter parameter = CreateParameter(expression.Value, expression.ResultType);
+        _commandText.Append(parameter.ParameterName);
+      }
 
-    public override bool Visit(DbApplyExpression expression)
-    {
-      throw new NotSupportedException("apply expression");
-    }
-
-    public override bool Visit(DbArithmeticExpression expression)
-    {
-      return VisitExpressionList(expression.Arguments);
-    }
+      public override void Visit(DbScanExpression expression)
+      {
+        string definingQuery = MetadataHelpers.TryGetValueForMetadataProperty<string>(expression.Target, "DefiningQuery");
+        if (definingQuery != null)
+        {
+          throw new NotSupportedException(String.Format("Unable to update the EntitySet '{0}' because it has a DefiningQuery and no <{1}> element exists in the <ModificationFunctionMapping> element to support the current operation.", expression.Target.Name, _kind));
+        }
+        _commandText.Append(SqlGenerator.GetTargetTSql(expression.Target));
+      }
 
-    public override bool Visit(DbCaseExpression expression)
-    {
-      bool flag1 = VisitExpressionList(expression.When);
-      bool flag2 = VisitExpressionList(expression.Then);
-      bool flag3 = VisitExpression(expression.Else);
-
-      return (flag1 || flag2 || flag3);
-    }
-
-    public override bool Visit(DbCastExpression expression)
-    {
-      return VisitUnaryExpression(expression);
-    }
-
-    public override bool Visit(DbComparisonExpression expression)
-    {
-      return VisitBinaryExpression(expression);
-    }
+      public override void Visit(DbPropertyExpression expression)
+      {
+        _commandText.Append(GenerateMemberTSql(expression.Property));
+      }
 
-    public override bool Visit(DbConstantExpression expression)
-    {
-      return false;
-    }
-
-    public override bool Visit(DbCrossJoinExpression expression)
-    {
-      return VisitExpressionBindingList(expression.Inputs);
-    }
-
-    public override bool Visit(DbDerefExpression expression)
-    {
-      return VisitUnaryExpression(expression);
-    }
-
-    public override bool Visit(DbDistinctExpression expression)
-    {
-      return VisitUnaryExpression(expression);
-    }
-
-    public override bool Visit(DbElementExpression expression)
-    {
-      return VisitUnaryExpression(expression);
-    }
-
-    public override bool Visit(DbEntityRefExpression expression)
-    {
-      return VisitUnaryExpression(expression);
-    }
-
-    public override bool Visit(DbExceptExpression expression)
-    {
-      VisitExpression(expression.Left);
-      VisitExpression(expression.Right);
-      return true;
-    }
-
-    public override bool Visit(DbExpression expression)
-    {
-      throw new NotSupportedException(expression.GetType().FullName);
-    }
+      public override void Visit(DbNullExpression expression)
+      {
+        _commandText.Append("NULL");
+      }
 
-    public override bool Visit(DbFilterExpression expression)
-    {
-      bool flag1 = VisitExpressionBinding(expression.Input);
-      bool flag2 = VisitExpression(expression.Predicate);
-
-      return (flag1 || flag2);
-    }
-
-    public override bool Visit(DbFunctionExpression expression)
-    {
-      return VisitExpressionList(expression.Arguments);
-    }
-
-    public override bool Visit(DbGroupByExpression expression)
-    {
-      bool flag1 = VisitExpression(expression.Input.Expression);
-      bool flag2 = VisitExpressionList(expression.Keys);
-      bool flag3 = VisitAggregateList(expression.Aggregates);
-
-      return (flag1 || flag2 || flag3);
-    }
-
-    public override bool Visit(DbIntersectExpression expression)
-    {
-      VisitExpression(expression.Left);
-      VisitExpression(expression.Right);
-      return true;
-    }
-
-    public override bool Visit(DbIsEmptyExpression expression)
-    {
-      return VisitUnaryExpression(expression);
-    }
-
-    public override bool Visit(DbIsNullExpression expression)
-    {
-      return VisitUnaryExpression(expression);
-    }
-
-    public override bool Visit(DbIsOfExpression expression)
-    {
-      return VisitUnaryExpression(expression);
-    }
-
-    public override bool Visit(DbJoinExpression expression)
-    {
-      bool flag1 = VisitExpressionBinding(expression.Left);
-      bool flag2 = VisitExpressionBinding(expression.Right);
-      bool flag3 = VisitExpression(expression.JoinCondition);
-      return (flag1 || flag2 || flag3);
-    }
-
-    public override bool Visit(DbLikeExpression expression)
-    {
-      bool flag1 = VisitExpression(expression.Argument);
-      bool flag2 = VisitExpression(expression.Pattern);
-      bool flag3 = VisitExpression(expression.Escape);
-      return (flag1 || flag2 || flag3);
-    }
-
-    public override bool Visit(DbLimitExpression expression)
-    {
-      return VisitExpression(expression.Argument);
-    }
-
-    public override bool Visit(DbNewInstanceExpression expression)
-    {
-      return VisitExpressionList(expression.Arguments);
-    }
-
-    public override bool Visit(DbNotExpression expression)
-    {
-      return VisitUnaryExpression(expression);
-    }
+      public override void Visit(DbNewInstanceExpression expression)
+      {
+        // assumes all arguments are self-describing (no need to use aliases
+        // because no renames are ever used in the projection)
+        bool first = true;
+        foreach (DbExpression argument in expression.Arguments)
+        {
+          if (first) { first = false; }
+          else { _commandText.Append(", "); }
+          argument.Accept(this);
+        }
+      }
 
-    public override bool Visit(DbNullExpression expression)
-    {
-      return false;
-    }
-
-    public override bool Visit(DbOfTypeExpression expression)
-    {
-      return VisitUnaryExpression(expression);
-    }
-
-    public override bool Visit(DbOrExpression expression)
-    {
-      return VisitBinaryExpression(expression);
-    }
-
-    public override bool Visit(DbParameterReferenceExpression expression)
-    {
-      return false;
-    }
-
-    public override bool Visit(DbProjectExpression expression)
-    {
-      bool flag1 = VisitExpressionBinding(expression.Input);
-      bool flag2 = VisitExpression(expression.Projection);
-      return (flag1 || flag2);
-    }
-
-    public override bool Visit(DbPropertyExpression expression)
-    {
-      return VisitExpression(expression.Instance);
-    }
-
-    public override bool Visit(DbQuantifierExpression expression)
-    {
-      bool flag1 = VisitExpressionBinding(expression.Input);
-      bool flag2 = VisitExpression(expression.Predicate);
-      return (flag1 || flag2);
-    }
-
-    public override bool Visit(DbRefExpression expression)
-    {
-      return VisitUnaryExpression(expression);
-    }
-
-    public override bool Visit(DbRefKeyExpression expression)
-    {
-      return VisitUnaryExpression(expression);
-    }
-
-    public override bool Visit(DbRelationshipNavigationExpression expression)
-    {
-      return VisitExpression(expression.NavigationSource);
-    }
-
-    public override bool Visit(DbScanExpression expression)
-    {
-      return false;
-    }
-
-    public override bool Visit(DbSkipExpression expression)
-    {
-      VisitExpressionBinding(expression.Input);
-      VisitSortClauseList(expression.SortOrder);
-      VisitExpression(expression.Count);
-      return true;
-    }
-
-    public override bool Visit(DbSortExpression expression)
-    {
-      bool flag1 = VisitExpressionBinding(expression.Input);
-      bool flag2 = VisitSortClauseList(expression.SortOrder);
-      return (flag1 || flag2);
-    }
-
-    public override bool Visit(DbTreatExpression expression)
-    {
-      return VisitUnaryExpression(expression);
-    }
-
-    public override bool Visit(DbUnionAllExpression expression)
-    {
-      return VisitBinaryExpression(expression);
-    }
-
-    public override bool Visit(DbVariableReferenceExpression expression)
-    {
-      return false;
-    }
-
-    private bool VisitAggregate(DbAggregate aggregate)
-    {
-      return VisitExpressionList(aggregate.Arguments);
-    }
-
-    private bool VisitAggregateList(IList<DbAggregate> list)
-    {
-      return VisitList<DbAggregate>(new ListElementHandler<DbAggregate>(VisitAggregate), list);
-    }
-
-    private bool VisitBinaryExpression(DbBinaryExpression expr)
-    {
-      bool flag1 = VisitExpression(expr.Left);
-      bool flag2 = VisitExpression(expr.Right);
-      return (flag1 || flag2);
-    }
-
-    private bool VisitExpression(DbExpression expression)
-    {
-      if (expression == null)
+      private void VisitBinary(DbBinaryExpression expression, string separator)
       {
-        return false;
+        _commandText.Append("(");
+        expression.Left.Accept(this);
+        _commandText.Append(separator);
+        expression.Right.Accept(this);
+        _commandText.Append(")");
       }
-      return expression.Accept<bool>(this);
     }
-
-    private bool VisitExpressionBinding(DbExpressionBinding expressionBinding)
-    {
-      return VisitExpression(expressionBinding.Expression);
-    }
-
-    private bool VisitExpressionBindingList(IList<DbExpressionBinding> list)
-    {
-      return VisitList<DbExpressionBinding>(new ListElementHandler<DbExpressionBinding>(VisitExpressionBinding), list);
-    }
-
-    private bool VisitExpressionList(IList<DbExpression> list)
-    {
-      return VisitList<DbExpression>(new ListElementHandler<DbExpression>(VisitExpression), list);
-    }
-
-    private static bool VisitList<TElementType>(ListElementHandler<TElementType> handler, IList<TElementType> list)
-    {
-      bool flag = false;
-      foreach (TElementType local in list)
-      {
-        bool flag2 = handler(local);
-        flag = flag || flag2;
-      }
-      return flag;
-    }
-
-    private bool VisitSortClause(DbSortClause sortClause)
-    {
-      return VisitExpression(sortClause.Expression);
-    }
-
-    private bool VisitSortClauseList(IList<DbSortClause> list)
-    {
-      return VisitList<DbSortClause>(new ListElementHandler<DbSortClause>(VisitSortClause), list);
-    }
-
-    private bool VisitUnaryExpression(DbUnaryExpression expr)
-    {
-      return VisitExpression(expr.Argument);
-    }
-
-    private delegate bool ListElementHandler<TElementType>(TElementType element);
   }
 }
+

Index: testce/testce.csproj
==================================================================
--- testce/testce.csproj
+++ testce/testce.csproj
@@ -9,12 +9,12 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>test</RootNamespace>
     <AssemblyName>testce</AssemblyName>
     <ProjectTypeGuids>{4D628B5B-2FBC-4AA6-8C16-197242AEB884};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <PlatformFamilyName>PocketPC</PlatformFamilyName>
-    <PlatformID>b2c48bd2-963d-4549-9169-1fa021dce484</PlatformID>
-    <OSVersion>5.02</OSVersion>
+    <PlatformID>3C41C503-53EF-4c2a-8DD4-A8217CAD115E</PlatformID>
+    <OSVersion>4.20</OSVersion>
     <DeployDirSuffix>testce</DeployDirSuffix>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <FormFactorID>
     </FormFactorID>
     <StartupObject>
@@ -21,11 +21,11 @@
     </StartupObject>
     <DeployDirPrefix>%25CSIDL_PROGRAM_FILES%25</DeployDirPrefix>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>2.0</OldToolsVersion>
-    <NativePlatformName>Windows Mobile 6 Professional SDK</NativePlatformName>
+    <NativePlatformName>Pocket PC 2003</NativePlatformName>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -61,10 +61,11 @@
     <Reference Include="System.Data">
       <Private>False</Private>
     </Reference>
     <Reference Include="System.Data.SQLite, Version=1.0.47.0, Culture=neutral, PublicKeyToken=1fdb50b1b62b4c84, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System.Drawing">
       <Private>False</Private>
     </Reference>
     <Reference Include="System.Windows.Forms">

Index: testlinq/northwindEF.db
==================================================================
--- testlinq/northwindEF.db
+++ testlinq/northwindEF.db
cannot compute difference between binary files

Index: tools/install/InstallDesigner.cs
==================================================================
--- tools/install/InstallDesigner.cs
+++ tools/install/InstallDesigner.cs
@@ -293,10 +293,25 @@
                   subkey.SetValue(null, path);
                 }
               }
             }
           }
+
+          for (int n = 0; n < compactFrameworks.Length; n++)
+          {
+            using (RegistryKey key = Registry.LocalMachine.OpenSubKey(String.Format("Software\\Microsoft\\.NETCompactFramework\\v3.5.0.0\\{0}\\AssemblyFoldersEx", compactFrameworks[n]), true))
+            {
+
+              if (key != null)
+              {
+                using (RegistryKey subkey = key.CreateSubKey("SQLite", RegistryKeyPermissionCheck.ReadWriteSubTree))
+                {
+                  subkey.SetValue(null, path);
+                }
+              }
+            }
+          }
         }
 
         for (int n = 0; n < 2; n++)
         {
           // Add factory support to the machine.config file.
@@ -356,20 +371,24 @@
       {
         try
         {
           Registry.LocalMachine.DeleteSubKey("Software\\Microsoft\\.NETFramework\\v2.0.50727\\AssemblyFoldersEx\\SQLite");
 
-          for (int n = 0; n < compactFrameworks.Length; n++)
+          string[] versions = { "v2.0.0.0", "v3.5.0.0" };
+          for (int x = 0; x < versions.Length; x++)
           {
-            using (RegistryKey key = Registry.LocalMachine.OpenSubKey(String.Format("Software\\Microsoft\\.NETCompactFramework\\v2.0.0.0\\{0}\\DataProviders", compactFrameworks[n]), true))
+            for (int n = 0; n < compactFrameworks.Length; n++)
             {
-              try
+              using (RegistryKey key = Registry.LocalMachine.OpenSubKey(String.Format("Software\\Microsoft\\.NETCompactFramework\\{1}\\{0}\\DataProviders", compactFrameworks[n], versions[x]), true))
               {
-                if (key != null) key.DeleteSubKey(standardDataProviderGuid.ToString("B"));
-              }
-              catch
-              {
+                try
+                {
+                  if (key != null) key.DeleteSubKey(standardDataProviderGuid.ToString("B"));
+                }
+                catch
+                {
+                }
               }
             }
           }
 
           for (int n = 0; n < compactFrameworks.Length; n++)
@@ -473,12 +492,12 @@
           {
           }
           finally
           {
             File.Delete(tempPath);
-            if (File.Exists(Path.GetFullPath("System.Data.SQLite.Linq.DLL")) == true)
-              AssemblyCache.InstallAssembly(Path.GetFullPath("System.Data.SQLite.Linq.DLL"), null, AssemblyCommitFlags.Default);
+            if (File.Exists(Path.GetFullPath("..\\System.Data.SQLite.Linq.DLL")) == true)
+              AssemblyCache.InstallAssembly(Path.GetFullPath("..\\System.Data.SQLite.Linq.DLL"), null, AssemblyCommitFlags.Default);
 
             AssemblyCache.InstallAssembly(Path.GetFullPath("SQLite.Designer.DLL"), null, AssemblyCommitFlags.Default);
             AssemblyCache.InstallAssembly(SQLiteLocation, null, AssemblyCommitFlags.Default);
           }
         }
@@ -634,21 +653,26 @@
       //}
       //catch
       //{
       //}
 
-      for (int n = 0; n < compactFrameworks.Length; n++)
+      string[] versions = { "v2.0.0.0", "v3.5.0.0" };
+
+      for (int x = 0; x < versions.Length; x++)
       {
-        using (RegistryKey key = Registry.LocalMachine.OpenSubKey(String.Format("Software\\Microsoft\\.NETCompactFramework\\v2.0.0.0\\{0}\\DataProviders", compactFrameworks[n]), true))
+        for (int n = 0; n < compactFrameworks.Length; n++)
         {
-          if (key != null)
+          using (RegistryKey key = Registry.LocalMachine.CreateSubKey(String.Format("Software\\Microsoft\\.NETCompactFramework\\{1}\\{0}\\DataProviders", compactFrameworks[n], versions[x])))
           {
-            using (RegistryKey subkey = key.CreateSubKey(standardDataProviderGuid.ToString("B"), RegistryKeyPermissionCheck.ReadWriteSubTree))
+            if (key != null)
             {
-              subkey.SetValue(null, ".NET Framework Data Provider for SQLite");
-              subkey.SetValue("InvariantName", "System.Data.SQLite");
-              subkey.SetValue("RuntimeAssembly", "System.Data.SQLite.DLL");
+              using (RegistryKey subkey = key.CreateSubKey(standardDataProviderGuid.ToString("B"), RegistryKeyPermissionCheck.ReadWriteSubTree))
+              {
+                subkey.SetValue(null, ".NET Framework Data Provider for SQLite");
+                subkey.SetValue("InvariantName", "System.Data.SQLite");
+                subkey.SetValue("RuntimeAssembly", "System.Data.SQLite.DLL");
+              }
             }
           }
         }
       }
 

Index: tools/install/Properties/Resources.Designer.cs
==================================================================
--- tools/install/Properties/Resources.Designer.cs
+++ tools/install/Properties/Resources.Designer.cs
@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.1433
+//     Runtime Version:2.0.50727.3053
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------

Index: tools/install/Properties/Resources.resx
==================================================================
--- tools/install/Properties/Resources.resx
+++ tools/install/Properties/Resources.resx
@@ -117,8 +117,8 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="System_Data_SQLite" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\System.Data.SQLite.DLL;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\System.Data.SQLite.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
 </root>

Index: tools/install/install.csproj
==================================================================
--- tools/install/install.csproj
+++ tools/install/install.csproj
@@ -1,10 +1,10 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30428</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{71EED886-B5BF-488E-A4AA-1403E393D224}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>install</RootNamespace>
@@ -73,29 +73,27 @@
       <DependentUpon>InstallDesigner.cs</DependentUpon>
     </Compile>
     <Compile Include="Program.cs">
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
     <EmbeddedResource Include="InstallDesigner.resx">
       <SubType>Designer</SubType>
       <DependentUpon>InstallDesigner.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
     </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
     <None Include="install.exe.manifest" />
-    <None Include="Resources\System.Data.SQLite.DLL" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
       <Visible>False</Visible>
       <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
@@ -112,10 +110,11 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
     <Content Include="install.ico" />
+    <None Include="Resources\System.Data.SQLite.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

Index: tools/setup/exe/setup/setup.rc
==================================================================
--- tools/setup/exe/setup/setup.rc
+++ tools/setup/exe/setup/setup.rc
@@ -55,11 +55,11 @@
 //
 // Version
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,59,0
+ FILEVERSION 1,0,60,0
  PRODUCTVERSION 1,0,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
 #else
@@ -73,11 +73,11 @@
     BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "Comments", "http://sqlite.phxsoftware.com"
             VALUE "FileDescription", "SQLite ADO.NET 2.0 Setup"
-            VALUE "FileVersion", "1.0.59.0"
+            VALUE "FileVersion", "1.0.60.0"
             VALUE "InternalName", "setup"
             VALUE "LegalCopyright", "Released to the public domain"
             VALUE "OriginalFilename", "setup.exe"
             VALUE "ProductName", "System.Data.SQLite"
             VALUE "ProductVersion", "1.0"

Index: tools/setup/sqlite_setup.suo
==================================================================
--- tools/setup/sqlite_setup.suo
+++ tools/setup/sqlite_setup.suo
cannot compute difference between binary files

Index: tools/setup/sqlite_setup.vdproj
==================================================================
--- tools/setup/sqlite_setup.vdproj
+++ tools/setup/sqlite_setup.vdproj
@@ -31,26 +31,14 @@
         "OwnerKey" = "8:_3578C7AADEF926410602B18EDBBEFFF9"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_200C9E264509441F9AAB7EBE82A905DB"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_244D4945EA335F5E4E54085BFD020CC1"
         "OwnerKey" = "8:_A7448E608040319F6C5E12637881B1F6"
         "MsmSig" = "8:_UNDEFINED"
         }
-        "Entry"
-        {
-        "MsmKey" = "8:_2560D913B1D74BAAB2B910FD325E9721"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
         "Entry"
         {
         "MsmKey" = "8:_26E74AC417994018832F9B82462AA3AF"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -145,16 +133,10 @@
         "OwnerKey" = "8:_B00FB4712154B7A5894294702C96689D"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_A18DBDB7776215EAD9A52C96F8CA1E91"
-        "OwnerKey" = "8:_40F352185F3B41A485F42BFC64BF9162"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_A7448E608040319F6C5E12637881B1F6"
         "OwnerKey" = "8:_CD3CE5CDAB13405EA6EAAADC95F88D2E"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -186,15 +168,27 @@
         "MsmKey" = "8:_B6156897CBBB4E929D9C1F7358CE9E90"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
+        {
+        "MsmKey" = "8:_C5435F188DCA474EA777C28201046580"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
         {
         "MsmKey" = "8:_C8E329AC56AD4C88A986481E639F72A5"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
+        "Entry"
+        {
+        "MsmKey" = "8:_CA378DC7967442BAA821EDC0F78B57B7"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
         "Entry"
         {
         "MsmKey" = "8:_CD3CE5CDAB13405EA6EAAADC95F88D2E"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -264,10 +258,16 @@
         "MsmKey" = "8:_E6DB5A9B08AC4645A19C948BBFDD0348"
         "OwnerKey" = "8:_244D4945EA335F5E4E54085BFD020CC1"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
+        {
+        "MsmKey" = "8:_ED19EC4A19234BB8B89EA24B3F613547"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
         {
         "MsmKey" = "8:_F320FBAE871DA320178BEEA242900CC7"
         "OwnerKey" = "8:_2C7EDFF06B61482393D94E3A63D90113"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -284,11 +284,17 @@
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_CE9E3EF0722342DB8DE0860C0DDCD39E"
+        "OwnerKey" = "8:_CA378DC7967442BAA821EDC0F78B57B7"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_40F352185F3B41A485F42BFC64BF9162"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
@@ -299,10 +305,16 @@
         {
         "MsmKey" = "8:_UNDEFINED"
         "OwnerKey" = "8:_D02FA65544C54EDE80CFCBDE5F083939"
         "MsmSig" = "8:_UNDEFINED"
         }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_CE9E3EF0722342DB8DE0860C0DDCD39E"
+        "MsmSig" = "8:_UNDEFINED"
+        }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
         "OwnerKey" = "8:_CD3CE5CDAB13405EA6EAAADC95F88D2E"
         "MsmSig" = "8:_UNDEFINED"
@@ -335,16 +347,10 @@
         {
         "MsmKey" = "8:_UNDEFINED"
         "OwnerKey" = "8:_40F352185F3B41A485F42BFC64BF9162"
         "MsmSig" = "8:_UNDEFINED"
         }
-        "Entry"
-        {
-        "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_A18DBDB7776215EAD9A52C96F8CA1E91"
-        "MsmSig" = "8:_UNDEFINED"
-        }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
         "OwnerKey" = "8:_40DFF08BA903482D807E715A041CA8B1"
         "MsmSig" = "8:_UNDEFINED"
@@ -589,30 +595,10 @@
             "Register" = "3:1"
             "Exclude" = "11:TRUE"
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_200C9E264509441F9AAB7EBE82A905DB"
-            {
-            "SourcePath" = "8:..\\..\\bin\\CompactFramework\\SQLite.Interop.059.lib"
-            "TargetName" = "8:SQLite.Interop.059.lib"
-            "Tag" = "8:"
-            "Folder" = "8:_10C8E86E2EEF451BB40F774C35C5466F"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:FALSE"
-            "IsolateTo" = "8:"
-            }
             "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_244D4945EA335F5E4E54085BFD020CC1"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:TRUE"
             "AssemblyAsmDisplayName" = "8:Microsoft.VisualStudio.Shell.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
@@ -640,30 +626,10 @@
             "Register" = "3:1"
             "Exclude" = "11:TRUE"
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2560D913B1D74BAAB2B910FD325E9721"
-            {
-            "SourcePath" = "8:..\\..\\bin\\CompactFramework\\SQLite.Interop.059.DLL"
-            "TargetName" = "8:SQLite.Interop.059.DLL"
-            "Tag" = "8:"
-            "Folder" = "8:_10C8E86E2EEF451BB40F774C35C5466F"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:FALSE"
-            "IsolateTo" = "8:"
-            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_26E74AC417994018832F9B82462AA3AF"
             {
             "SourcePath" = "8:..\\..\\bin\\x64\\System.Data.SQLite.lib"
             "TargetName" = "8:System.Data.SQLite.lib"
             "Tag" = "8:"
@@ -684,11 +650,11 @@
             }
             "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2C7EDFF06B61482393D94E3A63D90113"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:test, Version=1.0.0.13492, Culture=neutral, processorArchitecture=x86"
+            "AssemblyAsmDisplayName" = "8:test, Version=1.0.0.16237, Culture=neutral, processorArchitecture=x86"
                 "ScatterAssemblies"
                 {
                     "_2C7EDFF06B61482393D94E3A63D90113"
                     {
                     "Name" = "8:test.exe"
@@ -797,11 +763,11 @@
             }
             "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_40DFF08BA903482D807E715A041CA8B1"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:install, Version=1.0.0.13866, Culture=neutral, processorArchitecture=x86"
+            "AssemblyAsmDisplayName" = "8:install, Version=1.0.0.14741, Culture=neutral, processorArchitecture=x86"
                 "ScatterAssemblies"
                 {
                     "_40DFF08BA903482D807E715A041CA8B1"
                     {
                     "Name" = "8:install.exe"
@@ -828,11 +794,11 @@
             }
             "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_40F352185F3B41A485F42BFC64BF9162"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:testce, Version=1.0.0.13580, Culture=neutral, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:testce, Version=1.0.0.40795, Culture=neutral, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
                     "_40F352185F3B41A485F42BFC64BF9162"
                     {
                     "Name" = "8:testce.exe"
@@ -954,41 +920,10 @@
             "Permanent" = "11:FALSE"
             "SharedLegacy" = "11:FALSE"
             "PackageAs" = "3:1"
             "Register" = "3:1"
             "Exclude" = "11:TRUE"
-            "IsDependency" = "11:TRUE"
-            "IsolateTo" = "8:"
-            }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A18DBDB7776215EAD9A52C96F8CA1E91"
-            {
-            "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:System.Data.SQLite, Version=1.0.59.0, Culture=neutral, PublicKeyToken=1fdb50b1b62b4c84, processorArchitecture=MSIL"
-                "ScatterAssemblies"
-                {
-                    "_A18DBDB7776215EAD9A52C96F8CA1E91"
-                    {
-                    "Name" = "8:System.Data.SQLite.DLL"
-                    "Attributes" = "3:512"
-                    }
-                }
-            "SourcePath" = "8:System.Data.SQLite.DLL"
-            "TargetName" = "8:"
-            "Tag" = "8:"
-            "Folder" = "8:_10C8E86E2EEF451BB40F774C35C5466F"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:FALSE"
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
             "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A7448E608040319F6C5E12637881B1F6"
             {
@@ -1120,18 +1055,69 @@
             "PackageAs" = "3:1"
             "Register" = "3:1"
             "Exclude" = "11:TRUE"
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C5435F188DCA474EA777C28201046580"
+            {
+            "SourcePath" = "8:..\\..\\bin\\CompactFramework\\SQLite.Interop.060.DLL"
+            "TargetName" = "8:SQLite.Interop.060.DLL"
+            "Tag" = "8:"
+            "Folder" = "8:_10C8E86E2EEF451BB40F774C35C5466F"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
             }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C8E329AC56AD4C88A986481E639F72A5"
             {
             "SourcePath" = "8:..\\..\\readme.htm"
             "TargetName" = "8:readme.htm"
             "Tag" = "8:"
             "Folder" = "8:_A0841E79B7874F7288672343934C7657"
             "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_CA378DC7967442BAA821EDC0F78B57B7"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:System.Data.SQLite, Version=1.0.60.0, Culture=neutral, PublicKeyToken=1fdb50b1b62b4c84, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_CA378DC7967442BAA821EDC0F78B57B7"
+                    {
+                    "Name" = "8:System.Data.SQLite.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:..\\..\\bin\\CompactFramework\\System.Data.SQLite.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_10C8E86E2EEF451BB40F774C35C5466F"
+            "Condition" = "8:"
             "Transitive" = "11:FALSE"
             "Vital" = "11:TRUE"
             "ReadOnly" = "11:FALSE"
             "Hidden" = "11:FALSE"
             "System" = "11:FALSE"
@@ -1304,16 +1290,36 @@
             "PackageAs" = "3:1"
             "Register" = "3:1"
             "Exclude" = "11:TRUE"
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_ED19EC4A19234BB8B89EA24B3F613547"
+            {
+            "SourcePath" = "8:..\\..\\bin\\CompactFramework\\SQLite.Interop.060.lib"
+            "TargetName" = "8:SQLite.Interop.060.lib"
+            "Tag" = "8:"
+            "Folder" = "8:_10C8E86E2EEF451BB40F774C35C5466F"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
             }
             "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F320FBAE871DA320178BEEA242900CC7"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:System.Data.SQLite, Version=1.0.59.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86"
+            "AssemblyAsmDisplayName" = "8:System.Data.SQLite, Version=1.0.60.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86"
                 "ScatterAssemblies"
                 {
                     "_F320FBAE871DA320178BEEA242900CC7"
                     {
                     "Name" = "8:System.Data.SQLite.DLL"
@@ -1469,18 +1475,18 @@
         }
         "Product"
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:SQLite ADO.NET 2.0 Provider"
-        "ProductCode" = "8:{718F7D6C-4CA0-4A7E-8F31-4EFE34F7ACE6}"
-        "PackageCode" = "8:{E7E5C8DD-10BB-4BA9-B896-B45FDE9F0250}"
+        "ProductCode" = "8:{6C047B82-5C03-4F84-9B27-53743EB95128}"
+        "PackageCode" = "8:{FFDFA941-E460-4318-B901-DD7D44D518AA}"
         "UpgradeCode" = "8:{78329A82-AFB1-453B-AF00-D46AC911DA89}"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:1.059.0"
+        "ProductVersion" = "8:1.060.0"
         "Manufacturer" = "8:Phoenix Software Solutions, LLC"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://sqlite.phxsoftware.com"
         "Title" = "8:SQLite ADO.NET 2.0 Provider"
         "Subject" = "8:"