Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Coding style and comment tweaks. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
5c8e02eb62da9e8a37e01bba2d2bd045 |
User & Date: | mistachkin 2015-08-15 17:08:26.228 |
Context
2015-08-15
| ||
22:00 | Enhance the 'isBuildAvailable' routine in the test suite infrastructure to support architecture names in addition to platform names. check-in: 66139faca2 user: mistachkin tags: trunk | |
17:12 | Merge updates from trunk. check-in: d1fe039ff7 user: mistachkin tags: delegateFunction | |
17:08 | Coding style and comment tweaks. check-in: 5c8e02eb62 user: mistachkin tags: trunk | |
17:08 | Compilation fixes for the debug build. check-in: 8195809af1 user: mistachkin tags: trunk | |
Changes
Changes to System.Data.SQLite/SQLiteConnection.cs.
︙ | ︙ | |||
1388 1389 1390 1391 1392 1393 1394 | /////////////////////////////////////////////////////////////////////////////////////////////// /// <summary> /// Attempts to bind the specified <see cref="SQLiteFunction" /> object /// instance to this connection. /// </summary> /// <param name="functionAttribute"> | | | | 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 | /////////////////////////////////////////////////////////////////////////////////////////////// /// <summary> /// Attempts to bind the specified <see cref="SQLiteFunction" /> object /// instance to this connection. /// </summary> /// <param name="functionAttribute"> /// The <see cref="SQLiteFunctionAttribute" /> object instance containing /// the metadata for the function to be bound. /// </param> /// <param name="function"> /// The <see cref="SQLiteFunction" /> object instance that implements the /// function to be bound. /// </param> public void BindFunction( SQLiteFunctionAttribute functionAttribute, SQLiteFunction function ) { |
︙ | ︙ | |||
1416 1417 1418 1419 1420 1421 1422 | /////////////////////////////////////////////////////////////////////////////////////////////// /// <summary> /// Attempts to unbind the specified <see cref="SQLiteFunction" /> object /// instance to this connection. /// </summary> /// <param name="functionAttribute"> | | | 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 | /////////////////////////////////////////////////////////////////////////////////////////////// /// <summary> /// Attempts to unbind the specified <see cref="SQLiteFunction" /> object /// instance to this connection. /// </summary> /// <param name="functionAttribute"> /// The <see cref="SQLiteFunctionAttribute" /> object instance containing /// the metadata for the function to be unbound. /// </param> /// <returns>Non-zero if the function was unbound.</returns> public bool UnbindFunction( SQLiteFunctionAttribute functionAttribute ) { |
︙ | ︙ |
Changes to System.Data.SQLite/SQLiteFunction.cs.
︙ | ︙ | |||
63 64 65 66 67 68 69 | /// </summary> private SQLiteCallback _StepFunc; /// <summary> /// Holds a reference to the callback function for finalizing an aggregate function /// </summary> private SQLiteFinalCallback _FinalFunc; /// <summary> | | | 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | /// </summary> private SQLiteCallback _StepFunc; /// <summary> /// Holds a reference to the callback function for finalizing an aggregate function /// </summary> private SQLiteFinalCallback _FinalFunc; /// <summary> /// Holds a reference to the callback function for collating sequences /// </summary> private SQLiteCollation _CompareFunc; private SQLiteCollation _CompareFunc16; /// <summary> /// Current context of the current callback. Only valid during a callback |
︙ | ︙ | |||
273 274 275 276 277 278 279 | public virtual object Final(object contextData) { CheckDisposed(); return null; } /// <summary> | | | | | | 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 | public virtual object Final(object contextData) { CheckDisposed(); return null; } /// <summary> /// User-defined collating sequences override this method to provide a custom string sorting algorithm. /// </summary> /// <param name="param1">The first string to compare.</param> /// <param name="param2">The second strnig to compare.</param> /// <returns>1 if param1 is greater than param2, 0 if they are equal, or -1 if param1 is less than param2.</returns> public virtual int Compare(string param1, string param2) { CheckDisposed(); return 0; } /// <summary> |
︙ | ︙ | |||
426 427 428 429 430 431 432 | { // do nothing. } } } /// <summary> | | | 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 | { // do nothing. } } } /// <summary> /// Internal collating sequence function, which wraps up the raw string pointers and executes the Compare() virtual function. /// WARNING: Must not throw exceptions. /// </summary> /// <param name="ptr">Not used</param> /// <param name="len1">Length of the string pv1</param> /// <param name="ptr1">Pointer to the first string to compare</param> /// <param name="len2">Length of the string pv2</param> /// <param name="ptr2">Pointer to the second string to compare</param> |
︙ | ︙ | |||
473 474 475 476 477 478 479 | if ((_base != null) && _base.IsOpen()) _base.Cancel(); return 0; } /// <summary> | | | 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 | if ((_base != null) && _base.IsOpen()) _base.Cancel(); return 0; } /// <summary> /// Internal collating sequence function, which wraps up the raw string pointers and executes the Compare() virtual function. /// WARNING: Must not throw exceptions. /// </summary> /// <param name="ptr">Not used</param> /// <param name="len1">Length of the string pv1</param> /// <param name="ptr1">Pointer to the first string to compare</param> /// <param name="len2">Length of the string pv2</param> /// <param name="ptr2">Pointer to the second string to compare</param> |
︙ | ︙ | |||
724 725 726 727 728 729 730 | /// <summary> /// Manual method of registering a function. The type must still have the SQLiteFunctionAttributes in order to work /// properly, but this is a workaround for the Compact Framework where enumerating assemblies is not currently supported. /// </summary> /// <param name="typ">The type of the function to register</param> public static void RegisterFunction(Type typ) { | | < | | | | > | > | | | < | 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 | /// <summary> /// Manual method of registering a function. The type must still have the SQLiteFunctionAttributes in order to work /// properly, but this is a workaround for the Compact Framework where enumerating assemblies is not currently supported. /// </summary> /// <param name="typ">The type of the function to register</param> public static void RegisterFunction(Type typ) { object[] arAtt = typ.GetCustomAttributes( typeof(SQLiteFunctionAttribute), false); for (int y = 0; y < arAtt.Length; y++) { SQLiteFunctionAttribute at = arAtt[y] as SQLiteFunctionAttribute; if (at == null) continue; at.InstanceType = typ; _registeredFunctions.Add(at, null); } } /// <summary> /// Called by the SQLiteBase derived classes, this method binds all registered (known) user-defined functions to a connection. /// It is done this way so that all user-defined functions will access the database using the same encoding scheme /// as the connection (UTF-8 or UTF-16). /// </summary> |
︙ | ︙ | |||
857 858 859 860 861 862 863 | } } return result; } /// <summary> | | | 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 | } } return result; } /// <summary> /// This function binds a user-defined function to a connection. /// </summary> /// <param name="sqliteBase"> /// The <see cref="SQLiteBase" /> object instance associated with the /// <see cref="SQLiteConnection" /> that the function should be bound to. /// </param> /// <param name="functionAttribute"> /// The <see cref="SQLiteFunctionAttribute"/> object instance containing |
︙ | ︙ | |||
1063 1064 1065 1066 1067 1068 1069 | Scalar = 0, /// <summary> /// Aggregate functions are designed to accumulate data until the end of a call and then return a result gleaned from the accumulated data. /// Examples include SUM(), COUNT(), AVG(), etc. /// </summary> Aggregate = 1, /// <summary> | | | 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 | Scalar = 0, /// <summary> /// Aggregate functions are designed to accumulate data until the end of a call and then return a result gleaned from the accumulated data. /// Examples include SUM(), COUNT(), AVG(), etc. /// </summary> Aggregate = 1, /// <summary> /// Collating sequences are used to sort textual data in a custom manner, and appear in an ORDER BY clause. Typically text in an ORDER BY is /// sorted using a straight case-insensitive comparison function. Custom collating sequences can be used to alter the behavior of text sorting /// in a user-defined manner. /// </summary> Collation = 2, } /// <summary> |
︙ | ︙ | |||
1089 1090 1091 1092 1093 1094 1095 | /// </summary> /// <param name="context">Raw context pointer for the user function</param> #if !PLATFORM_COMPACTFRAMEWORK [UnmanagedFunctionPointer(CallingConvention.Cdecl)] #endif internal delegate void SQLiteFinalCallback(IntPtr context); /// <summary> | | | 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 | /// </summary> /// <param name="context">Raw context pointer for the user function</param> #if !PLATFORM_COMPACTFRAMEWORK [UnmanagedFunctionPointer(CallingConvention.Cdecl)] #endif internal delegate void SQLiteFinalCallback(IntPtr context); /// <summary> /// Internal callback delegate for implementing collating sequences /// </summary> /// <param name="puser">Not used</param> /// <param name="len1">Length of the string pv1</param> /// <param name="pv1">Pointer to the first string to compare</param> /// <param name="len2">Length of the string pv2</param> /// <param name="pv2">Pointer to the second string to compare</param> /// <returns>Returns -1 if the first string is less than the second. 0 if they are equal, or 1 if the first string is greater |
︙ | ︙ |
Changes to System.Data.SQLite/SQLiteFunctionAttribute.cs.
1 2 3 | /******************************************************** * ADO.NET 2.0 Data Provider for SQLite Version 3.X * Written by Robert Simpson (robert@blackcastlesoft.com) | | | 1 2 3 4 5 6 7 8 9 10 11 | /******************************************************** * ADO.NET 2.0 Data Provider for SQLite Version 3.X * Written by Robert Simpson (robert@blackcastlesoft.com) * * Released to the public domain, use at your own risk! ********************************************************/ namespace System.Data.SQLite { using System; |
︙ | ︙ |