Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch tkt-7e3fa93744 Excluding Merge-Ins
This is equivalent to a diff from 176935a5e1 to da3e0bfb53
2011-11-13
| ||
06:24 | Merge fix for ticket [7e3fa93744] and several unit test infrastructure enhancements to trunk. check-in: 8fe2a401d6 user: mistachkin tags: trunk | |
05:55 | When generating the schema for the contents of a data reader, skip flagging columns as 'unique' if the data reader is holding the result of some kind of multi-table construct (i.e. a join) because we must allow duplicate values in that case. Fix for ticket [7e3fa93744]. Also, enhance vendor-specific initialization file for Eagle to report any test setting overrides being used. Closed-Leaf check-in: da3e0bfb53 user: mistachkin tags: tkt-7e3fa93744 | |
01:06 | Improve comments in the vendor specific interpreter initialization file. check-in: eb89cff67e user: mistachkin tags: tkt-7e3fa93744 | |
2011-11-12
| ||
08:38 | Work on minimal test cases for ticket [7e3fa93744]. check-in: c243b1a500 user: mistachkin tags: tkt-7e3fa93744 | |
07:05 | Modify unit test infrastructure to better support running test files that exist outside the source tree. check-in: 176935a5e1 user: mistachkin tags: trunk | |
07:00 | Also allow forward slash when converting from a relative path on Windows CE. check-in: ebf069c623 user: mistachkin tags: trunk | |
Changes to Externals/Eagle/lib/Eagle1.0/vendor.eagle.
︙ | |||
19 20 21 22 23 24 25 26 27 28 29 30 31 32 | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 | + + + | # evaluated when an interpreter is initialized. Vendors distributing # Eagle can place custom application-specific, interpreter-specific # initialization and/or customizations in here. Additionally, this file # may contain per-interpreter customizations required when porting to # new platforms, operating systems, etc. # ############################################################################### ############################## BEGIN VENDOR CODE ############################## ############################################################################### # # NOTE: Use our own namespace here because even though we do not directly # support namespaces ourselves, we do not want to pollute the global # namespace if this script actually ends up being evaluated in Tcl. # namespace eval ::Eagle { if {[isEagle]} then { |
︙ | |||
74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 | 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 | + + + + + + + + + + | # if {!$quiet} then { puts -nonewline $channel [appendArgs \ "Found vendor-specific test package directory \"" $dir \ "\", adding...\n"] } # # NOTE: Append the directory to the necessary environment variable # so that it will get picked up when Eagle actually rebuilds # the auto-path list (below). # lappend ::env(EAGLELIBPATH) $dir # # NOTE: Force Eagle to rebuild the auto-path list for the current # interpreter right now. # object invoke Utility RefreshAutoPathList } # # NOTE: We are done, return success. # return true |
︙ | |||
103 104 105 106 107 108 109 110 111 112 113 | 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 | + + + + + + + + + + + + + + + + + + + + + + + + + + | } # # NOTE: Directory not found, return failure. # return false } proc checkForTestOverrides { channel varNames quiet } { set result 0 foreach varName $varNames { if {[uplevel 1 [list info exists $varName]]} then { incr result if {!$quiet} then { puts -nonewline $channel [appendArgs \ "Found vendor-specific test override \"" $varName "\".\n"] } } } return $result } checkForTestOverrides stdout \ [list binary_directory build_base_directory build_directory \ common_directory datetime_format test_configuration \ test_year] false addTestSuiteToAutoPath stdout false } } ############################################################################### ############################### END VENDOR CODE ############################### ############################################################################### |
Changes to System.Data.SQLite/SQLiteDataReader.cs.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 | + | /******************************************************** * 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; using System.Collections.Generic; using System.Data; using System.Data.Common; using System.Globalization; /// <summary> /// SQLite implementation of DbDataReader. /// </summary> |
︙ | |||
582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 | 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | /// to gather the necessary information so it can be represented in an ADO.NET manner. /// </summary> /// <returns>Returns a DataTable containing the schema information for the active SELECT statement being processed.</returns> public override DataTable GetSchemaTable() { return GetSchemaTable(true, false); } private class ColumnParent : IEqualityComparer<ColumnParent> { public string DatabaseName; public string TableName; public string ColumnName; public ColumnParent() { // do nothing. } public ColumnParent( string databaseName, string tableName, string columnName ) : this() { this.DatabaseName = databaseName; this.TableName = tableName; this.ColumnName = columnName; } #region IEqualityComparer<ColumnParent> Members public bool Equals(ColumnParent x, ColumnParent y) { if ((x == null) && (y == null)) { return true; } else if ((x == null) || (y == null)) { return false; } else { if (!String.Equals(x.DatabaseName, y.DatabaseName, StringComparison.OrdinalIgnoreCase)) { return false; } if (!String.Equals(x.TableName, y.TableName, StringComparison.OrdinalIgnoreCase)) { return false; } if (!String.Equals(x.ColumnName, y.ColumnName, StringComparison.OrdinalIgnoreCase)) { return false; } return true; } } public int GetHashCode(ColumnParent obj) { int result = 0; if ((obj != null) && (obj.DatabaseName != null)) result ^= obj.DatabaseName.GetHashCode(); if ((obj != null) && (obj.TableName != null)) result ^= obj.TableName.GetHashCode(); if ((obj != null) && (obj.ColumnName != null)) result ^= obj.ColumnName.GetHashCode(); return result; } #endregion } private static void GetStatementColumnParents( SQLiteBase sql, SQLiteStatement stmt, int fieldCount, ref Dictionary<ColumnParent, List<int>> parentToColumns, ref Dictionary<int, ColumnParent> columnToParent ) { if (parentToColumns == null) parentToColumns = new Dictionary<ColumnParent, List<int>>( new ColumnParent()); if (columnToParent == null) columnToParent = new Dictionary<int, ColumnParent>(); for (int n = 0; n < fieldCount; n++) { string databaseName = sql.ColumnDatabaseName(stmt, n); string tableName = sql.ColumnTableName(stmt, n); string columnName = sql.ColumnOriginalName(stmt, n); ColumnParent key = new ColumnParent(databaseName, tableName, null); ColumnParent value = new ColumnParent(databaseName, tableName, columnName); if (!parentToColumns.ContainsKey(key)) parentToColumns.Add(key, new List<int>(new int[] { n })); else parentToColumns[key].Add(n); columnToParent.Add(n, value); } } internal DataTable GetSchemaTable(bool wantUniqueInfo, bool wantDefaultValue) { CheckClosed(); // // BUGFIX: We need to quickly scan all the fields in the current // "result set" to see how many distinct tables are actually // involved. This information is necessary so that some // intelligent decisions can be made when constructing the // metadata below. For example, we need to be very careful // about flagging a particular column as "unique" just // because it was in its original underlying database table // if there are now multiple tables involved in the // "result set". See ticket [7e3fa93744] for more detailed // information. // Dictionary<ColumnParent, List<int>> parentToColumns = null; Dictionary<int, ColumnParent> columnToParent = null; GetStatementColumnParents( _command.Connection._sql, _activeStatement, _fieldCount, ref parentToColumns, ref columnToParent); DataTable tbl = new DataTable("SchemaTable"); DataTable tblIndexes = null; DataTable tblIndexColumns; DataRow row; string temp; string strCatalog = ""; string strTable = ""; |
︙ | |||
649 650 651 652 653 654 655 | 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 | - + - + - + | row[SchemaTableColumn.IsUnique] = false; row[SchemaTableColumn.IsKey] = false; row[SchemaTableOptionalColumn.IsAutoIncrement] = false; row[SchemaTableColumn.DataType] = GetFieldType(n); row[SchemaTableOptionalColumn.IsHidden] = false; row[SchemaTableColumn.BaseSchemaName] = _baseSchemaName; |
︙ | |||
758 759 760 761 762 763 764 | 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 | + + + + + + - + | (string)rowIndexes["INDEX_NAME"], null }); foreach (DataRow rowColumnIndex in tblIndexColumns.Rows) { if (String.Compare((string)rowColumnIndex["COLUMN_NAME"], strColumn, StringComparison.OrdinalIgnoreCase) == 0) { // // BUGFIX: Make sure that we only flag this column as "unique" // if we are not processing of some kind of multi-table // construct (i.e. a join) because in that case we must // allow duplicate values (refer to ticket [7e3fa93744]). // |
︙ |
Added Tests/tkt-7e3fa93744.eagle.