Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Revise and extend compilation fixes from the previous check-in. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
9582604b8d890f5e91c5fdc502a023a8 |
| User & Date: | mistachkin 2015-08-12 19:59:47 |
Context
|
2015-08-12
| ||
| 20:15 | Enhance test suite infrastructure to make it work properly without the interop assembly. check-in: e161b486c4 user: mistachkin tags: trunk | |
| 19:59 | Revise and extend compilation fixes from the previous check-in. check-in: 9582604b8d user: mistachkin tags: trunk | |
| 17:53 | Compilation fixes for .NET Compact Framework with custom compile options. check-in: 8d08bc1cf9 user: mistachkin tags: trunk | |
Changes
Changes to System.Data.SQLite/SQLite3.cs.
1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 .... 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 .... 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 .... 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 .... 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 .... 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 |
if ((flags & SQLiteConnectionFlags.LogBind) == SQLiteConnectionFlags.LogBind)
{
LogBind(handle, index, value);
}
#if !PLATFORM_COMPACTFRAMEWORK
SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_double(handle, index, value);
#elif !SQLITE_STANDARD
SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_double_interop(handle, index, ref value);
#else
SQLiteErrorCode n = SQLiteErrorCode.Ok;
throw new NotImplementedException();
#endif
if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
}
internal override void Bind_Int32(SQLiteStatement stmt, SQLiteConnectionFlags flags, int index, int value)
{
SQLiteStatementHandle handle = stmt._sqlite_stmt;
if ((flags & SQLiteConnectionFlags.LogBind) == SQLiteConnectionFlags.LogBind)
................................................................................
#if !PLATFORM_COMPACTFRAMEWORK
if ((flags & SQLiteConnectionFlags.LogBind) == SQLiteConnectionFlags.LogBind)
{
LogBind(handle, index, value);
}
SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_int64(handle, index, value);
#elif !SQLITE_STANDARD
SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_int64_interop(handle, index, ref value);
#else
SQLiteErrorCode n = SQLiteErrorCode.Ok;
throw new NotImplementedException();
#endif
if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
}
internal override void Bind_UInt64(SQLiteStatement stmt, SQLiteConnectionFlags flags, int index, ulong value)
{
SQLiteStatementHandle handle = stmt._sqlite_stmt;
#if !PLATFORM_COMPACTFRAMEWORK
if ((flags & SQLiteConnectionFlags.LogBind) == SQLiteConnectionFlags.LogBind)
{
LogBind(handle, index, value);
}
SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_uint64(handle, index, value);
#elif !SQLITE_STANDARD
SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_uint64_interop(handle, index, ref value);
#else
SQLiteErrorCode n = SQLiteErrorCode.Ok;
throw new NotImplementedException();
#endif
if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
}
internal override void Bind_Text(SQLiteStatement stmt, SQLiteConnectionFlags flags, int index, string value)
{
SQLiteStatementHandle handle = stmt._sqlite_stmt;
#if !PLATFORM_COMPACTFRAMEWORK
................................................................................
#if !PLATFORM_COMPACTFRAMEWORK
if ((flags & SQLiteConnectionFlags.LogBind) == SQLiteConnectionFlags.LogBind)
{
LogBind(handle, index, value);
}
SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_int64(handle, index, value);
#elif !SQLITE_STANDARD
SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_int64_interop(handle, index, ref value);
#else
SQLiteErrorCode n = SQLiteErrorCode.Ok;
throw new NotImplementedException();
#endif
if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
break;
}
case SQLiteDateFormats.JulianDay:
{
double value = ToJulianDay(dt);
#if !PLATFORM_COMPACTFRAMEWORK
if ((flags & SQLiteConnectionFlags.LogBind) == SQLiteConnectionFlags.LogBind)
{
LogBind(handle, index, value);
}
SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_double(handle, index, value);
#elif !SQLITE_STANDARD
SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_double_interop(handle, index, ref value);
#else
SQLiteErrorCode n = SQLiteErrorCode.Ok;
throw new NotImplementedException();
#endif
if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
break;
}
case SQLiteDateFormats.UnixEpoch:
{
long value = Convert.ToInt64(dt.Subtract(UnixEpoch).TotalSeconds);
#if !PLATFORM_COMPACTFRAMEWORK
if ((flags & SQLiteConnectionFlags.LogBind) == SQLiteConnectionFlags.LogBind)
{
LogBind(handle, index, value);
}
SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_int64(handle, index, value);
#elif !SQLITE_STANDARD
SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_int64_interop(handle, index, ref value);
#else
SQLiteErrorCode n = SQLiteErrorCode.Ok;
throw new NotImplementedException();
#endif
if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
break;
}
default:
{
byte[] b = ToUTF8(dt);
#if !PLATFORM_COMPACTFRAMEWORK
if ((flags & SQLiteConnectionFlags.LogBind) == SQLiteConnectionFlags.LogBind)
................................................................................
notNull = (nnotNull == 1);
primaryKey = (nprimaryKey == 1);
autoIncrement = (nautoInc == 1);
}
internal override double GetDouble(SQLiteStatement stmt, int index)
{
double value;
#if !PLATFORM_COMPACTFRAMEWORK
value = UnsafeNativeMethods.sqlite3_column_double(stmt._sqlite_stmt, index);
#elif !SQLITE_STANDARD
value = 0.0;
UnsafeNativeMethods.sqlite3_column_double_interop(stmt._sqlite_stmt, index, ref value);
#else
throw new NotImplementedException();
#endif
return value;
}
internal override sbyte GetSByte(SQLiteStatement stmt, int index)
{
return unchecked((sbyte)(GetInt32(stmt, index) & byte.MaxValue));
}
................................................................................
internal override uint GetUInt32(SQLiteStatement stmt, int index)
{
return unchecked((uint)GetInt32(stmt, index));
}
internal override long GetInt64(SQLiteStatement stmt, int index)
{
long value;
#if !PLATFORM_COMPACTFRAMEWORK
value = UnsafeNativeMethods.sqlite3_column_int64(stmt._sqlite_stmt, index);
#elif !SQLITE_STANDARD
value = 0;
UnsafeNativeMethods.sqlite3_column_int64_interop(stmt._sqlite_stmt, index, ref value);
#else
throw new NotImplementedException();
#endif
return value;
}
internal override ulong GetUInt64(SQLiteStatement stmt, int index)
{
return unchecked((ulong)GetInt64(stmt, index));
}
................................................................................
}
return nCopied;
}
internal override double GetParamValueDouble(IntPtr ptr)
{
double value;
#if !PLATFORM_COMPACTFRAMEWORK
value = UnsafeNativeMethods.sqlite3_value_double(ptr);
#elif !SQLITE_STANDARD
value = 0.0;
UnsafeNativeMethods.sqlite3_value_double_interop(ptr, ref value);
#else
throw new NotImplementedException();
#endif
return value;
}
internal override int GetParamValueInt32(IntPtr ptr)
{
return UnsafeNativeMethods.sqlite3_value_int(ptr);
}
internal override long GetParamValueInt64(IntPtr ptr)
{
Int64 value;
#if !PLATFORM_COMPACTFRAMEWORK
value = UnsafeNativeMethods.sqlite3_value_int64(ptr);
#elif !SQLITE_STANDARD
value = 0;
UnsafeNativeMethods.sqlite3_value_int64_interop(ptr, ref value);
#else
throw new NotImplementedException();
#endif
return value;
}
internal override string GetParamValueText(IntPtr ptr)
{
#if !SQLITE_STANDARD
int len = 0;
return UTF8ToString(UnsafeNativeMethods.sqlite3_value_text_interop(ptr, ref len), len);
|
> > < < > > < < > > < < > > > > < < < > > > > < < < > > > > < < < < | | > < < | | > < < | | > < < | | > < |
1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 .... 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 .... 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 .... 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 .... 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 .... 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 |
if ((flags & SQLiteConnectionFlags.LogBind) == SQLiteConnectionFlags.LogBind)
{
LogBind(handle, index, value);
}
#if !PLATFORM_COMPACTFRAMEWORK
SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_double(handle, index, value);
if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
#elif !SQLITE_STANDARD
SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_double_interop(handle, index, ref value);
if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
#else
throw new NotImplementedException();
#endif
}
internal override void Bind_Int32(SQLiteStatement stmt, SQLiteConnectionFlags flags, int index, int value)
{
SQLiteStatementHandle handle = stmt._sqlite_stmt;
if ((flags & SQLiteConnectionFlags.LogBind) == SQLiteConnectionFlags.LogBind)
................................................................................
#if !PLATFORM_COMPACTFRAMEWORK
if ((flags & SQLiteConnectionFlags.LogBind) == SQLiteConnectionFlags.LogBind)
{
LogBind(handle, index, value);
}
SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_int64(handle, index, value);
if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
#elif !SQLITE_STANDARD
SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_int64_interop(handle, index, ref value);
if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
#else
throw new NotImplementedException();
#endif
}
internal override void Bind_UInt64(SQLiteStatement stmt, SQLiteConnectionFlags flags, int index, ulong value)
{
SQLiteStatementHandle handle = stmt._sqlite_stmt;
#if !PLATFORM_COMPACTFRAMEWORK
if ((flags & SQLiteConnectionFlags.LogBind) == SQLiteConnectionFlags.LogBind)
{
LogBind(handle, index, value);
}
SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_uint64(handle, index, value);
if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
#elif !SQLITE_STANDARD
SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_uint64_interop(handle, index, ref value);
if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
#else
throw new NotImplementedException();
#endif
}
internal override void Bind_Text(SQLiteStatement stmt, SQLiteConnectionFlags flags, int index, string value)
{
SQLiteStatementHandle handle = stmt._sqlite_stmt;
#if !PLATFORM_COMPACTFRAMEWORK
................................................................................
#if !PLATFORM_COMPACTFRAMEWORK
if ((flags & SQLiteConnectionFlags.LogBind) == SQLiteConnectionFlags.LogBind)
{
LogBind(handle, index, value);
}
SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_int64(handle, index, value);
if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
break;
#elif !SQLITE_STANDARD
SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_int64_interop(handle, index, ref value);
if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
break;
#else
throw new NotImplementedException();
#endif
}
case SQLiteDateFormats.JulianDay:
{
double value = ToJulianDay(dt);
#if !PLATFORM_COMPACTFRAMEWORK
if ((flags & SQLiteConnectionFlags.LogBind) == SQLiteConnectionFlags.LogBind)
{
LogBind(handle, index, value);
}
SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_double(handle, index, value);
if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
break;
#elif !SQLITE_STANDARD
SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_double_interop(handle, index, ref value);
if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
break;
#else
throw new NotImplementedException();
#endif
}
case SQLiteDateFormats.UnixEpoch:
{
long value = Convert.ToInt64(dt.Subtract(UnixEpoch).TotalSeconds);
#if !PLATFORM_COMPACTFRAMEWORK
if ((flags & SQLiteConnectionFlags.LogBind) == SQLiteConnectionFlags.LogBind)
{
LogBind(handle, index, value);
}
SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_int64(handle, index, value);
if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
break;
#elif !SQLITE_STANDARD
SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_int64_interop(handle, index, ref value);
if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
break;
#else
throw new NotImplementedException();
#endif
}
default:
{
byte[] b = ToUTF8(dt);
#if !PLATFORM_COMPACTFRAMEWORK
if ((flags & SQLiteConnectionFlags.LogBind) == SQLiteConnectionFlags.LogBind)
................................................................................
notNull = (nnotNull == 1);
primaryKey = (nprimaryKey == 1);
autoIncrement = (nautoInc == 1);
}
internal override double GetDouble(SQLiteStatement stmt, int index)
{
#if !PLATFORM_COMPACTFRAMEWORK
return UnsafeNativeMethods.sqlite3_column_double(stmt._sqlite_stmt, index);
#elif !SQLITE_STANDARD
double value = 0.0;
UnsafeNativeMethods.sqlite3_column_double_interop(stmt._sqlite_stmt, index, ref value);
return value;
#else
throw new NotImplementedException();
#endif
}
internal override sbyte GetSByte(SQLiteStatement stmt, int index)
{
return unchecked((sbyte)(GetInt32(stmt, index) & byte.MaxValue));
}
................................................................................
internal override uint GetUInt32(SQLiteStatement stmt, int index)
{
return unchecked((uint)GetInt32(stmt, index));
}
internal override long GetInt64(SQLiteStatement stmt, int index)
{
#if !PLATFORM_COMPACTFRAMEWORK
return UnsafeNativeMethods.sqlite3_column_int64(stmt._sqlite_stmt, index);
#elif !SQLITE_STANDARD
long value = 0;
UnsafeNativeMethods.sqlite3_column_int64_interop(stmt._sqlite_stmt, index, ref value);
return value;
#else
throw new NotImplementedException();
#endif
}
internal override ulong GetUInt64(SQLiteStatement stmt, int index)
{
return unchecked((ulong)GetInt64(stmt, index));
}
................................................................................
}
return nCopied;
}
internal override double GetParamValueDouble(IntPtr ptr)
{
#if !PLATFORM_COMPACTFRAMEWORK
return UnsafeNativeMethods.sqlite3_value_double(ptr);
#elif !SQLITE_STANDARD
double value = 0.0;
UnsafeNativeMethods.sqlite3_value_double_interop(ptr, ref value);
return value;
#else
throw new NotImplementedException();
#endif
}
internal override int GetParamValueInt32(IntPtr ptr)
{
return UnsafeNativeMethods.sqlite3_value_int(ptr);
}
internal override long GetParamValueInt64(IntPtr ptr)
{
#if !PLATFORM_COMPACTFRAMEWORK
return UnsafeNativeMethods.sqlite3_value_int64(ptr);
#elif !SQLITE_STANDARD
Int64 value = 0;
UnsafeNativeMethods.sqlite3_value_int64_interop(ptr, ref value);
return value;
#else
throw new NotImplementedException();
#endif
}
internal override string GetParamValueText(IntPtr ptr)
{
#if !SQLITE_STANDARD
int len = 0;
return UTF8ToString(UnsafeNativeMethods.sqlite3_value_text_interop(ptr, ref len), len);
|
Changes to System.Data.SQLite/SQLiteBase.cs.
947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 ... 977 978 979 980 981 982 983 984 985 986 987 988 989 990 .... 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 |
/// <summary>
/// Prevent this <see cref="SQLiteConnection" /> object instance from
/// loading extensions.
/// </summary>
NoLoadExtension = 0x200,
/// <summary>
/// Prevent this <see cref="SQLiteConnection" /> object instance from
/// creating virtual table modules.
/// </summary>
NoCreateModule = 0x400,
/// <summary>
/// Skip binding any functions provided by other managed assemblies when
/// opening the connection.
/// </summary>
NoBindFunctions = 0x800,
/// <summary>
/// Skip setting the logging related properties of the
/// <see cref="SQLiteModule" /> object instance that was passed to
/// the <see cref="SQLiteConnection.CreateModule" /> method.
/// </summary>
NoLogModule = 0x1000,
................................................................................
LogModuleError = 0x2000,
/// <summary>
/// Enable logging of certain virtual table module exceptions that cannot
/// be easily discovered via other means.
/// </summary>
LogModuleException = 0x4000,
/// <summary>
/// Enable tracing of potentially important [non-fatal] error conditions
/// that cannot be easily reported through other means.
/// </summary>
TraceWarning = 0x8000,
................................................................................
/// </summary>
ConvertAndBindAndGetAllAsInvariantText = BindAndGetAllAsText |
ConvertAndBindInvariantText,
/// <summary>
/// Enable all logging.
/// </summary>
LogAll = LogPrepare | LogPreBind | LogBind |
LogCallbackException | LogBackup | LogModuleError |
LogModuleException,
/// <summary>
/// The default extra flags for new connections.
/// </summary>
Default = LogCallbackException | LogModuleException,
/// <summary>
/// The default extra flags for new connections with all logging enabled.
/// </summary>
DefaultAndLogAll = Default | LogAll
}
|
> > > > > > > > > > > > > |
947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 ... 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 .... 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 |
/// <summary>
/// Prevent this <see cref="SQLiteConnection" /> object instance from
/// loading extensions.
/// </summary>
NoLoadExtension = 0x200,
#if INTEROP_VIRTUAL_TABLE
/// <summary>
/// Prevent this <see cref="SQLiteConnection" /> object instance from
/// creating virtual table modules.
/// </summary>
NoCreateModule = 0x400,
#endif
/// <summary>
/// Skip binding any functions provided by other managed assemblies when
/// opening the connection.
/// </summary>
NoBindFunctions = 0x800,
#if INTEROP_VIRTUAL_TABLE
/// <summary>
/// Skip setting the logging related properties of the
/// <see cref="SQLiteModule" /> object instance that was passed to
/// the <see cref="SQLiteConnection.CreateModule" /> method.
/// </summary>
NoLogModule = 0x1000,
................................................................................
LogModuleError = 0x2000,
/// <summary>
/// Enable logging of certain virtual table module exceptions that cannot
/// be easily discovered via other means.
/// </summary>
LogModuleException = 0x4000,
#endif
/// <summary>
/// Enable tracing of potentially important [non-fatal] error conditions
/// that cannot be easily reported through other means.
/// </summary>
TraceWarning = 0x8000,
................................................................................
/// </summary>
ConvertAndBindAndGetAllAsInvariantText = BindAndGetAllAsText |
ConvertAndBindInvariantText,
/// <summary>
/// Enable all logging.
/// </summary>
#if INTEROP_VIRTUAL_TABLE
LogAll = LogPrepare | LogPreBind | LogBind |
LogCallbackException | LogBackup | LogModuleError |
LogModuleException,
#else
LogAll = LogPrepare | LogPreBind | LogBind |
LogCallbackException | LogBackup,
#endif
/// <summary>
/// The default extra flags for new connections.
/// </summary>
#if INTEROP_VIRTUAL_TABLE
Default = LogCallbackException | LogModuleException,
#else
Default = LogCallbackException,
#endif
/// <summary>
/// The default extra flags for new connections with all logging enabled.
/// </summary>
DefaultAndLogAll = Default | LogAll
}
|
Changes to System.Data.SQLite/SQLiteConnection.cs.
803
804
805
806
807
808
809
810
811
812
813
814
815
816
...
832
833
834
835
836
837
838
839
840
841
842
843
844
845
|
/// <param name="connectionString">The connection string to use.</param>
public SQLiteConnection(string connectionString)
: this(connectionString, false)
{
// do nothing.
}
/// <summary>
/// Initializes the connection with a pre-existing native connection handle.
/// This constructor overload is intended to be used only by the private
/// <see cref="SQLiteModule.CreateOrConnect" /> method.
/// </summary>
/// <param name="db">
/// The native connection handle to use.
................................................................................
_flags = SQLiteConnectionFlags.None;
_connectionState = (db != IntPtr.Zero) ?
ConnectionState.Open : ConnectionState.Closed;
_connectionString = null; /* unknown */
}
/// <summary>
/// Initializes the connection with the specified connection string.
/// </summary>
/// <param name="connectionString">
/// The connection string to use.
/// </param>
|
>
>
|
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
...
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
|
/// <param name="connectionString">The connection string to use.</param>
public SQLiteConnection(string connectionString)
: this(connectionString, false)
{
// do nothing.
}
#if INTEROP_VIRTUAL_TABLE
/// <summary>
/// Initializes the connection with a pre-existing native connection handle.
/// This constructor overload is intended to be used only by the private
/// <see cref="SQLiteModule.CreateOrConnect" /> method.
/// </summary>
/// <param name="db">
/// The native connection handle to use.
................................................................................
_flags = SQLiteConnectionFlags.None;
_connectionState = (db != IntPtr.Zero) ?
ConnectionState.Open : ConnectionState.Closed;
_connectionString = null; /* unknown */
}
#endif
/// <summary>
/// Initializes the connection with the specified connection string.
/// </summary>
/// <param name="connectionString">
/// The connection string to use.
/// </param>
|
Changes to testce/TestCases.cs.
288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 .... 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 .... 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 |
try { UserCollation(cnn); frm.WriteLine("SUCCESS - UserCollation"); passed++; }
catch (Exception) { frm.WriteLine("FAIL - UserCollation"); failed++; }
total++;
try { Int64Properties(cnn); frm.WriteLine("SUCCESS - Int64Properties"); passed++; }
catch (Exception) { frm.WriteLine("FAIL - Int64Properties"); failed++; }
total++;
try { ManagedVirtualTable(cnn); frm.WriteLine("SUCCESS - ManagedVirtualTable"); passed++; }
catch (Exception) { frm.WriteLine("FAIL - ManagedVirtualTable"); failed++; }
total++;
try { MultipleThreadStress(cnn); frm.WriteLine("SUCCESS - MultipleThreadStress"); passed++; }
catch (Exception) { frm.WriteLine("FAIL - MultipleThreadStress"); failed++; }
total++;
try { SimpleRTree(cnn); frm.WriteLine("SUCCESS - SimpleRTree"); passed++; }
................................................................................
return;
}
throw new NotSupportedException("not a SQLite connection");
}
// Make sure that managed virtual table support works on the .NET Compact Framework.
internal void ManagedVirtualTable(DbConnection cnn)
{
SQLiteConnection cnn2 = cnn as SQLiteConnection;
if (cnn2 != null)
{
................................................................................
}
return;
}
throw new NotSupportedException("not a SQLite connection");
}
private int nextId = 0;
private const int MAX_THREADS = 3;
private const int MAX_ITERATIONS = 100;
private ManualResetEvent goEvent = new ManualResetEvent(false);
private static int GetThreadId()
|
> > > > |
288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 .... 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 .... 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 |
try { UserCollation(cnn); frm.WriteLine("SUCCESS - UserCollation"); passed++; }
catch (Exception) { frm.WriteLine("FAIL - UserCollation"); failed++; }
total++;
try { Int64Properties(cnn); frm.WriteLine("SUCCESS - Int64Properties"); passed++; }
catch (Exception) { frm.WriteLine("FAIL - Int64Properties"); failed++; }
#if INTEROP_VIRTUAL_TABLE
total++;
try { ManagedVirtualTable(cnn); frm.WriteLine("SUCCESS - ManagedVirtualTable"); passed++; }
catch (Exception) { frm.WriteLine("FAIL - ManagedVirtualTable"); failed++; }
#endif
total++;
try { MultipleThreadStress(cnn); frm.WriteLine("SUCCESS - MultipleThreadStress"); passed++; }
catch (Exception) { frm.WriteLine("FAIL - MultipleThreadStress"); failed++; }
total++;
try { SimpleRTree(cnn); frm.WriteLine("SUCCESS - SimpleRTree"); passed++; }
................................................................................
return;
}
throw new NotSupportedException("not a SQLite connection");
}
#if INTEROP_VIRTUAL_TABLE
// Make sure that managed virtual table support works on the .NET Compact Framework.
internal void ManagedVirtualTable(DbConnection cnn)
{
SQLiteConnection cnn2 = cnn as SQLiteConnection;
if (cnn2 != null)
{
................................................................................
}
return;
}
throw new NotSupportedException("not a SQLite connection");
}
#endif
private int nextId = 0;
private const int MAX_THREADS = 3;
private const int MAX_ITERATIONS = 100;
private ManualResetEvent goEvent = new ManualResetEvent(false);
private static int GetThreadId()
|
Changes to testce/testce.2005.csproj.
101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 |
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\System.Data.SQLite\System.Data.SQLite.Compact.2005.csproj">
<Project>{AC139951-261A-4463-B6FA-AEBC25283A66}</Project>
<Name>System.Data.SQLite.Compact.2005</Name>
</ProjectReference>
</ItemGroup>
<Import Condition="'$(TargetFrameworkVersion)' == 'v1.0'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.v1.targets" />
<Import Condition="'$(TargetFrameworkVersion)' == 'v2.0'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
<Import Condition="'$(TargetFrameworkVersion)' == 'v3.5'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}">
<HostingProcess disable="1" />
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
</Project>
|
> |
101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 |
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\System.Data.SQLite\System.Data.SQLite.Compact.2005.csproj">
<Project>{AC139951-261A-4463-B6FA-AEBC25283A66}</Project>
<Name>System.Data.SQLite.Compact.2005</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(SQLiteNetDir)\System.Data.SQLite\Targets\System.Data.SQLite.Properties.targets" />
<Import Condition="'$(TargetFrameworkVersion)' == 'v1.0'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.v1.targets" />
<Import Condition="'$(TargetFrameworkVersion)' == 'v2.0'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
<Import Condition="'$(TargetFrameworkVersion)' == 'v3.5'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}">
<HostingProcess disable="1" />
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
</Project>
|
Changes to testce/testce.2008.csproj.
102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 |
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\System.Data.SQLite\System.Data.SQLite.Compact.2008.csproj">
<Project>{AC139951-261A-4463-B6FA-AEBC25283A66}</Project>
<Name>System.Data.SQLite.Compact.2008</Name>
</ProjectReference>
</ItemGroup>
<Import Condition="'$(TargetFrameworkVersion)' == 'v1.0'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.v1.targets" />
<Import Condition="'$(TargetFrameworkVersion)' == 'v2.0'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
<Import Condition="'$(TargetFrameworkVersion)' == 'v3.5'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}">
<HostingProcess disable="1" />
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
</Project>
|
> |
102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 |
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\System.Data.SQLite\System.Data.SQLite.Compact.2008.csproj">
<Project>{AC139951-261A-4463-B6FA-AEBC25283A66}</Project>
<Name>System.Data.SQLite.Compact.2008</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(SQLiteNetDir)\System.Data.SQLite\Targets\System.Data.SQLite.Properties.targets" />
<Import Condition="'$(TargetFrameworkVersion)' == 'v1.0'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.v1.targets" />
<Import Condition="'$(TargetFrameworkVersion)' == 'v2.0'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
<Import Condition="'$(TargetFrameworkVersion)' == 'v3.5'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}">
<HostingProcess disable="1" />
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
</Project>
|
Changes to testce/testce.2012.csproj.
86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 |
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\System.Data.SQLite\System.Data.SQLite.Compact.2012.csproj">
<Project>{AC139951-261A-4463-B6FA-AEBC25283A66}</Project>
<Name>System.Data.SQLite.Compact.2012</Name>
</ProjectReference>
</ItemGroup>
<Import Condition="'$(TargetFrameworkVersion)' == 'v1.0'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.v1.targets" />
<Import Condition="'$(TargetFrameworkVersion)' == 'v2.0'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
<Import Condition="'$(TargetFrameworkVersion)' == 'v3.5'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\v8.0\Microsoft.$(TargetFrameworkIdentifier).CSharp.targets" />
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{fae04ec0-301f-11d3-bf4b-00c04f79efbc}">
<HostingProcess disable="1" />
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
</Project>
|
> |
86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 |
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\System.Data.SQLite\System.Data.SQLite.Compact.2012.csproj">
<Project>{AC139951-261A-4463-B6FA-AEBC25283A66}</Project>
<Name>System.Data.SQLite.Compact.2012</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(SQLiteNetDir)\System.Data.SQLite\Targets\System.Data.SQLite.Properties.targets" />
<Import Condition="'$(TargetFrameworkVersion)' == 'v1.0'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.v1.targets" />
<Import Condition="'$(TargetFrameworkVersion)' == 'v2.0'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
<Import Condition="'$(TargetFrameworkVersion)' == 'v3.5'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\v8.0\Microsoft.$(TargetFrameworkIdentifier).CSharp.targets" />
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{fae04ec0-301f-11d3-bf4b-00c04f79efbc}">
<HostingProcess disable="1" />
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
</Project>
|
Changes to testlinq/Program.cs.
90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 ... 364 365 366 367 368 369 370 371 372 373 374 375 376 377 ... 434 435 436 437 438 439 440 441 442 443 444 445 446 447 ... 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 |
return SkipTest(pageSize);
}
case "substring":
{
return SubStringTest();
}
case "unionall":
{
return UnionAllTest();
}
case "endswith":
{
string value = null;
if (args.Length > 1)
{
value = args[1];
................................................................................
once = true;
}
}
return 0;
}
//
// NOTE: Used to test the fix for ticket [0a32885109].
//
private static int UnionAllTest()
{
using (northwindEFEntities db = new northwindEFEntities())
{
................................................................................
Console.Write(customer.CustomerID);
once = true;
}
}
return 0;
}
//
// NOTE: Used to test the fix for ticket [ccfa69fc32].
//
private static int EFTransactionTest(bool add)
{
//
................................................................................
//
// NOTE: Used to test the INSERT fix (i.e. an extra semi-colon in
// the SQL statement after the actual INSERT statement in
// the follow-up SELECT statement).
//
private static int InsertTest()
{
long[] orderIds = new long[] {
0
};
using (northwindEFEntities db = new northwindEFEntities())
{
int[] counts = { 0 };
//
// NOTE: *REQUIRED* This is required so that the
// Entity Framework is prevented from opening
|
> > > > < < < < |
90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 ... 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 ... 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 ... 559 560 561 562 563 564 565 566 567 568 569 570 571 572 |
return SkipTest(pageSize);
}
case "substring":
{
return SubStringTest();
}
#if USE_INTEROP_DLL && INTEROP_EXTENSION_FUNCTIONS
case "unionall":
{
return UnionAllTest();
}
#endif
case "endswith":
{
string value = null;
if (args.Length > 1)
{
value = args[1];
................................................................................
once = true;
}
}
return 0;
}
#if USE_INTEROP_DLL && INTEROP_EXTENSION_FUNCTIONS
//
// NOTE: Used to test the fix for ticket [0a32885109].
//
private static int UnionAllTest()
{
using (northwindEFEntities db = new northwindEFEntities())
{
................................................................................
Console.Write(customer.CustomerID);
once = true;
}
}
return 0;
}
#endif
//
// NOTE: Used to test the fix for ticket [ccfa69fc32].
//
private static int EFTransactionTest(bool add)
{
//
................................................................................
//
// NOTE: Used to test the INSERT fix (i.e. an extra semi-colon in
// the SQL statement after the actual INSERT statement in
// the follow-up SELECT statement).
//
private static int InsertTest()
{
using (northwindEFEntities db = new northwindEFEntities())
{
int[] counts = { 0 };
//
// NOTE: *REQUIRED* This is required so that the
// Entity Framework is prevented from opening
|