Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix some harmless compiler warnings and make sure the String.Format wrapper method is used in the new SQLiteFunction methods. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | delegateFunction |
| Files: | files | file ages | folders |
| SHA1: |
133b025301264043b8de1e873e208b22 |
| User & Date: | mistachkin 2015-08-15 23:00:52 |
Context
|
2015-08-15
| ||
| 23:07 | Merge trunk. check-in: deb2fdb0c9 user: mistachkin tags: delegateFunction | |
| 23:00 | Fix some harmless compiler warnings and make sure the String.Format wrapper method is used in the new SQLiteFunction methods. check-in: 133b025301 user: mistachkin tags: delegateFunction | |
| 22:03 | Update version history docs. check-in: 430d13b350 user: mistachkin tags: delegateFunction | |
Changes
Changes to Setup/build.bat.
267 268 269 270 271 272 273 274 275 276 277 278 279 280 |
ECHO Could not change directory to "%ROOT%". GOTO errors ) SET PATH=%BUILDTOOLDIR%;%PATH% %_VECHO% Path = '%PATH%' IF NOT DEFINED SOLUTION ( %_AECHO% Building all projects... SET SOLUTION=.\SQLite.NET.%YEAR%.MSBuild.sln ) IF NOT EXIST "%SOLUTION%" ( |
> > > > > > > |
267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 |
ECHO Could not change directory to "%ROOT%". GOTO errors ) SET PATH=%BUILDTOOLDIR%;%PATH% %_VECHO% Path = '%PATH%' IF NOT DEFINED SOLUTION ( IF DEFINED COREONLY ( %_AECHO% Building core managed project... SET SOLUTION=.\System.Data.SQLite\System.Data.SQLite.%YEAR%.csproj ) ) IF NOT DEFINED SOLUTION ( %_AECHO% Building all projects... SET SOLUTION=.\SQLite.NET.%YEAR%.MSBuild.sln ) IF NOT EXIST "%SOLUTION%" ( |
Changes to System.Data.SQLite/LINQ/SQLiteFactory_Linq.cs.
56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 |
string version =
#if NET_40 || NET_45 || NET_451 || NET_46
"4.0.0.0";
#else
"3.5.0.0";
#endif
_dbProviderServicesType = Type.GetType(String.Format(CultureInfo.InvariantCulture, "System.Data.Common.DbProviderServices, System.Data.Entity, Version={0}, Culture=neutral, PublicKeyToken=b77a5c561934e089", version), false);
}
/// <summary>
/// Will provide a <see cref="IServiceProvider" /> object in .NET 3.5.
/// </summary>
/// <param name="serviceType">The class or interface type to query for.</param>
/// <returns></returns>
|
| |
56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 |
string version =
#if NET_40 || NET_45 || NET_451 || NET_46
"4.0.0.0";
#else
"3.5.0.0";
#endif
_dbProviderServicesType = Type.GetType(UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, "System.Data.Common.DbProviderServices, System.Data.Entity, Version={0}, Culture=neutral, PublicKeyToken=b77a5c561934e089", version), false);
}
/// <summary>
/// Will provide a <see cref="IServiceProvider" /> object in .NET 3.5.
/// </summary>
/// <param name="serviceType">The class or interface type to query for.</param>
/// <returns></returns>
|
Changes to System.Data.SQLite/SQLiteCommandBuilder.cs.
46 47 48 49 50 51 52 53 54 55 56 57 58 59 |
if (disposed)
throw new ObjectDisposedException(typeof(SQLiteCommandBuilder).Name);
#endif
}
///////////////////////////////////////////////////////////////////////////////////////////////
protected override void Dispose(bool disposing)
{
try
{
if (!disposed)
{
//if (disposing)
|
> > > > > > |
46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 |
if (disposed)
throw new ObjectDisposedException(typeof(SQLiteCommandBuilder).Name);
#endif
}
///////////////////////////////////////////////////////////////////////////////////////////////
/// <summary>
/// Cleans up resources (native and managed) associated with the current instance.
/// </summary>
/// <param name="disposing">
/// Zero when being disposed via garbage collection; otherwise, non-zero.
/// </param>
protected override void Dispose(bool disposing)
{
try
{
if (!disposed)
{
//if (disposing)
|
Changes to System.Data.SQLite/SQLiteConnection.cs.
1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 .... 3281 3282 3283 3284 3285 3286 3287 3288 3289 3290 3291 3292 3293 3294 3295 3296 3297 3298 3299 3300 3301 3302 3303 3304 3305 3306 .... 5532 5533 5534 5535 5536 5537 5538 5539 5540 5541 5542 5543 5544 5545 |
if (disposed)
throw new ObjectDisposedException(typeof(SQLiteConnection).Name);
#endif
}
///////////////////////////////////////////////////////////////////////////////////////////////
protected override void Dispose(bool disposing)
{
#if !NET_COMPACT_20 && TRACE_WARNING
if ((_flags & SQLiteConnectionFlags.TraceWarning) == SQLiteConnectionFlags.TraceWarning)
{
if (_noDispose)
{
................................................................................
/// The size of the largest committed free block in the heap, in bytes.
/// This value will be zero unless heap compaction is enabled.
/// </param>
/// <returns>
/// A standard SQLite return code (i.e. zero for success and non-zero
/// for failure).
/// </returns>
public static SQLiteErrorCode ReleaseMemory(
int nBytes,
bool reset,
bool compact,
ref int nFree,
ref bool resetOk,
ref uint nLargest
)
{
return SQLite3.StaticReleaseMemory(
nBytes, reset, compact, ref nFree, ref resetOk, ref nLargest);
}
/// <summary>
/// Sets the status of the memory usage tracking subsystem in the SQLite core library. By default, this is enabled.
/// If this is disabled, memory usage tracking will not be performed. This is not really a per-connection value, it is
/// global to the process.
/// </summary>
/// <param name="value">Non-zero to enable memory usage tracking, zero otherwise.</param>
................................................................................
int totalPages,
bool retry
);
#endregion
///////////////////////////////////////////////////////////////////////////////////////////////
public class ProgressEventArgs : EventArgs
{
/// <summary>
/// The user-defined native data associated with this event. Currently,
/// this will always contain the value of <see cref="IntPtr.Zero" />.
/// </summary>
public readonly IntPtr UserData;
|
> > > > > > > > > > > |
1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 .... 3287 3288 3289 3290 3291 3292 3293 3294 3295 3296 3297 3298 3299 3300 3301 3302 3303 3304 3305 3306 3307 3308 3309 3310 3311 3312 3313 3314 .... 5540 5541 5542 5543 5544 5545 5546 5547 5548 5549 5550 5551 5552 5553 5554 5555 5556 |
if (disposed)
throw new ObjectDisposedException(typeof(SQLiteConnection).Name);
#endif
}
///////////////////////////////////////////////////////////////////////////////////////////////
/// <summary>
/// Cleans up resources (native and managed) associated with the current instance.
/// </summary>
/// <param name="disposing">
/// Zero when being disposed via garbage collection; otherwise, non-zero.
/// </param>
protected override void Dispose(bool disposing)
{
#if !NET_COMPACT_20 && TRACE_WARNING
if ((_flags & SQLiteConnectionFlags.TraceWarning) == SQLiteConnectionFlags.TraceWarning)
{
if (_noDispose)
{
................................................................................
/// The size of the largest committed free block in the heap, in bytes.
/// This value will be zero unless heap compaction is enabled.
/// </param>
/// <returns>
/// A standard SQLite return code (i.e. zero for success and non-zero
/// for failure).
/// </returns>
#pragma warning disable 3001
public static SQLiteErrorCode ReleaseMemory(
int nBytes,
bool reset,
bool compact,
ref int nFree,
ref bool resetOk,
ref uint nLargest
)
{
return SQLite3.StaticReleaseMemory(
nBytes, reset, compact, ref nFree, ref resetOk, ref nLargest);
}
#pragma warning restore 3001
/// <summary>
/// Sets the status of the memory usage tracking subsystem in the SQLite core library. By default, this is enabled.
/// If this is disabled, memory usage tracking will not be performed. This is not really a per-connection value, it is
/// global to the process.
/// </summary>
/// <param name="value">Non-zero to enable memory usage tracking, zero otherwise.</param>
................................................................................
int totalPages,
bool retry
);
#endregion
///////////////////////////////////////////////////////////////////////////////////////////////
/// <summary>
/// The event data associated with progress reporting events.
/// </summary>
public class ProgressEventArgs : EventArgs
{
/// <summary>
/// The user-defined native data associated with this event. Currently,
/// this will always contain the value of <see cref="IntPtr.Zero" />.
/// </summary>
public readonly IntPtr UserData;
|
Changes to System.Data.SQLite/SQLiteDataAdapter.cs.
135 136 137 138 139 140 141 142 143 144 145 146 147 148 |
if (disposed)
throw new ObjectDisposedException(typeof(SQLiteDataAdapter).Name);
#endif
}
///////////////////////////////////////////////////////////////////////////////////////////////
protected override void Dispose(bool disposing)
{
try
{
if (!disposed)
{
if (disposing)
|
> > > > > > |
135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 |
if (disposed)
throw new ObjectDisposedException(typeof(SQLiteDataAdapter).Name);
#endif
}
///////////////////////////////////////////////////////////////////////////////////////////////
/// <summary>
/// Cleans up resources (native and managed) associated with the current instance.
/// </summary>
/// <param name="disposing">
/// Zero when being disposed via garbage collection; otherwise, non-zero.
/// </param>
protected override void Dispose(bool disposing)
{
try
{
if (!disposed)
{
if (disposing)
|
Changes to System.Data.SQLite/SQLiteFactory.cs.
26
27
28
29
30
31
32
33
34
35
36
37
38
39
..
70
71
72
73
74
75
76
77
78
79
80
81
82
83
|
// been moved to the new SQLiteLog static class.
//
}
///////////////////////////////////////////////////////////////////////////////////////////////
#region IDisposable Members
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
#endregion
................................................................................
}
}
#endregion
///////////////////////////////////////////////////////////////////////////////////////////////
#region Destructor
~SQLiteFactory()
{
Dispose(false);
}
#endregion
///////////////////////////////////////////////////////////////////////////////////////////////
|
>
>
>
>
>
>
|
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
..
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
|
// been moved to the new SQLiteLog static class.
//
}
///////////////////////////////////////////////////////////////////////////////////////////////
#region IDisposable Members
/// <summary>
/// Cleans up resources (native and managed) associated with the current instance.
/// </summary>
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
#endregion
................................................................................
}
}
#endregion
///////////////////////////////////////////////////////////////////////////////////////////////
#region Destructor
/// <summary>
/// Cleans up resources associated with the current instance.
/// </summary>
~SQLiteFactory()
{
Dispose(false);
}
#endregion
///////////////////////////////////////////////////////////////////////////////////////////////
|
Changes to System.Data.SQLite/SQLiteFunction.cs.
197 198 199 200 201 202 203 204 205 206 207 208 209 210 .... 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 .... 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 .... 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 .... 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 .... 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 .... 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 |
}
}
#endregion
///////////////////////////////////////////////////////////////////////////////////////////////
#region Destructor
~SQLiteFunction()
{
Dispose(false);
}
#endregion
///////////////////////////////////////////////////////////////////////////////////////////////
................................................................................
/// </returns>
public override object Invoke(
object[] args /* in */
)
{
if (callback1 == null)
{
throw new InvalidOperationException(String.Format(
NoCallbackError, "Invoke"));
}
SQLiteInvokeDelegate invokeDelegate =
callback1 as SQLiteInvokeDelegate;
if (invokeDelegate != null)
................................................................................
object[] args, /* in */
int stepNumber, /* in */
ref object contextData /* in, out */
)
{
if (callback1 == null)
{
throw new InvalidOperationException(String.Format(
NoCallbackError, "Step"));
}
SQLiteStepDelegate stepDelegate = callback1 as SQLiteStepDelegate;
if (stepDelegate != null)
{
................................................................................
/// </returns>
public override object Final(
object contextData /* in */
)
{
if (callback2 == null)
{
throw new InvalidOperationException(String.Format(
NoCallbackError, "Final"));
}
SQLiteFinalDelegate finalDelegate = callback2 as SQLiteFinalDelegate;
if (finalDelegate != null)
{
................................................................................
public override int Compare(
string param1, /* in */
string param2 /* in */
)
{
if (callback1 == null)
{
throw new InvalidOperationException(String.Format(
NoCallbackError, "Compare"));
}
SQLiteCompareDelegate compareDelegate =
callback1 as SQLiteCompareDelegate;
if (compareDelegate != null)
................................................................................
{
object result = callback1.DynamicInvoke(GetCompareArgs(
param1, param2, false)); /* throw */
if (result is int)
return (int)result;
throw new InvalidOperationException(String.Format(
ResultInt32Error, "Compare"));
}
}
#endregion
}
/////////////////////////////////////////////////////////////////////////////
................................................................................
if (disposed)
throw new ObjectDisposedException(typeof(SQLiteFunctionEx).Name);
#endif
}
///////////////////////////////////////////////////////////////////////////////////////////////
protected override void Dispose(bool disposing)
{
try
{
if (!disposed)
{
//if (disposing)
|
> > > | > > | > > | > > | > > | > > > > > > > > |
197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 .... 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 .... 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 .... 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 .... 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 .... 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 .... 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 |
}
}
#endregion
///////////////////////////////////////////////////////////////////////////////////////////////
#region Destructor
/// <summary>
/// Cleans up resources associated with the current instance.
/// </summary>
~SQLiteFunction()
{
Dispose(false);
}
#endregion
///////////////////////////////////////////////////////////////////////////////////////////////
................................................................................
/// </returns>
public override object Invoke(
object[] args /* in */
)
{
if (callback1 == null)
{
throw new InvalidOperationException(
UnsafeNativeMethods.StringFormat(
CultureInfo.CurrentCulture,
NoCallbackError, "Invoke"));
}
SQLiteInvokeDelegate invokeDelegate =
callback1 as SQLiteInvokeDelegate;
if (invokeDelegate != null)
................................................................................
object[] args, /* in */
int stepNumber, /* in */
ref object contextData /* in, out */
)
{
if (callback1 == null)
{
throw new InvalidOperationException(
UnsafeNativeMethods.StringFormat(
CultureInfo.CurrentCulture,
NoCallbackError, "Step"));
}
SQLiteStepDelegate stepDelegate = callback1 as SQLiteStepDelegate;
if (stepDelegate != null)
{
................................................................................
/// </returns>
public override object Final(
object contextData /* in */
)
{
if (callback2 == null)
{
throw new InvalidOperationException(
UnsafeNativeMethods.StringFormat(
CultureInfo.CurrentCulture,
NoCallbackError, "Final"));
}
SQLiteFinalDelegate finalDelegate = callback2 as SQLiteFinalDelegate;
if (finalDelegate != null)
{
................................................................................
public override int Compare(
string param1, /* in */
string param2 /* in */
)
{
if (callback1 == null)
{
throw new InvalidOperationException(
UnsafeNativeMethods.StringFormat(
CultureInfo.CurrentCulture,
NoCallbackError, "Compare"));
}
SQLiteCompareDelegate compareDelegate =
callback1 as SQLiteCompareDelegate;
if (compareDelegate != null)
................................................................................
{
object result = callback1.DynamicInvoke(GetCompareArgs(
param1, param2, false)); /* throw */
if (result is int)
return (int)result;
throw new InvalidOperationException(
UnsafeNativeMethods.StringFormat(
CultureInfo.CurrentCulture,
ResultInt32Error, "Compare"));
}
}
#endregion
}
/////////////////////////////////////////////////////////////////////////////
................................................................................
if (disposed)
throw new ObjectDisposedException(typeof(SQLiteFunctionEx).Name);
#endif
}
///////////////////////////////////////////////////////////////////////////////////////////////
/// <summary>
/// Cleans up resources (native and managed) associated with the current instance.
/// </summary>
/// <param name="disposing">
/// Zero when being disposed via garbage collection; otherwise, non-zero.
/// </param>
protected override void Dispose(bool disposing)
{
try
{
if (!disposed)
{
//if (disposing)
|