Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Avoid using Path.Combine with null values in the native library pre-loader. Fix for [da685c0bac]. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
61eafc5985c61658230310f08336fa1f |
User & Date: | mistachkin 2016-03-08 23:16:45.302 |
Context
2016-03-09
| ||
01:20 | Add test for ticket [da685c0bac]. check-in: 2b1ca5ca01 user: mistachkin tags: trunk | |
2016-03-08
| ||
23:16 | Avoid using Path.Combine with null values in the native library pre-loader. Fix for [da685c0bac]. check-in: 61eafc5985 user: mistachkin tags: trunk | |
2016-03-04
| ||
19:46 | If the MSBuild file '$(SQLiteNetDir)\Targets\SQLite.NET.Settings.targets.extra' exists, load it. check-in: eb74036e82 user: mistachkin tags: trunk | |
Changes
Changes to Doc/Extra/Provider/version.html.
︙ | ︙ | |||
46 47 48 49 50 51 52 53 54 55 56 57 58 59 | <p><b>1.0.100.0 - February XX, 2016 <font color="red">(release scheduled)</font></b></p> <ul> <li>Updated to <a href="https://www.sqlite.org/releaselog/3_11_1.html">SQLite 3.11.1</a>.</li> <li>Properly handle NULL values in the "name" column of the results returned by PRAGMA index_info(). Fix for <a href="https://system.data.sqlite.org/index.html/info/5251bd0878">[5251bd0878]</a>.</li> <li>For column types that resolve to boolean, recognize case-insensitive prefixes of "True" and "False". Fix for <a href="https://system.data.sqlite.org/index.html/info/dbd65441a5">[dbd65441a5]</a>.</li> <li>Add NoVerifyTextAffinity connection flag to skip type affinity checking when fetching a column value as a string. Pursuant to <a href="https://system.data.sqlite.org/index.html/info/dbd65441a5">[dbd65441a5]</a>.</li> <li>The UnixEpoch DateTime format should use Int64 internally, not Int32. <b>** Potentially Incompatible Change **</b></li> </ul> <p><b>1.0.99.0 - December 9, 2015</b></p> <ul> <li>Updated to <a href="https://www.sqlite.org/releaselog/3_9_2.html">SQLite 3.9.2</a>.</li> <li>Add preliminary support for the .NET Framework 4.6.1.</li> <li>Fix handling of sqlite3_index_info members not available with older versions of the SQLite core library. <b>** Potentially Incompatible Change **</b></li> <li>Update and improve documentation comments for the native virtual table methods.</li> | > | 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 | <p><b>1.0.100.0 - February XX, 2016 <font color="red">(release scheduled)</font></b></p> <ul> <li>Updated to <a href="https://www.sqlite.org/releaselog/3_11_1.html">SQLite 3.11.1</a>.</li> <li>Properly handle NULL values in the "name" column of the results returned by PRAGMA index_info(). Fix for <a href="https://system.data.sqlite.org/index.html/info/5251bd0878">[5251bd0878]</a>.</li> <li>For column types that resolve to boolean, recognize case-insensitive prefixes of "True" and "False". Fix for <a href="https://system.data.sqlite.org/index.html/info/dbd65441a5">[dbd65441a5]</a>.</li> <li>Add NoVerifyTextAffinity connection flag to skip type affinity checking when fetching a column value as a string. Pursuant to <a href="https://system.data.sqlite.org/index.html/info/dbd65441a5">[dbd65441a5]</a>.</li> <li>The UnixEpoch DateTime format should use Int64 internally, not Int32. <b>** Potentially Incompatible Change **</b></li> <li>Avoid using Path.Combine with null values in the native library pre-loader. Fix for <a href="https://system.data.sqlite.org/index.html/info/da685c0bac">[da685c0bac]</a>.</li> </ul> <p><b>1.0.99.0 - December 9, 2015</b></p> <ul> <li>Updated to <a href="https://www.sqlite.org/releaselog/3_9_2.html">SQLite 3.9.2</a>.</li> <li>Add preliminary support for the .NET Framework 4.6.1.</li> <li>Fix handling of sqlite3_index_info members not available with older versions of the SQLite core library. <b>** Potentially Incompatible Change **</b></li> <li>Update and improve documentation comments for the native virtual table methods.</li> |
︙ | ︙ |
Changes to System.Data.SQLite/UnsafeNativeMethods.cs.
︙ | ︙ | |||
277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 | #endif #endif } } ///////////////////////////////////////////////////////////////////////// /// <summary> /// Queries and returns the XML configuration file name for the assembly /// containing the managed System.Data.SQLite components. /// </summary> /// <returns> /// The XML configuration file name -OR- null if it cannot be determined /// or does not exist. /// </returns> private static string GetXmlConfigFileName() { string directory; string fileName; #if !PLATFORM_COMPACTFRAMEWORK directory = AppDomain.CurrentDomain.BaseDirectory; | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 | #endif #endif } } ///////////////////////////////////////////////////////////////////////// /// <summary> /// Combines two path strings. /// </summary> /// <param name="path1"> /// The first path -OR- null. /// </param> /// <param name="path2"> /// The second path -OR- null. /// </param> /// <returns> /// The combined path string -OR- null if both of the original path /// strings are null. /// </returns> private static string MaybeCombinePath( string path1, string path2 ) { if (path1 != null) { if (path2 != null) return Path.Combine(path1, path2); else return path1; } else { if (path2 != null) return path2; else return null; } } ///////////////////////////////////////////////////////////////////////// /// <summary> /// Queries and returns the XML configuration file name for the assembly /// containing the managed System.Data.SQLite components. /// </summary> /// <returns> /// The XML configuration file name -OR- null if it cannot be determined /// or does not exist. /// </returns> private static string GetXmlConfigFileName() { string directory; string fileName; #if !PLATFORM_COMPACTFRAMEWORK directory = AppDomain.CurrentDomain.BaseDirectory; fileName = MaybeCombinePath(directory, XmlConfigFileName); if (File.Exists(fileName)) return fileName; #endif directory = GetAssemblyDirectory(); fileName = MaybeCombinePath(directory, XmlConfigFileName); if (File.Exists(fileName)) return fileName; return null; } |
︙ | ︙ | |||
483 484 485 486 487 488 489 | { if (!String.IsNullOrEmpty(directory) && (processorArchitecturePlatforms != null)) { foreach (KeyValuePair<string, string> pair in processorArchitecturePlatforms) { | | | | 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 | { if (!String.IsNullOrEmpty(directory) && (processorArchitecturePlatforms != null)) { foreach (KeyValuePair<string, string> pair in processorArchitecturePlatforms) { if (Directory.Exists(MaybeCombinePath(directory, pair.Key))) { matches.Add(pair.Key); result++; } string value = pair.Value; if (value == null) continue; if (Directory.Exists(MaybeCombinePath(directory, value))) { matches.Add(value); result++; } } } } |
︙ | ︙ | |||
532 533 534 535 536 537 538 | if (!File.Exists(localFileName)) return false; string directory = Path.GetDirectoryName( localFileName); /* throw */ | | | 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 | if (!File.Exists(localFileName)) return false; string directory = Path.GetDirectoryName( localFileName); /* throw */ string xmlConfigFileName = MaybeCombinePath( directory, XmlConfigFileName); if (File.Exists(xmlConfigFileName)) { #if !NET_COMPACT_20 && TRACE_DETECTION try { |
︙ | ︙ | |||
852 853 854 855 856 857 858 | continue; foreach (string subDirectory in subDirectories) { if (subDirectory == null) continue; | | | | 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 | continue; foreach (string subDirectory in subDirectories) { if (subDirectory == null) continue; string fileName = FixUpDllFileName(MaybeCombinePath( MaybeCombinePath(directory, subDirectory), SQLITE_DLL)); // // NOTE: If the SQLite DLL file exists, return success. // Prior to returning, set the base directory and // processor architecture to reflect the location // where it was found. // |
︙ | ︙ | |||
1179 1180 1181 1182 1183 1184 1185 | if (baseDirectory == null) return false; // // NOTE: If the native SQLite library exists in the base directory // itself, stop now. // | | | | 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 | if (baseDirectory == null) return false; // // NOTE: If the native SQLite library exists in the base directory // itself, stop now. // string fileName = FixUpDllFileName(MaybeCombinePath( baseDirectory, SQLITE_DLL)); if (File.Exists(fileName)) return false; // // NOTE: If the specified processor architecture is null, use the // default. |
︙ | ︙ | |||
1202 1203 1204 1205 1206 1207 1208 | if (processorArchitecture == null) return false; // // NOTE: Build the full path and file name for the native SQLite // library using the processor architecture name. // | | | | 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 | if (processorArchitecture == null) return false; // // NOTE: Build the full path and file name for the native SQLite // library using the processor architecture name. // fileName = FixUpDllFileName(MaybeCombinePath(MaybeCombinePath( baseDirectory, processorArchitecture), SQLITE_DLL)); // // NOTE: If the file name based on the processor architecture name // is not found, try using the associated platform name. // if (!File.Exists(fileName)) { |
︙ | ︙ | |||
1227 1228 1229 1230 1231 1232 1233 | if (platformName == null) return false; // // NOTE: Build the full path and file name for the native SQLite // library using the platform name. // | | | 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 | if (platformName == null) return false; // // NOTE: Build the full path and file name for the native SQLite // library using the platform name. // fileName = FixUpDllFileName(MaybeCombinePath(MaybeCombinePath( baseDirectory, platformName), SQLITE_DLL)); // // NOTE: If the file does not exist, skip trying to load it. // if (!File.Exists(fileName)) return false; |
︙ | ︙ |
Changes to readme.htm.
︙ | ︙ | |||
213 214 215 216 217 218 219 220 221 222 223 224 225 226 | </p> <ul> <li>Updated to <a href="https://www.sqlite.org/releaselog/3_11_1.html">SQLite 3.11.1</a>.</li> <li>Properly handle NULL values in the "name" column of the results returned by PRAGMA index_info(). Fix for [5251bd0878].</li> <li>For column types that resolve to boolean, recognize case-insensitive prefixes of "True" and "False". Fix for [dbd65441a5].</li> <li>Add NoVerifyTextAffinity connection flag to skip type affinity checking when fetching a column value as a string. Pursuant to [dbd65441a5].</li> <li>The UnixEpoch DateTime format should use Int64 internally, not Int32. <b>** Potentially Incompatible Change **</b></li> </ul> <p> <b>1.0.99.0 - December 9, 2015</b> </p> <ul> <li>Updated to <a href="https://www.sqlite.org/releaselog/3_9_2.html">SQLite 3.9.2</a>.</li> <li>Add preliminary support for the .NET Framework 4.6.1.</li> | > | 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 | </p> <ul> <li>Updated to <a href="https://www.sqlite.org/releaselog/3_11_1.html">SQLite 3.11.1</a>.</li> <li>Properly handle NULL values in the "name" column of the results returned by PRAGMA index_info(). Fix for [5251bd0878].</li> <li>For column types that resolve to boolean, recognize case-insensitive prefixes of "True" and "False". Fix for [dbd65441a5].</li> <li>Add NoVerifyTextAffinity connection flag to skip type affinity checking when fetching a column value as a string. Pursuant to [dbd65441a5].</li> <li>The UnixEpoch DateTime format should use Int64 internally, not Int32. <b>** Potentially Incompatible Change **</b></li> <li>Avoid using Path.Combine with null values in the native library pre-loader. Fix for [da685c0bac].</li> </ul> <p> <b>1.0.99.0 - December 9, 2015</b> </p> <ul> <li>Updated to <a href="https://www.sqlite.org/releaselog/3_9_2.html">SQLite 3.9.2</a>.</li> <li>Add preliminary support for the .NET Framework 4.6.1.</li> |
︙ | ︙ |
Changes to www/news.wiki.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | <title>News</title> <b>Version History</b> <p> <b>1.0.100.0 - February XX, 2016 <font color="red">(release scheduled)</font></b> </p> <ul> <li>Updated to <a href="https://www.sqlite.org/releaselog/3_11_1.html">SQLite 3.11.1</a>.</li> <li>Properly handle NULL values in the "name" column of the results returned by PRAGMA index_info(). Fix for [5251bd0878].</li> <li>For column types that resolve to boolean, recognize case-insensitive prefixes of "True" and "False". Fix for [dbd65441a5].</li> <li>Add NoVerifyTextAffinity connection flag to skip type affinity checking when fetching a column value as a string. Pursuant to [dbd65441a5].</li> <li>The UnixEpoch DateTime format should use Int64 internally, not Int32. <b>** Potentially Incompatible Change **</b></li> </ul> <p> <b>1.0.99.0 - December 9, 2015</b> </p> <ul> <li>Updated to [https://www.sqlite.org/releaselog/3_9_2.html|SQLite 3.9.2].</li> <li>Add preliminary support for the .NET Framework 4.6.1.</li> | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 | <title>News</title> <b>Version History</b> <p> <b>1.0.100.0 - February XX, 2016 <font color="red">(release scheduled)</font></b> </p> <ul> <li>Updated to <a href="https://www.sqlite.org/releaselog/3_11_1.html">SQLite 3.11.1</a>.</li> <li>Properly handle NULL values in the "name" column of the results returned by PRAGMA index_info(). Fix for [5251bd0878].</li> <li>For column types that resolve to boolean, recognize case-insensitive prefixes of "True" and "False". Fix for [dbd65441a5].</li> <li>Add NoVerifyTextAffinity connection flag to skip type affinity checking when fetching a column value as a string. Pursuant to [dbd65441a5].</li> <li>The UnixEpoch DateTime format should use Int64 internally, not Int32. <b>** Potentially Incompatible Change **</b></li> <li>Avoid using Path.Combine with null values in the native library pre-loader. Fix for [da685c0bac].</li> </ul> <p> <b>1.0.99.0 - December 9, 2015</b> </p> <ul> <li>Updated to [https://www.sqlite.org/releaselog/3_9_2.html|SQLite 3.9.2].</li> <li>Add preliminary support for the .NET Framework 4.6.1.</li> |
︙ | ︙ |