System.Data.SQLite
Check-in [605ba3f2e2]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Enhance new vtab test. Style and naming tweaks.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | vtabFixes
Files: files | file ages | folders
SHA1: 605ba3f2e20341ca6078bb8e1c6ecb7b284e1075
User & Date: mistachkin 2015-12-04 20:05:56
Context
2015-12-04
20:23
Update version history docs. Closed-Leaf check-in: 8408226315 user: mistachkin tags: vtabFixes
20:05
Enhance new vtab test. Style and naming tweaks. check-in: 605ba3f2e2 user: mistachkin tags: vtabFixes
06:35
Move test-only private methods to their own region within the SQLiteIndex class. check-in: 99625b3b90 user: mistachkin tags: vtabFixes
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to System.Data.SQLite/SQLiteModule.cs.

1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
....
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
        /// structure is stored here.
        /// </param>
        /// <param name="sizeOfConstraintUsageType">
        /// The size of the native
        /// <see cref="UnsafeNativeMethods.sqlite3_index_constraint_usage" />
        /// structure is stored here.
        /// </param>
        private static void SizeOf(
            out int sizeOfInfoType,
            out int sizeOfConstraintType,
            out int sizeOfOrderByType,
            out int sizeOfConstraintUsageType
            )
        {
            sizeOfInfoType = Marshal.SizeOf(typeof(
................................................................................
            try
            {
                int sizeOfInfoType;
                int sizeOfOrderByType;
                int sizeOfConstraintType;
                int sizeOfConstraintUsageType;

                SizeOf(out sizeOfInfoType, out sizeOfConstraintType,
                    out sizeOfOrderByType, out sizeOfConstraintUsageType);

                if ((sizeOfInfoType > 0) &&
                    (sizeOfConstraintType > 0) &&
                    (sizeOfOrderByType > 0) &&
                    (sizeOfConstraintUsageType > 0))
                {







|







 







|







1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
....
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
        /// structure is stored here.
        /// </param>
        /// <param name="sizeOfConstraintUsageType">
        /// The size of the native
        /// <see cref="UnsafeNativeMethods.sqlite3_index_constraint_usage" />
        /// structure is stored here.
        /// </param>
        private static void SizeOfNative(
            out int sizeOfInfoType,
            out int sizeOfConstraintType,
            out int sizeOfOrderByType,
            out int sizeOfConstraintUsageType
            )
        {
            sizeOfInfoType = Marshal.SizeOf(typeof(
................................................................................
            try
            {
                int sizeOfInfoType;
                int sizeOfOrderByType;
                int sizeOfConstraintType;
                int sizeOfConstraintUsageType;

                SizeOfNative(out sizeOfInfoType, out sizeOfConstraintType,
                    out sizeOfOrderByType, out sizeOfConstraintUsageType);

                if ((sizeOfInfoType > 0) &&
                    (sizeOfConstraintType > 0) &&
                    (sizeOfOrderByType > 0) &&
                    (sizeOfConstraintUsageType > 0))
                {

Changes to Tests/vtab.eagle.

1940
1941
1942
1943
1944
1945
1946


1947
1948
1949
1950
1951
1952
1953
1954


1955
1956
1957
1958
1959
1960
1961
1962


1963
1964
1965
1966
1967
1968
1969

  if {[$index(1) Outputs.CanUseEstimatedRows] && \
      [$index(2) Outputs.CanUseEstimatedRows]} then {
    if {[$index(1) Outputs.EstimatedRows] != \
        [$index(2) Outputs.EstimatedRows]} then {
      error "EstimatedRows does not match"
    }


  }

  if {[$index(1) Outputs.CanUseIndexFlags] && \
      [$index(2) Outputs.CanUseIndexFlags]} then {
    if {[$index(1) Outputs.IndexFlags] != \
        [$index(2) Outputs.IndexFlags]} then {
      error "IndexFlags does not match"
    }


  }

  if {[$index(1) Outputs.CanUseColumnsUsed] && \
      [$index(2) Outputs.CanUseColumnsUsed]} then {
    if {[$index(1) Outputs.ColumnsUsed] != \
        [$index(2) Outputs.ColumnsUsed]} then {
      error "ColumnsUsed does not match"
    }


  }
} -cleanup {
  catch {
    object invoke -flags +NonPublic \
        System.Data.SQLite.SQLiteIndex FreeNative $pIndex(1)
  }








>
>








>
>








>
>







1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975

  if {[$index(1) Outputs.CanUseEstimatedRows] && \
      [$index(2) Outputs.CanUseEstimatedRows]} then {
    if {[$index(1) Outputs.EstimatedRows] != \
        [$index(2) Outputs.EstimatedRows]} then {
      error "EstimatedRows does not match"
    }

    tputs $test_channel "---- checked EstimatedRows property\n"
  }

  if {[$index(1) Outputs.CanUseIndexFlags] && \
      [$index(2) Outputs.CanUseIndexFlags]} then {
    if {[$index(1) Outputs.IndexFlags] != \
        [$index(2) Outputs.IndexFlags]} then {
      error "IndexFlags does not match"
    }

    tputs $test_channel "---- checked IndexFlags property\n"
  }

  if {[$index(1) Outputs.CanUseColumnsUsed] && \
      [$index(2) Outputs.CanUseColumnsUsed]} then {
    if {[$index(1) Outputs.ColumnsUsed] != \
        [$index(2) Outputs.ColumnsUsed]} then {
      error "ColumnsUsed does not match"
    }

    tputs $test_channel "---- checked ColumnsUsed property\n"
  }
} -cleanup {
  catch {
    object invoke -flags +NonPublic \
        System.Data.SQLite.SQLiteIndex FreeNative $pIndex(1)
  }