Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Experimental fix for ticket [ccfa69fc32]. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | bug-ccfa69fc32 |
| Files: | files | file ages | folders |
| SHA1: |
42af4d17a568d83cc82bde5b9d813d1c |
| User & Date: | mistachkin 2011-09-11 14:33:54 |
Context
|
2011-09-11
| ||
| 15:33 | Add unit testing support for the fix to ticket [ccfa69fc32]. check-in: f4e1038098 user: mistachkin tags: bug-ccfa69fc32 | |
| 14:33 | Experimental fix for ticket [ccfa69fc32]. check-in: 42af4d17a5 user: mistachkin tags: bug-ccfa69fc32 | |
| 13:14 | Fix debug builds of the native interop assembly by making sure that SQLITE_WIN32_MALLOC is not defined with SQLITE_MEMDEBUG (i.e. they are mutually exclusive at compile-time). check-in: 7ef5b80330 user: mistachkin tags: trunk | |
Changes
Changes to System.Data.SQLite/SQLiteConnection.cs.
723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 |
#if !PLATFORM_COMPACTFRAMEWORK
/// <summary>
/// Manual distributed transaction enlistment support
/// </summary>
/// <param name="transaction">The distributed transaction to enlist in</param>
public override void EnlistTransaction(System.Transactions.Transaction transaction)
{
if (_transactionLevel > 0 && transaction != null)
throw new ArgumentException("Unable to enlist in transaction, a local transaction already exists");
if (_enlistment != null && transaction == _enlistment._scope)
return;
else if (_enlistment != null)
throw new ArgumentException("Already enlisted in a transaction");
_enlistment = new SQLiteEnlistment(this, transaction);
}
#endif
/// <summary>
/// Looks for a key in the array of key/values of the parameter string. If not found, return the specified default value
/// </summary>
|
< < < > > > > > |
723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 |
#if !PLATFORM_COMPACTFRAMEWORK
/// <summary>
/// Manual distributed transaction enlistment support
/// </summary>
/// <param name="transaction">The distributed transaction to enlist in</param>
public override void EnlistTransaction(System.Transactions.Transaction transaction)
{
if (_enlistment != null && transaction == _enlistment._scope)
return;
else if (_enlistment != null)
throw new ArgumentException("Already enlisted in a transaction");
if (_transactionLevel > 0 && transaction != null)
throw new ArgumentException("Unable to enlist in transaction, a local transaction already exists");
else if (transaction == null)
throw new ArgumentNullException("Unable to enlist in transaction, it is null");
_enlistment = new SQLiteEnlistment(this, transaction);
}
#endif
/// <summary>
/// Looks for a key in the array of key/values of the parameter string. If not found, return the specified default value
/// </summary>
|
Changes to testlinq/Program.cs.
1 2 3 4 5 6 7 8 9 10 11 12 .. 83 84 85 86 87 88 89 90 91 92 93 94 95 96 ... 171 172 173 174 175 176 177 178 179 180 181 182 183 184 |
using System;
using System.Diagnostics;
using System.Linq;
using System.Data.Objects;
using System.Text;
namespace testlinq
{
class Program
{
private static int Main(string[] args)
{
................................................................................
if (value != null)
value = value.Trim();
}
return StartsWithTest(value);
}
default:
{
Console.WriteLine("unknown test \"{0}\"", arg);
return 1;
}
}
}
................................................................................
foreach (Customers customers in query)
{
if (once)
Console.Write(' ');
Console.Write(customers.CustomerID);
once = true;
}
}
return 0;
}
|
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > |
1 2 3 4 5 6 7 8 9 10 11 12 13 .. 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 ... 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 |
using System; using System.Diagnostics; using System.Linq; using System.Data.Objects; using System.Text; using System.Transactions; namespace testlinq { class Program { private static int Main(string[] args) { ................................................................................ if (value != null) value = value.Trim(); } return StartsWithTest(value); } case "eftransaction": { bool value = false; if (args.Length > 1) { if (!bool.TryParse(args[1], out value)) { Console.WriteLine( "cannot parse \"{0}\" as boolean", args[1]); return 1; } } return EFTransactionTest(value); } default: { Console.WriteLine("unknown test \"{0}\"", arg); return 1; } } } ................................................................................ foreach (Customers customers in query) { if (once) Console.Write(' '); Console.Write(customers.CustomerID); once = true; } } return 0; } // // NOTE: Used to test the fix for ticket [ccfa69fc32]. // private static int EFTransactionTest(bool add) { if (add) { using (northwindEFEntities db = new northwindEFEntities()) { using (TransactionScope scope = new TransactionScope()) { // // NOTE: *REQUIRED* This is required so that the // framework is prevented from using multiple // connections to the underlying SQLite database // (i.e. which would result in multiple IMMEDIATE // transactions, thereby failing [later on] with // locking errors). // db.Connection.Open(); for (int index = 0; index < 5; index++) { int id = (index % 10) + 1; Territories territories = new Territories(); territories.TerritoryID = id; territories.TerritoryDescription = String.Format( "Test #{0}", id); territories.Regions = db.Regions.First(); db.AddObject("Territories", territories); } // // NOTE: These territories already exist and should cause // an exception to be thrown when we try to INSERT // them. // int[] territoryIds = new int[] { 1581, 1730, 1833, 2116, 2139 }; foreach (int id in territoryIds) { Territories territories = new Territories(); territories.TerritoryID = id; territories.TerritoryDescription = String.Format( "Test Territory #{0}", id); territories.Regions = db.Regions.First(); db.AddObject("Territories", territories); } for (int index = 5; index < 10; index++) { int id = (index % 10) + 1; Territories territories = new Territories(); territories.TerritoryID = id; territories.TerritoryDescription = String.Format( "Test Territory #{0}", id); territories.Regions = db.Regions.First(); db.AddObject("Territories", territories); } try { db.SaveChanges(SaveOptions.None); } catch (Exception e) { Console.WriteLine(e); } finally { scope.Complete(); db.AcceptAllChanges(); } } } } using (northwindEFEntities db = new northwindEFEntities()) { bool once = false; var query = from t in db.Territories where t.TerritoryID.CompareTo(11) < 0 orderby t.TerritoryID select t; foreach (Territories territories in query) { if (once) Console.Write(' '); Console.Write(territories.TerritoryID); once = true; } } return 0; } |
Changes to testlinq/testlinq.2008.csproj.
42 43 44 45 46 47 48 49 50 51 52 53 54 55 |
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Data.Entity" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Xml" />
<Reference Include="System.Data" />
</ItemGroup>
<ItemGroup>
<Compile Include="NorthwindModel2008.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
|
> |
42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 |
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Data.Entity" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Transactions" />
<Reference Include="System.Xml" />
<Reference Include="System.Data" />
</ItemGroup>
<ItemGroup>
<Compile Include="NorthwindModel2008.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
|
Changes to testlinq/testlinq.2010.csproj.
39 40 41 42 43 44 45 46 47 48 49 50 51 52 |
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data.Entity" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Xml" />
<Reference Include="System.Data" />
</ItemGroup>
<ItemGroup>
<Compile Condition="'$(TargetFrameworkVersion)' == 'v3.5'"
Include="NorthwindModel2008.Designer.cs">
<AutoGen>True</AutoGen>
|
> |
39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 |
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data.Entity" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Transactions" />
<Reference Include="System.Xml" />
<Reference Include="System.Data" />
</ItemGroup>
<ItemGroup>
<Compile Condition="'$(TargetFrameworkVersion)' == 'v3.5'"
Include="NorthwindModel2008.Designer.cs">
<AutoGen>True</AutoGen>
|