Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Remove unused IsPatchSet property from the ISQLiteChangeSet interface. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | sessions |
| Files: | files | file ages | folders |
| SHA1: |
54ac954062a44a5992940045db0a4849 |
| User & Date: | mistachkin 2017-10-06 16:08:52.044 |
Context
|
2017-10-06
| ||
| 17:39 | Introduce some private abstract base classes to isolate the differences between memory and stream enumeration. check-in: 04332df7d6 user: mistachkin tags: sessions | |
| 16:08 | Remove unused IsPatchSet property from the ISQLiteChangeSet interface. check-in: 54ac954062 user: mistachkin tags: sessions | |
| 16:04 | Further work on the SQLiteStreamChangeSet class. check-in: b1e6a036bb user: mistachkin tags: sessions | |
Changes
Changes to System.Data.SQLite/SQLiteConnection.cs.
| ︙ | ︙ | |||
3039 3040 3041 3042 3043 3044 3045 |
/// </returns>
public ISQLiteChangeSet CreateChangeSet(
byte[] rawData
)
{
CheckDisposed();
| | < | 3039 3040 3041 3042 3043 3044 3045 3046 3047 3048 3049 3050 3051 3052 3053 |
/// </returns>
public ISQLiteChangeSet CreateChangeSet(
byte[] rawData
)
{
CheckDisposed();
return new SQLiteMemoryChangeSet(rawData, GetNativeHandle(this), _flags);
}
/// <summary>
/// Attempts to create a new <see cref="ISQLiteChangeSet" /> object instance
/// using this connection and the specified stream.
/// </summary>
/// <param name="inputStream">
|
| ︙ | ︙ | |||
3066 3067 3068 3069 3070 3071 3072 |
Stream inputStream,
Stream outputStream
)
{
CheckDisposed();
return new SQLiteStreamChangeSet(
| | | 3065 3066 3067 3068 3069 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 |
Stream inputStream,
Stream outputStream
)
{
CheckDisposed();
return new SQLiteStreamChangeSet(
inputStream, outputStream, GetNativeHandle(this), _flags);
}
#endif
/// <summary>
/// Returns the data source file name without extension or path.
/// </summary>
#if !PLATFORM_COMPACTFRAMEWORK
|
| ︙ | ︙ |
Changes to System.Data.SQLite/SQLiteSessions.cs.
| ︙ | ︙ | |||
51 52 53 54 55 56 57 |
#endregion
///////////////////////////////////////////////////////////////////////////
#region Session Extension Interfaces
public interface ISQLiteChangeSet
{
| < < | 51 52 53 54 55 56 57 58 59 60 61 62 63 64 |
#endregion
///////////////////////////////////////////////////////////////////////////
#region Session Extension Interfaces
public interface ISQLiteChangeSet
{
ISQLiteChangeSet Invert();
ISQLiteChangeSet CombineWith(ISQLiteChangeSet changeSet);
void Apply(
SessionConflictCallback conflictCallback,
object clientData
);
|
| ︙ | ︙ | |||
932 933 934 935 936 937 938 |
ISQLiteChangeSet, IEnumerable<ISQLiteChangeSetMetadataItem>,
IDisposable
{
#region Private Data
private byte[] rawData;
private SQLiteConnectionHandle handle;
private SQLiteConnectionFlags flags;
| < | < < < < < < < < < | 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 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 |
ISQLiteChangeSet, IEnumerable<ISQLiteChangeSetMetadataItem>,
IDisposable
{
#region Private Data
private byte[] rawData;
private SQLiteConnectionHandle handle;
private SQLiteConnectionFlags flags;
#endregion
///////////////////////////////////////////////////////////////////////
#region Private Constructors
internal SQLiteMemoryChangeSet(
byte[] rawData,
SQLiteConnectionHandle handle,
SQLiteConnectionFlags flags
)
{
this.rawData = rawData;
this.handle= handle;
this.flags = flags;
}
#endregion
///////////////////////////////////////////////////////////////////////
#region Private Methods
private void CheckRawData()
{
if (rawData == null)
throw new InvalidOperationException("no change set data");
}
#endregion
///////////////////////////////////////////////////////////////////////
#region ISQLiteChangeSet Members
public ISQLiteChangeSet Invert()
{
CheckDisposed();
CheckRawData();
IntPtr pInData = IntPtr.Zero;
IntPtr pOutData = IntPtr.Zero;
|
| ︙ | ︙ | |||
996 997 998 999 1000 1001 1002 |
nInData, pInData, ref nOutData, ref pOutData);
if (rc != SQLiteErrorCode.Ok)
throw new SQLiteException(rc, "sqlite3changeset_invert");
byte[] newData = SQLiteBytes.FromIntPtr(pOutData, nOutData);
| | < | 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 |
nInData, pInData, ref nOutData, ref pOutData);
if (rc != SQLiteErrorCode.Ok)
throw new SQLiteException(rc, "sqlite3changeset_invert");
byte[] newData = SQLiteBytes.FromIntPtr(pOutData, nOutData);
return new SQLiteMemoryChangeSet(newData, handle, flags);
}
finally
{
if (pOutData != IntPtr.Zero)
{
SQLiteMemory.Free(pOutData);
pOutData = IntPtr.Zero;
|
| ︙ | ︙ | |||
1061 1062 1063 1064 1065 1066 1067 |
ref pOutData);
if (rc != SQLiteErrorCode.Ok)
throw new SQLiteException(rc, "sqlite3changeset_concat");
byte[] newData = SQLiteBytes.FromIntPtr(pOutData, nOutData);
| | < | 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 |
ref pOutData);
if (rc != SQLiteErrorCode.Ok)
throw new SQLiteException(rc, "sqlite3changeset_concat");
byte[] newData = SQLiteBytes.FromIntPtr(pOutData, nOutData);
return new SQLiteMemoryChangeSet(newData, handle, flags);
}
finally
{
if (pOutData != IntPtr.Zero)
{
SQLiteMemory.Free(pOutData);
pOutData = IntPtr.Zero;
|
| ︙ | ︙ | |||
1308 1309 1310 1311 1312 1313 1314 |
IDisposable
{
#region Private Data
private Stream inputStream;
private Stream outputStream;
private SQLiteConnectionHandle handle;
private SQLiteConnectionFlags flags;
| < | < < | 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 |
IDisposable
{
#region Private Data
private Stream inputStream;
private Stream outputStream;
private SQLiteConnectionHandle handle;
private SQLiteConnectionFlags flags;
#endregion
///////////////////////////////////////////////////////////////////////
#region Private Constructors
internal SQLiteStreamChangeSet(
Stream inputStream,
Stream outputStream,
SQLiteConnectionHandle handle,
SQLiteConnectionFlags flags
)
{
this.inputStream = inputStream;
this.outputStream = outputStream;
this.handle = handle;
this.flags = flags;
}
#endregion
///////////////////////////////////////////////////////////////////////
#region Private Methods
private void CheckInputStream()
|
| ︙ | ︙ | |||
1357 1358 1359 1360 1361 1362 1363 |
}
}
#endregion
///////////////////////////////////////////////////////////////////////
#region ISQLiteChangeSet Members
| < < < < < < < | 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 |
}
}
#endregion
///////////////////////////////////////////////////////////////////////
#region ISQLiteChangeSet Members
public ISQLiteChangeSet Invert()
{
CheckDisposed();
CheckInputStream();
CheckOutputStream();
SQLiteErrorCode rc = UnsafeNativeMethods.sqlite3changeset_invert_strm(
|
| ︙ | ︙ |