Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Merge updates from trunk. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | designOptions |
| Files: | files | file ages | folders |
| SHA1: |
eeff47049c4d83a6f656283ca8edaf81 |
| User & Date: | mistachkin 2014-08-08 23:17:25.556 |
Context
|
2014-08-09
| ||
| 01:29 | Further refinements to the global assembly cache handling in the design-time components installer. check-in: f2f160939a user: mistachkin tags: designOptions | |
|
2014-08-08
| ||
| 23:17 | Merge updates from trunk. check-in: eeff47049c user: mistachkin tags: designOptions | |
| 23:17 | For the applicable setup packages, register the System.Data.SQLite.EF6 assembly in the Global Assembly Cache. check-in: a451b0fe1d user: mistachkin tags: designOptions | |
| 21:42 | Apparently, using nullable value types in DbConnectionStringBuilder derived classes can cause issues; therefore, avoid it. check-in: 29c37848ff user: mistachkin tags: trunk | |
Changes
Changes to .fossil-settings/ignore-glob.
|
| < | 1 2 3 | Externals/Eagle/bin/Eagle*.pdb Externals/Eagle/bin/x64/Spilornis.pdb Externals/Eagle/bin/x86/Spilornis.pdb |
Changes to System.Data.SQLite/SQLiteConnection.cs.
| ︙ | ︙ | |||
323 324 325 326 327 328 329 330 331 332 333 334 335 336 |
/// <description>True</description>
/// </item>
/// </list>
/// </remarks>
public sealed partial class SQLiteConnection : DbConnection, ICloneable
{
#region Private Constants
/// <summary>
/// The default "stub" (i.e. placeholder) base schema name to use when
/// returning column schema information. Used as the initial value of
/// the BaseSchemaName property. This should start with "sqlite_*"
/// because those names are reserved for use by SQLite (i.e. they cannot
/// be confused with the names of user objects).
/// </summary>
| > > > > > > > | 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 |
/// <description>True</description>
/// </item>
/// </list>
/// </remarks>
public sealed partial class SQLiteConnection : DbConnection, ICloneable
{
#region Private Constants
/// <summary>
/// The "invalid value" for the <see cref="DbType" /> enumeration used
/// by the <see cref="DefaultDbType" /> property. This constant is shared
/// by this class and the SQLiteConnectionStringBuilder class.
/// </summary>
internal const DbType BadDbType = (DbType)(-1);
/// <summary>
/// The default "stub" (i.e. placeholder) base schema name to use when
/// returning column schema information. Used as the initial value of
/// the BaseSchemaName property. This should start with "sqlite_*"
/// because those names are reserved for use by SQLite (i.e. they cannot
/// be confused with the names of user objects).
/// </summary>
|
| ︙ | ︙ | |||
2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 |
_flags = (enumValue is SQLiteConnectionFlags) ? (SQLiteConnectionFlags)enumValue : DefaultFlags;
bool noSharedFlags = SQLiteConvert.ToBoolean(FindKey(opts, "NoSharedFlags", DefaultNoSharedFlags.ToString()));
if (!noSharedFlags) { lock (_syncRoot) { _flags |= _sharedFlags; } }
enumValue = TryParseEnum(typeof(DbType), FindKey(opts, "DefaultDbType", null), true);
_defaultDbType = (enumValue is DbType) ? (DbType)enumValue : (DbType?)null;
_defaultTypeName = FindKey(opts, "DefaultTypeName", null);
#if !NET_COMPACT_20 && TRACE_WARNING
bool uri = false;
#endif
bool fullUri = false;
string fileName;
| > > > > > > > > > > > | 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 |
_flags = (enumValue is SQLiteConnectionFlags) ? (SQLiteConnectionFlags)enumValue : DefaultFlags;
bool noSharedFlags = SQLiteConvert.ToBoolean(FindKey(opts, "NoSharedFlags", DefaultNoSharedFlags.ToString()));
if (!noSharedFlags) { lock (_syncRoot) { _flags |= _sharedFlags; } }
enumValue = TryParseEnum(typeof(DbType), FindKey(opts, "DefaultDbType", null), true);
_defaultDbType = (enumValue is DbType) ? (DbType)enumValue : (DbType?)null;
//
// NOTE: Nullable values types are not supported by the .NET Framework
// ADO.NET support components that work with the connection string
// builder; therefore, translate the "invalid value" used by the
// SQLiteConnectionStringBuilder.DefaultDbType property to null
// here.
//
if ((_defaultDbType != null) && ((DbType)_defaultDbType == BadDbType))
_defaultDbType = null;
_defaultTypeName = FindKey(opts, "DefaultTypeName", null);
#if !NET_COMPACT_20 && TRACE_WARNING
bool uri = false;
#endif
bool fullUri = false;
string fileName;
|
| ︙ | ︙ |
Changes to System.Data.SQLite/SQLiteConnectionStringBuilder.cs.
| ︙ | ︙ | |||
606 607 608 609 610 611 612 |
}
/// <summary>
/// Gets/sets the default database type for the connection.
/// </summary>
[DisplayName("Default Database Type")]
[Browsable(true)]
| | | | | 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 |
}
/// <summary>
/// Gets/sets the default database type for the connection.
/// </summary>
[DisplayName("Default Database Type")]
[Browsable(true)]
[DefaultValue(SQLiteConnection.BadDbType)]
public DbType DefaultDbType
{
get
{
object value;
if (TryGetValue("defaultdbtype", out value))
{
if (value is string)
return (DbType)TypeDescriptor.GetConverter(
typeof(DbType)).ConvertFrom(value);
else if (value != null)
return (DbType)value;
}
return SQLiteConnection.BadDbType;
}
set
{
this["defaultdbtype"] = value;
}
}
|
| ︙ | ︙ |