Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | 1.0.12 final |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | sourceforge |
Files: | files | file ages | folders |
SHA1: |
9e5f1b561424803721f0822edebccdcd |
User & Date: | rmsimpson 2005-08-05 06:14:51.000 |
Context
2005-08-06
| ||
00:04 | no message check-in: e5d82630c6 user: rmsimpson tags: sourceforge | |
2005-08-05
| ||
06:14 | 1.0.12 final check-in: 9e5f1b5614 user: rmsimpson tags: sourceforge | |
05:55 | 1.0.12 final check-in: d684aaadfe user: rmsimpson tags: sourceforge | |
Changes
Changes to System.Data.SQLite/AssemblyInfo.cs.
1 2 3 | using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; | > > > | > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | using System; using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; #if !PLATFORM_COMPACTFRAMEWORK using System.Runtime.ConstrainedExecution; #endif // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("System.Data.SQLite")] [assembly: AssemblyDescription("ADO.NET 2.0 Data Provider for SQLite")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("http://sourceforge.net/projects/sqlite-dotnet2")] [assembly: AssemblyProduct("System.Data.SQLite")] [assembly: AssemblyCopyright("Public Domain")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] // Setting ComVisible to false makes the types in this assembly not visible // to COM componenets. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] [assembly: CLSCompliant(true)] #if !PLATFORM_COMPACTFRAMEWORK [assembly: ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)] #endif // Version information for an assembly consists of the following four values: // // Major Version // Minor Version // Build Number // Revision // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: [assembly: AssemblyVersion("1.0.12.*")] |
Changes to System.Data.SQLite/SQLite3.cs.
︙ | ︙ | |||
314 315 316 317 318 319 320 | internal override int ColumnIndex(SQLiteStatement stmt, string columnName) { int x = ColumnCount(stmt); for (int n = 0; n < x; n++) { | | | 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 | internal override int ColumnIndex(SQLiteStatement stmt, string columnName) { int x = ColumnCount(stmt); for (int n = 0; n < x; n++) { if (String.Compare(columnName, ColumnName(stmt, n), true, System.Globalization.CultureInfo.CurrentCulture) == 0) return n; } return -1; } internal override double GetDouble(SQLiteStatement stmt, int index) { double value; |
︙ | ︙ |
Changes to System.Data.SQLite/SQLiteConnection.cs.
︙ | ︙ | |||
154 155 156 157 158 159 160 | // Reattach all attached databases from the existing connection using (DataTable tbl = cnn.GetSchema("Catalogs")) { foreach (DataRow row in tbl.Rows) { str = row[0].ToString(); | | > | | 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 | // Reattach all attached databases from the existing connection using (DataTable tbl = cnn.GetSchema("Catalogs")) { foreach (DataRow row in tbl.Rows) { str = row[0].ToString(); if (String.Compare(str, "MAIN", true, System.Globalization.CultureInfo.InvariantCulture) != 0 && String.Compare(str, "TEMP", true, System.Globalization.CultureInfo.InvariantCulture) != 0) { _sql.Execute(String.Format(System.Globalization.CultureInfo.InvariantCulture, "ATTACH DATABASE '{0}' AS [{1}]", row[1], row[0])); } } } } } #if PLATFORM_COMPACTFRAMEWORK |
︙ | ︙ | |||
415 416 417 418 419 420 421 | /// <param name="defValue">The default value to return if the key is not found</param> /// <returns>The value corresponding to the specified key, or the default value if not found.</returns> static internal string FindKey(KeyValuePair<string, string>[] opts, string key, string defValue) { int x = opts.Length; for (int n = 0; n < x; n++) { | | | | | | | | | | | 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 | /// <param name="defValue">The default value to return if the key is not found</param> /// <returns>The value corresponding to the specified key, or the default value if not found.</returns> static internal string FindKey(KeyValuePair<string, string>[] opts, string key, string defValue) { int x = opts.Length; for (int n = 0; n < x; n++) { if (String.Compare(opts[n].Key, key, true, System.Globalization.CultureInfo.InvariantCulture) == 0) { return opts[n].Value; } } return defValue; } /// <summary> /// Opens the connection using the parameters found in the <see cref="ConnectionString">ConnectionString</see> /// </summary> public override void Open() { if (_connectionState != ConnectionState.Closed) throw new InvalidOperationException(); Close(); KeyValuePair<string, string>[] opts = ParseConnectionString(); if (Convert.ToInt32(FindKey(opts, "Version", "3"), System.Globalization.CultureInfo.InvariantCulture) != 3) throw new NotSupportedException("Only SQLite Version 3 is supported at this time"); try { string strFile = FindKey(opts, "Data Source", ""); bool bUTF16 = (Convert.ToBoolean(FindKey(opts, "UseUTF16Encoding", "False"), System.Globalization.CultureInfo.InvariantCulture) == true); if (bUTF16) _sql = new SQLite3_UTF16(String.Compare(FindKey(opts, "DateTimeFormat", "ISO8601"), "TICKS", true, System.Globalization.CultureInfo.InvariantCulture) == 0 ? DateTimeFormat.Ticks : DateTimeFormat.ISO8601); else _sql = new SQLite3(String.Compare(FindKey(opts, "DateTimeFormat", "ISO8601"), "TICKS", true, System.Globalization.CultureInfo.InvariantCulture) == 0 ? DateTimeFormat.Ticks : DateTimeFormat.ISO8601); _sql.Open(strFile); if (bUTF16 == true) _sql.Execute("PRAGMA encoding = 'UTF-16'"); else _sql.Execute("PRAGMA encoding = 'UTF-8'"); _sql.Execute(String.Format(System.Globalization.CultureInfo.InvariantCulture, "PRAGMA Synchronous={0}", FindKey(opts, "Synchronous", "Normal"))); _sql.Execute(String.Format(System.Globalization.CultureInfo.InvariantCulture, "PRAGMA Cache_Size={0}", FindKey(opts, "Cache Size", "2000"))); if (String.Compare(strFile, ":MEMORY:", true, System.Globalization.CultureInfo.InvariantCulture) != 0) _sql.Execute(String.Format(System.Globalization.CultureInfo.InvariantCulture, "PRAGMA Page_Size={0}", FindKey(opts, "Page Size", "1024"))); } catch (SQLiteException) { OnStateChange(ConnectionState.Broken); throw; } OnStateChange(ConnectionState.Open); |
︙ | ︙ | |||
551 552 553 554 555 556 557 | throw new InvalidOperationException(); string[] parms = new string[5]; restrictionValues.CopyTo(parms, 0); if (restrictionValues == null) restrictionValues = new string[0]; | | | 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 | throw new InvalidOperationException(); string[] parms = new string[5]; restrictionValues.CopyTo(parms, 0); if (restrictionValues == null) restrictionValues = new string[0]; switch (collectionName.ToUpper(System.Globalization.CultureInfo.InvariantCulture)) { case "METADATACOLLECTIONS": return Schema_MetaDataCollections(); case "DATASOURCEINFORMATION": return Schema_DataSourceInformation(); case "COLUMNS": return Schema_Columns(parms[0], parms[2], parms[3]); |
︙ | ︙ | |||
580 581 582 583 584 585 586 587 588 589 590 591 592 593 | /// </summary> /// <returns>DataTable</returns> private static DataTable Schema_MetaDataCollections() { DataTable tbl = new DataTable("MetaDataCollections"); DataRow row; tbl.Columns.Add("CollectionName", typeof(string)); tbl.Columns.Add("NumberOfRestrictions", typeof(int)); tbl.Columns.Add("NumberOfIdentifierParts", typeof(int)); tbl.BeginLoadData(); row = tbl.NewRow(); | > | 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 | /// </summary> /// <returns>DataTable</returns> private static DataTable Schema_MetaDataCollections() { DataTable tbl = new DataTable("MetaDataCollections"); DataRow row; tbl.Locale = System.Globalization.CultureInfo.InvariantCulture; tbl.Columns.Add("CollectionName", typeof(string)); tbl.Columns.Add("NumberOfRestrictions", typeof(int)); tbl.Columns.Add("NumberOfIdentifierParts", typeof(int)); tbl.BeginLoadData(); row = tbl.NewRow(); |
︙ | ︙ | |||
629 630 631 632 633 634 635 636 637 638 639 640 641 642 | /// </summary> /// <returns>DataTable</returns> private DataTable Schema_DataSourceInformation() { DataTable tbl = new DataTable("DataSourceInformation"); DataRow row; tbl.Columns.Add("CompositeIdentifierSeparatorPattern", typeof(string)); tbl.Columns.Add("DataSourceProductName", typeof(string)); tbl.Columns.Add("DataSourceProductVersion", typeof(string)); tbl.Columns.Add("DataSourceProductVersionNormalized", typeof(string)); tbl.Columns.Add("GroupByBehavior", typeof(int)); tbl.Columns.Add("IdentifierPattern", typeof(string)); tbl.Columns.Add("IdentifierCase", typeof(int)); | > | 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 | /// </summary> /// <returns>DataTable</returns> private DataTable Schema_DataSourceInformation() { DataTable tbl = new DataTable("DataSourceInformation"); DataRow row; tbl.Locale = System.Globalization.CultureInfo.InvariantCulture; tbl.Columns.Add("CompositeIdentifierSeparatorPattern", typeof(string)); tbl.Columns.Add("DataSourceProductName", typeof(string)); tbl.Columns.Add("DataSourceProductVersion", typeof(string)); tbl.Columns.Add("DataSourceProductVersionNormalized", typeof(string)); tbl.Columns.Add("GroupByBehavior", typeof(int)); tbl.Columns.Add("IdentifierPattern", typeof(string)); tbl.Columns.Add("IdentifierCase", typeof(int)); |
︙ | ︙ | |||
691 692 693 694 695 696 697 698 699 700 701 702 703 704 | /// <param name="strColumn">The column to retrieve schema information for, can be null</param> /// <returns>DataTable</returns> private DataTable Schema_Columns(string strCatalog, string strTable, string strColumn) { DataTable tbl = new DataTable("Columns"); DataRow row; tbl.Columns.Add("TABLE_CATALOG", typeof(string)); tbl.Columns.Add("TABLE_SCHEMA", typeof(string)); tbl.Columns.Add("TABLE_NAME", typeof(string)); tbl.Columns.Add("COLUMN_NAME", typeof(string)); tbl.Columns.Add("COLUMN_GUID", typeof(Guid)); tbl.Columns.Add("COLUMN_PROPID", typeof(long)); tbl.Columns.Add("ORDINAL_POSITION", typeof(long)); | > | 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 | /// <param name="strColumn">The column to retrieve schema information for, can be null</param> /// <returns>DataTable</returns> private DataTable Schema_Columns(string strCatalog, string strTable, string strColumn) { DataTable tbl = new DataTable("Columns"); DataRow row; tbl.Locale = System.Globalization.CultureInfo.InvariantCulture; tbl.Columns.Add("TABLE_CATALOG", typeof(string)); tbl.Columns.Add("TABLE_SCHEMA", typeof(string)); tbl.Columns.Add("TABLE_NAME", typeof(string)); tbl.Columns.Add("COLUMN_NAME", typeof(string)); tbl.Columns.Add("COLUMN_GUID", typeof(Guid)); tbl.Columns.Add("COLUMN_PROPID", typeof(long)); tbl.Columns.Add("ORDINAL_POSITION", typeof(long)); |
︙ | ︙ | |||
723 724 725 726 727 728 729 | tbl.Columns.Add("DOMAIN_NAME", typeof(string)); tbl.Columns.Add("DESCRIPTION", typeof(string)); tbl.BeginLoadData(); if (String.IsNullOrEmpty(strCatalog)) strCatalog = "main"; | | | | 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 | tbl.Columns.Add("DOMAIN_NAME", typeof(string)); tbl.Columns.Add("DESCRIPTION", typeof(string)); tbl.BeginLoadData(); if (String.IsNullOrEmpty(strCatalog)) strCatalog = "main"; using (SQLiteCommand cmd = new SQLiteCommand(String.Format(System.Globalization.CultureInfo.CurrentCulture, "SELECT * FROM [{0}].[{1}]", strCatalog, strTable), this)) { using (SQLiteDataReader rd = (SQLiteDataReader)cmd.ExecuteReader(CommandBehavior.SchemaOnly)) { using (DataTable tblSchema = rd.GetSchemaTable()) { foreach (DataRow schemaRow in tblSchema.Rows) { if (String.Compare(schemaRow[SchemaTableColumn.ColumnName].ToString(), strColumn, true, System.Globalization.CultureInfo.CurrentCulture) == 0 || strColumn == null) { row = tbl.NewRow(); row["TABLE_NAME"] = strTable; row["COLUMN_NAME"] = schemaRow[SchemaTableColumn.ColumnName]; row["TABLE_CATALOG"] = schemaRow[SchemaTableOptionalColumn.BaseCatalogName]; row["ORDINAL_POSITION"] = schemaRow[SchemaTableColumn.ColumnOrdinal]; |
︙ | ︙ | |||
770 771 772 773 774 775 776 777 778 779 780 781 782 783 | /// <param name="strTable">The table to retrieve index information for, can be null</param> /// <returns>DataTable</returns> private DataTable Schema_Indexes(string strCatalog, string strIndex, string strTable) { DataTable tbl = new DataTable("Indexes"); DataRow row; tbl.Columns.Add("TABLE_CATALOG", typeof(string)); tbl.Columns.Add("TABLE_SCHEMA", typeof(string)); tbl.Columns.Add("TABLE_NAME", typeof(string)); tbl.Columns.Add("INDEX_CATALOG", typeof(string)); tbl.Columns.Add("INDEX_SCHEMA", typeof(string)); tbl.Columns.Add("INDEX_NAME", typeof(string)); tbl.Columns.Add("PRIMARY_KEY", typeof(bool)); | > | 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 | /// <param name="strTable">The table to retrieve index information for, can be null</param> /// <returns>DataTable</returns> private DataTable Schema_Indexes(string strCatalog, string strIndex, string strTable) { DataTable tbl = new DataTable("Indexes"); DataRow row; tbl.Locale = System.Globalization.CultureInfo.InvariantCulture; tbl.Columns.Add("TABLE_CATALOG", typeof(string)); tbl.Columns.Add("TABLE_SCHEMA", typeof(string)); tbl.Columns.Add("TABLE_NAME", typeof(string)); tbl.Columns.Add("INDEX_CATALOG", typeof(string)); tbl.Columns.Add("INDEX_SCHEMA", typeof(string)); tbl.Columns.Add("INDEX_NAME", typeof(string)); tbl.Columns.Add("PRIMARY_KEY", typeof(bool)); |
︙ | ︙ | |||
800 801 802 803 804 805 806 | tbl.Columns.Add("FILTER_CONDITION", typeof(string)); tbl.Columns.Add("INTEGRATED", typeof(bool)); tbl.BeginLoadData(); if (String.IsNullOrEmpty(strCatalog)) strCatalog = "main"; | | | | | 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 | tbl.Columns.Add("FILTER_CONDITION", typeof(string)); tbl.Columns.Add("INTEGRATED", typeof(bool)); tbl.BeginLoadData(); if (String.IsNullOrEmpty(strCatalog)) strCatalog = "main"; using (SQLiteCommand cmd = new SQLiteCommand(String.Format(System.Globalization.CultureInfo.CurrentCulture, "SELECT * FROM [{0}].[sqlite_master] WHERE [type] = 'index'", strCatalog), this)) { using (SQLiteDataReader rd = (SQLiteDataReader)cmd.ExecuteReader()) { while (rd.Read()) { if (String.Compare(rd.GetString(1), strIndex, true, System.Globalization.CultureInfo.CurrentCulture) == 0 || strIndex == null) { if (String.Compare(rd.GetString(2), strTable, true, System.Globalization.CultureInfo.CurrentCulture) == 0 || strTable == null) { row = tbl.NewRow(); row["TABLE_CATALOG"] = strCatalog; row["TABLE_NAME"] = rd.GetString(2); row["INDEX_NAME"] = rd.GetString(1); tbl.Rows.Add(row); |
︙ | ︙ | |||
841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 | /// <returns>DataTable</returns> private DataTable Schema_Tables(string strCatalog, string strTable, string strType) { DataTable tbl = new DataTable("Tables"); DataRow row; string strItem; tbl.Columns.Add("TABLE_CATALOG", typeof(string)); tbl.Columns.Add("TABLE_SCHEMA", typeof(string)); tbl.Columns.Add("TABLE_NAME", typeof(string)); tbl.Columns.Add("TABLE_TYPE", typeof(string)); tbl.Columns.Add("TABLE_GUID", typeof(Guid)); tbl.Columns.Add("DESCRIPTION", typeof(string)); tbl.Columns.Add("TABLE_PROPID", typeof(long)); tbl.Columns.Add("DATE_CREATED", typeof(DateTime)); tbl.Columns.Add("DATE_MODIFIED", typeof(DateTime)); tbl.BeginLoadData(); if (String.IsNullOrEmpty(strCatalog)) strCatalog = "main"; | > | | | | | | 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 | /// <returns>DataTable</returns> private DataTable Schema_Tables(string strCatalog, string strTable, string strType) { DataTable tbl = new DataTable("Tables"); DataRow row; string strItem; tbl.Locale = System.Globalization.CultureInfo.InvariantCulture; tbl.Columns.Add("TABLE_CATALOG", typeof(string)); tbl.Columns.Add("TABLE_SCHEMA", typeof(string)); tbl.Columns.Add("TABLE_NAME", typeof(string)); tbl.Columns.Add("TABLE_TYPE", typeof(string)); tbl.Columns.Add("TABLE_GUID", typeof(Guid)); tbl.Columns.Add("DESCRIPTION", typeof(string)); tbl.Columns.Add("TABLE_PROPID", typeof(long)); tbl.Columns.Add("DATE_CREATED", typeof(DateTime)); tbl.Columns.Add("DATE_MODIFIED", typeof(DateTime)); tbl.BeginLoadData(); if (String.IsNullOrEmpty(strCatalog)) strCatalog = "main"; using (SQLiteCommand cmd = new SQLiteCommand(String.Format(System.Globalization.CultureInfo.CurrentCulture, "SELECT * FROM [{0}].[sqlite_master] WHERE [type] NOT LIKE 'index'", strCatalog), this)) { using (SQLiteDataReader rd = (SQLiteDataReader)cmd.ExecuteReader()) { while (rd.Read()) { strItem = rd.GetString(0).ToUpper(System.Globalization.CultureInfo.CurrentCulture); if (rd.GetString(2).ToUpper(System.Globalization.CultureInfo.CurrentCulture).IndexOf("SQLITE_") == 0) strItem = "SYSTEM TABLE"; if (String.Compare(strItem, strType, true, System.Globalization.CultureInfo.CurrentCulture) == 0 || strType == null) { if (String.Compare(rd.GetString(2), strTable, true, System.Globalization.CultureInfo.CurrentCulture) == 0 || strTable == null) { row = tbl.NewRow(); row["TABLE_CATALOG"] = strCatalog; row["TABLE_NAME"] = rd.GetString(2); row["TABLE_TYPE"] = strItem; tbl.Rows.Add(row); |
︙ | ︙ | |||
900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 | private DataTable Schema_Views(string strCatalog, string strView) { DataTable tbl = new DataTable("Views"); DataRow row; string strItem; int nPos; tbl.Columns.Add("TABLE_CATALOG", typeof(string)); tbl.Columns.Add("TABLE_SCHEMA", typeof(string)); tbl.Columns.Add("TABLE_NAME", typeof(string)); tbl.Columns.Add("VIEW_DEFINITION", typeof(string)); tbl.Columns.Add("CHECK_OPTION", typeof(bool)); tbl.Columns.Add("IS_UPDATEABLE", typeof(bool)); tbl.Columns.Add("DESCRIPTION", typeof(string)); tbl.Columns.Add("DATE_CREATED", typeof(DateTime)); tbl.Columns.Add("DATE_MODIFIED", typeof(DateTime)); tbl.BeginLoadData(); if (String.IsNullOrEmpty(strCatalog)) strCatalog = "main"; | > | | | 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 | private DataTable Schema_Views(string strCatalog, string strView) { DataTable tbl = new DataTable("Views"); DataRow row; string strItem; int nPos; tbl.Locale = System.Globalization.CultureInfo.InvariantCulture; tbl.Columns.Add("TABLE_CATALOG", typeof(string)); tbl.Columns.Add("TABLE_SCHEMA", typeof(string)); tbl.Columns.Add("TABLE_NAME", typeof(string)); tbl.Columns.Add("VIEW_DEFINITION", typeof(string)); tbl.Columns.Add("CHECK_OPTION", typeof(bool)); tbl.Columns.Add("IS_UPDATEABLE", typeof(bool)); tbl.Columns.Add("DESCRIPTION", typeof(string)); tbl.Columns.Add("DATE_CREATED", typeof(DateTime)); tbl.Columns.Add("DATE_MODIFIED", typeof(DateTime)); tbl.BeginLoadData(); if (String.IsNullOrEmpty(strCatalog)) strCatalog = "main"; using (SQLiteCommand cmd = new SQLiteCommand(String.Format(System.Globalization.CultureInfo.CurrentCulture, "SELECT * FROM [{0}].[sqlite_master] WHERE [type] LIKE 'view'", strCatalog), this)) { using (SQLiteDataReader rd = (SQLiteDataReader)cmd.ExecuteReader()) { while (rd.Read()) { if (String.Compare(rd.GetString(1), strView, true, System.Globalization.CultureInfo.CurrentCulture) == 0 || strView == null) { strItem = rd.GetString(4); nPos = Globalization.CultureInfo.InvariantCulture.CompareInfo.IndexOf(strItem, " AS "); if (nPos > -1) { strItem = strItem.Substring(nPos + 4); row = tbl.NewRow(); |
︙ | ︙ | |||
956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 | /// <param name="strCatalog">The catalog to retrieve, can be null</param> /// <returns>DataTable</returns> private DataTable Schema_Catalogs(string strCatalog) { DataTable tbl = new DataTable("Catalogs"); DataRow row; tbl.Columns.Add("CATALOG_NAME", typeof(string)); tbl.Columns.Add("DESCRIPTION", typeof(string)); tbl.BeginLoadData(); using (SQLiteCommand cmd = new SQLiteCommand("PRAGMA database_list", this)) { using (SQLiteDataReader rd = (SQLiteDataReader)cmd.ExecuteReader()) { while (rd.Read()) { | > | | 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 | /// <param name="strCatalog">The catalog to retrieve, can be null</param> /// <returns>DataTable</returns> private DataTable Schema_Catalogs(string strCatalog) { DataTable tbl = new DataTable("Catalogs"); DataRow row; tbl.Locale = System.Globalization.CultureInfo.InvariantCulture; tbl.Columns.Add("CATALOG_NAME", typeof(string)); tbl.Columns.Add("DESCRIPTION", typeof(string)); tbl.BeginLoadData(); using (SQLiteCommand cmd = new SQLiteCommand("PRAGMA database_list", this)) { using (SQLiteDataReader rd = (SQLiteDataReader)cmd.ExecuteReader()) { while (rd.Read()) { if (strCatalog == null || String.Compare(rd.GetString(1), strCatalog, true, System.Globalization.CultureInfo.CurrentCulture) == 0) { row = tbl.NewRow(); row["CATALOG_NAME"] = rd.GetString(1); tbl.Rows.Add(row); } } } |
︙ | ︙ |
Changes to System.Data.SQLite/SQLiteConnectionStringBuilder.cs.
︙ | ︙ | |||
73 74 75 76 77 78 79 | /// <summary> /// Gets/Sets the default version of the SQLite engine to instantiate. Currently the only valid value is 3, indicating version 3 of the sqlite library. /// </summary> public int Version { get { | | | | 73 74 75 76 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 102 103 104 105 | /// <summary> /// Gets/Sets the default version of the SQLite engine to instantiate. Currently the only valid value is 3, indicating version 3 of the sqlite library. /// </summary> public int Version { get { return Convert.ToInt32(this["Version"], System.Globalization.CultureInfo.InvariantCulture); } set { if (value != 3) throw new NotSupportedException(); this["Version"] = value; } } /// <summary> /// Gets/Sets the synchronous mode of the connection string. Default is "Normal". /// </summary> public SyncMode SyncMode { get { string s = this["Synchronous"].ToString().ToUpper(System.Globalization.CultureInfo.CurrentCulture); switch (s) { case "FULL": return SyncMode.Full; case "OFF": return SyncMode.Off; default: |
︙ | ︙ | |||
119 120 121 122 123 124 125 | /// <summary> /// Gets/Sets the encoding for the connection string. The default is "False" which indicates UTF-8 encoding. /// </summary> public bool UseUTF16Encoding { get { | | | 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 | /// <summary> /// Gets/Sets the encoding for the connection string. The default is "False" which indicates UTF-8 encoding. /// </summary> public bool UseUTF16Encoding { get { return (String.Compare(this["UseUTF16Encoding"].ToString(), "True", true, System.Globalization.CultureInfo.InvariantCulture) == 0); } set { this["UseUTF16Encoding"] = ((value == true) ? "True" : "False"); } } |
︙ | ︙ | |||
149 150 151 152 153 154 155 | /// <summary> /// Gets/Sets the page size for the connection. /// </summary> public int PageSize { get { | | | | | 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 | /// <summary> /// Gets/Sets the page size for the connection. /// </summary> public int PageSize { get { return Convert.ToInt32(this["Page Size"], System.Globalization.CultureInfo.InvariantCulture); } set { this["Page Size"] = value; } } /// <summary> /// Gets/Sets the cache size for the connection. /// </summary> public int CacheSize { get { return Convert.ToInt32(this["Cache Size"], System.Globalization.CultureInfo.InvariantCulture); } set { this["Cache Size"] = value; } } /// <summary> /// Gets/Sets the datetime format for the connection. /// </summary> public DateTimeFormat DateTimeFormat { get { switch (this["DateTimeFormat"].ToString().ToUpper(System.Globalization.CultureInfo.InvariantCulture)) { case "TICKS": return DateTimeFormat.Ticks; default: return DateTimeFormat.ISO8601; } } |
︙ | ︙ |
Changes to System.Data.SQLite/SQLiteConvert.cs.
︙ | ︙ | |||
80 81 82 83 84 85 86 87 88 89 90 91 92 93 | /// </summary> internal DbType Type; /// <summary> /// The affinity of a column, used for expressions or when Type is DbType.Object /// </summary> internal TypeAffinity Affinity; } /// <summary> /// This base class provides datatype conversion services for the SQLite provider. /// </summary> public abstract class SQLiteConvert { /// <summary> | > > > > > > > > > > > > | 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 | /// </summary> internal DbType Type; /// <summary> /// The affinity of a column, used for expressions or when Type is DbType.Object /// </summary> internal TypeAffinity Affinity; } internal struct SQLiteTypeNames { internal SQLiteTypeNames(string newtypeName, DbType newdataType) { typeName = newtypeName; dataType = newdataType; } internal string typeName; internal DbType dataType; } /// <summary> /// This base class provides datatype conversion services for the SQLite provider. /// </summary> public abstract class SQLiteConvert { /// <summary> |
︙ | ︙ | |||
190 191 192 193 194 195 196 | /// <param name="dateText">The string containing either a Tick value or an ISO8601-format string</param> /// <returns>A DateTime value</returns> public DateTime ToDateTime(string dateText) { switch (_datetimeFormat) { case DateTimeFormat.Ticks: | | | 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 | /// <param name="dateText">The string containing either a Tick value or an ISO8601-format string</param> /// <returns>A DateTime value</returns> public DateTime ToDateTime(string dateText) { switch (_datetimeFormat) { case DateTimeFormat.Ticks: return new DateTime(Convert.ToInt64(dateText, System.Globalization.CultureInfo.InvariantCulture)); default: return DateTime.ParseExact(dateText, _datetimeFormats, System.Globalization.DateTimeFormatInfo.InvariantInfo, System.Globalization.DateTimeStyles.None); } } ///// <summary> ///// Attempt to convert the specified string to a datetime value. |
︙ | ︙ | |||
234 235 236 237 238 239 240 | /// <param name="dateValue">The DateTime value to convert</param> /// <returns>Either a string consisting of the tick count for DateTimeFormat.Ticks, or a date/time in ISO8601 format.</returns> public string ToString(DateTime dateValue) { switch (_datetimeFormat) { case DateTimeFormat.Ticks: | | | | 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 | /// <param name="dateValue">The DateTime value to convert</param> /// <returns>Either a string consisting of the tick count for DateTimeFormat.Ticks, or a date/time in ISO8601 format.</returns> public string ToString(DateTime dateValue) { switch (_datetimeFormat) { case DateTimeFormat.Ticks: return dateValue.Ticks.ToString(System.Globalization.CultureInfo.InvariantCulture); default: return dateValue.ToString(_datetimeFormats[0], System.Globalization.CultureInfo.InvariantCulture); } } /// <summary> /// Internal function to convert a UTF-8 encoded IntPtr of the specified length to a DateTime. /// </summary> /// <remarks> |
︙ | ︙ | |||
494 495 496 497 498 499 500 | /// </summary> /// <param name="Name">The name of the type to match</param> /// <returns>The .NET DBType the text evaluates to.</returns> internal static DbType TypeNameToDbType(string Name) { if (Name == null) return DbType.Object; | | > | < | < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > | 506 507 508 509 510 511 512 513 514 515 516 517 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 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 | /// </summary> /// <param name="Name">The name of the type to match</param> /// <returns>The .NET DBType the text evaluates to.</returns> internal static DbType TypeNameToDbType(string Name) { if (Name == null) return DbType.Object; int x = _typeNames.Length; for (int n = 0; n < x; n++) { if (System.Globalization.CultureInfo.InvariantCulture.CompareInfo.IndexOf(Name, _typeNames[n].typeName, System.Globalization.CompareOptions.IgnoreCase) > -1) return _typeNames[n].dataType; } return DbType.Object; } #endregion private static SQLiteTypeNames[] _typeNames = { new SQLiteTypeNames("LONGTEXT", DbType.String), new SQLiteTypeNames("LONGCHAR", DbType.String), new SQLiteTypeNames("SMALLINT", DbType.Int16), new SQLiteTypeNames("BIGINT", DbType.Int64), new SQLiteTypeNames("COUNTER", DbType.Int64), new SQLiteTypeNames("AUTOINCREMENT", DbType.Int64), new SQLiteTypeNames("IDENTITY", DbType.Int64), new SQLiteTypeNames("LONG", DbType.Int64), new SQLiteTypeNames("TINYINT", DbType.Byte), new SQLiteTypeNames("INTEGER", DbType.Int64), new SQLiteTypeNames("INT", DbType.Int32), new SQLiteTypeNames("TEXT", DbType.String), new SQLiteTypeNames("DOUBLE", DbType.Double), new SQLiteTypeNames("FLOAT", DbType.Double), new SQLiteTypeNames("REAL", DbType.Single), new SQLiteTypeNames("BIT", DbType.Boolean), new SQLiteTypeNames("YESNO", DbType.Boolean), new SQLiteTypeNames("LOGICAL", DbType.Boolean), new SQLiteTypeNames("BOOL", DbType.Boolean), new SQLiteTypeNames("NUMERIC", DbType.Decimal), new SQLiteTypeNames("DECIMAL", DbType.Decimal), new SQLiteTypeNames("MONEY", DbType.Decimal), new SQLiteTypeNames("CURRENCY", DbType.Decimal), new SQLiteTypeNames("TIME", DbType.DateTime), new SQLiteTypeNames("DATE", DbType.DateTime), new SQLiteTypeNames("BLOB", DbType.Binary), new SQLiteTypeNames("BINARY", DbType.Binary), new SQLiteTypeNames("IMAGE", DbType.Binary), new SQLiteTypeNames("GENERAL", DbType.Binary), new SQLiteTypeNames("OLEOBJECT", DbType.Binary), new SQLiteTypeNames("GUID", DbType.Guid), new SQLiteTypeNames("UNIQUEIDENTIFIER", DbType.Guid), new SQLiteTypeNames("MEMO", DbType.String), new SQLiteTypeNames("NOTE", DbType.String), new SQLiteTypeNames("CHAR", DbType.String), }; } } |
Changes to System.Data.SQLite/SQLiteDataReader.cs.
︙ | ︙ | |||
211 212 213 214 215 216 217 | /// Retrieves the column as a boolean value /// </summary> /// <param name="i">The index of the column to retrieve</param> /// <returns>bool</returns> public override bool GetBoolean(int i) { VerifyType(i, DbType.Boolean); | | | 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 | /// Retrieves the column as a boolean value /// </summary> /// <param name="i">The index of the column to retrieve</param> /// <returns>bool</returns> public override bool GetBoolean(int i) { VerifyType(i, DbType.Boolean); return Convert.ToBoolean(GetValue(i), System.Globalization.CultureInfo.CurrentCulture); } /// <summary> /// Retrieves the column as a single byte value /// </summary> /// <param name="i">The index of the column to retrieve</param> /// <returns>byte</returns> |
︙ | ︙ | |||
429 430 431 432 433 434 435 436 437 438 439 440 441 442 | DataTable tbl = new DataTable("Schema"); string[] arName; string strTable; string strCatalog; DataRow row; tbl.Columns.Add(SchemaTableColumn.ColumnName, typeof(String)); tbl.Columns.Add(SchemaTableColumn.ColumnOrdinal, typeof(Int32)); tbl.Columns.Add(SchemaTableColumn.ColumnSize, typeof(Int32)); tbl.Columns.Add(SchemaTableColumn.NumericPrecision, typeof(Int32)); tbl.Columns.Add(SchemaTableColumn.NumericScale, typeof(Int32)); tbl.Columns.Add(SchemaTableColumn.DataType, typeof(Type)); tbl.Columns.Add(SchemaTableColumn.ProviderType, typeof(Int32)); | > | 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 | DataTable tbl = new DataTable("Schema"); string[] arName; string strTable; string strCatalog; DataRow row; tbl.Locale = System.Globalization.CultureInfo.InvariantCulture; tbl.Columns.Add(SchemaTableColumn.ColumnName, typeof(String)); tbl.Columns.Add(SchemaTableColumn.ColumnOrdinal, typeof(Int32)); tbl.Columns.Add(SchemaTableColumn.ColumnSize, typeof(Int32)); tbl.Columns.Add(SchemaTableColumn.NumericPrecision, typeof(Int32)); tbl.Columns.Add(SchemaTableColumn.NumericScale, typeof(Int32)); tbl.Columns.Add(SchemaTableColumn.DataType, typeof(Type)); tbl.Columns.Add(SchemaTableColumn.ProviderType, typeof(Int32)); |
︙ | ︙ | |||
502 503 504 505 506 507 508 | if (arName.Length > 2) strCatalog = arName[arName.Length - 3]; // If we have a table-bound column, extract the extra information from it if (arName.Length > 1) { | | | | | | 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 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 544 545 546 547 548 549 | if (arName.Length > 2) strCatalog = arName[arName.Length - 3]; // If we have a table-bound column, extract the extra information from it if (arName.Length > 1) { using (SQLiteCommand cmdTable = new SQLiteCommand(String.Format(System.Globalization.CultureInfo.CurrentCulture, "PRAGMA [{1}].TABLE_INFO([{0}])", strTable, strCatalog), cnn)) { if (arName.Length < 3) strCatalog = ""; using (DbDataReader rdTable = cmdTable.ExecuteReader()) { while (rdTable.Read()) { if (String.Compare(arName[arName.Length - 1], rdTable.GetString(1), true, System.Globalization.CultureInfo.CurrentCulture) == 0) { string strType = rdTable.GetString(2); string[] arSize = strType.Split('('); if (arSize.Length > 1) { arSize = arSize[1].Split(')'); if (arSize.Length > 1) row["ColumnSize"] = Convert.ToInt32(arSize[0], System.Globalization.CultureInfo.InvariantCulture); } bool bNotNull = rdTable.GetBoolean(3); bool bPrimaryKey = rdTable.GetBoolean(5); row[SchemaTableColumn.BaseTableName] = strTable; row[SchemaTableColumn.BaseColumnName] = rdTable.GetString(1); if (strCatalog.Length > 0) { row[SchemaTableOptionalColumn.BaseColumnNamespace] = strCatalog; row[SchemaTableColumn.BaseSchemaName] = strCatalog; } row[SchemaTableColumn.AllowDBNull] = (!bNotNull && !bPrimaryKey); row[SchemaTableColumn.IsUnique] = bPrimaryKey; row[SchemaTableColumn.IsKey] = bPrimaryKey; row[SchemaTableOptionalColumn.IsAutoIncrement] = (bPrimaryKey && String.Compare(strType, "Integer", true, System.Globalization.CultureInfo.InvariantCulture) == 0); row[SchemaTableOptionalColumn.IsReadOnly] = !(bool)row[SchemaTableOptionalColumn.IsAutoIncrement]; if (rdTable.IsDBNull(4) == false) row[SchemaTableOptionalColumn.DefaultValue] = rdTable[4]; break; } } } |
︙ | ︙ |
Changes to System.Data.SQLite/SQLiteException.cs.
︙ | ︙ | |||
11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 | using System.Collections.Generic; using System.Text; using System.Data.Common; #if !PLATFORM_COMPACTFRAMEWORK using System.Runtime.Serialization; #endif /// <summary> /// SQLite exception class. /// </summary> #if !PLATFORM_COMPACTFRAMEWORK [Serializable] #endif public sealed class SQLiteException : Exception { | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | < < < < | > > > > > > > > > > > > | | | | | | > > > > > > > > | | | | | | | > | > | | < | < | < | < | < < < | < | < | < | < | < | < | < | < | < | < | < | < | < | < | < | < | < | < | < | | < < | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 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 102 103 104 105 106 107 108 109 110 111 112 113 114 115 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 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 | using System.Collections.Generic; using System.Text; using System.Data.Common; #if !PLATFORM_COMPACTFRAMEWORK using System.Runtime.Serialization; #endif /// <summary> /// SQLite error codes /// </summary> public enum SQLiteErrorCode { /// <summary> /// Success /// </summary> Ok = 0, /// <summary> /// SQL error or missing database /// </summary> Error, /// <summary> /// Internal logic error in SQLite /// </summary> Internal, /// <summary> /// Access permission denied /// </summary> Perm, /// <summary> /// Callback routine requested an abort /// </summary> Abort, /// <summary> /// The database file is locked /// </summary> Busy, /// <summary> /// A table in the database is locked /// </summary> Locked, /// <summary> /// malloc() failed /// </summary> NoMem, /// <summary> /// Attempt to write a read-only database /// </summary> ReadOnly, /// <summary> /// Operation terminated by sqlite3_interrupt() /// </summary> Interrupt, /// <summary> /// Some kind of disk I/O error occurred /// </summary> IOErr, /// <summary> /// The database disk image is malformed /// </summary> Corrupt, /// <summary> /// Table or record not found /// </summary> NotFound, /// <summary> /// Insertion failed because database is full /// </summary> Full, /// <summary> /// Unable to open the database file /// </summary> CantOpen, /// <summary> /// Database lock protocol error /// </summary> Protocol, /// <summary> /// Database is empty /// </summary> Empty, /// <summary> /// The database schema changed /// </summary> Schema, /// <summary> /// Too much data for one row of a table /// </summary> TooBig, /// <summary> /// Abort due to constraint violation /// </summary> Constraint, /// <summary> /// Data type mismatch /// </summary> Mismatch, /// <summary> /// Library used incorrectly /// </summary> Misuse, /// <summary> /// Uses OS features not supported on host /// </summary> NOLFS, /// <summary> /// Authorization denied /// </summary> Auth, /// <summary> /// Auxiliary database format error /// </summary> Format, /// <summary> /// 2nd parameter to sqlite3_bind out of range /// </summary> Range, /// <summary> /// File opened that is not a database file /// </summary> NotADatabase, /// <summary> /// sqlite3_step() has another row ready /// </summary> Row = 100, /// <summary> /// sqlite3_step() has finished executing /// </summary> Done = 101, } /// <summary> /// SQLite exception class. /// </summary> #if !PLATFORM_COMPACTFRAMEWORK [Serializable] #endif public sealed class SQLiteException : Exception { private SQLiteErrorCode _errorCode; #if !PLATFORM_COMPACTFRAMEWORK private SQLiteException(SerializationInfo info, StreamingContext context) : base(info, context) { } #endif /// <summary> /// Public constructor for generating a SQLite error given the base error code /// </summary> /// <param name="errorCode">The SQLite error code to report</param> /// <param name="extendedInformation">Extra text to go along with the error message text</param> public SQLiteException(int errorCode, string extendedInformation) : base(Initialize(errorCode, extendedInformation)) { _errorCode = (SQLiteErrorCode)errorCode; } /// <summary> /// Various public constructors that just pass along to the base Exception /// </summary> /// <param name="message">Passed verbatim to Exception</param> public SQLiteException(string message) : base(message) { } /// <summary> /// Various public constructors that just pass along to the base Exception /// </summary> public SQLiteException() { } /// <summary> /// Various public constructors that just pass along to the base Exception /// <param name="message">Passed to Exception</param> /// <param name="innerException">Passed to Exception</param> /// </summary> public SQLiteException(string message, Exception innerException) : base(message, innerException) { } /// <summary> /// Retrieves the underlying SQLite error code for this exception /// </summary> public SQLiteErrorCode ErrorCode { get { return _errorCode; } } /// <summary> /// Initializes the exception class with the SQLite error code. /// </summary> /// <param name="errorCode">The SQLite error code</param> /// <param name="errorMessage">A detailed error message</param> /// <returns>An error message string</returns> /// <remarks> /// The SQLite error code is OR'd with 0x800F0000 to generate an HResult /// </remarks> private static string Initialize(int errorCode, string errorMessage) { if (errorMessage == null) errorMessage = ""; if (errorMessage.Length > 0) errorMessage = "\r\n" + errorMessage; return _errorMessages[errorCode] + errorMessage; } private static string[] _errorMessages = { "SQLite OK", "SQLite error", "An internal logic error in SQLite", "Access permission denied", "Callback routine requested an abort", "The database file is locked", "malloc() failed", "Atempt to write a read-only database", "Operation terminated by sqlite3_interrupt()", "Some kind of disk I/O error occurred", "The database disk image is malformed", "Table or record not found", "Insertion failed because the database is full", "Unable to open the database file", "Database lock protocol error", "Database is empty", "The database schema changed", "Too much data for one row of a table", "Abort due to constraint violation", "Data type mismatch", "Library used incorrectly", "Uses OS features not supported on host", "Authorization denied", "Auxiliary database format error", "2nd parameter to sqlite3_bind() out of range", "File opened that is not a database file", }; } } |
Changes to System.Data.SQLite/SQLiteFunction.cs.
︙ | ︙ | |||
274 275 276 277 278 279 280 | switch (SQLiteConvert.TypeToAffinity(t)) { case TypeAffinity.Null: _base.ReturnNull(context); return; case TypeAffinity.Int64: | | | | 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 | switch (SQLiteConvert.TypeToAffinity(t)) { case TypeAffinity.Null: _base.ReturnNull(context); return; case TypeAffinity.Int64: _base.ReturnInt64(context, Convert.ToInt64(returnValue, System.Globalization.CultureInfo.CurrentCulture)); return; case TypeAffinity.Double: _base.ReturnDouble(context, Convert.ToDouble(returnValue, System.Globalization.CultureInfo.CurrentCulture)); return; case TypeAffinity.Text: _base.ReturnText(context, returnValue.ToString()); return; case TypeAffinity.Blob: _base.ReturnBlob(context, (byte[])returnValue); return; |
︙ | ︙ |
Changes to System.Data.SQLite/SQLiteParameterCollection.cs.
︙ | ︙ | |||
128 129 130 131 132 133 134 | } /// <summary> /// Adds a parameter to the collection /// </summary> /// <param name="parameter">The parameter to add</param> /// <returns>A zero-based index of where the parameter is located in the array</returns> | | | | 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 153 154 | } /// <summary> /// Adds a parameter to the collection /// </summary> /// <param name="parameter">The parameter to add</param> /// <returns>A zero-based index of where the parameter is located in the array</returns> public int Add(DbParameter parameter) { int n = -1; if (parameter.ParameterName != null) { n = IndexOf(parameter.ParameterName); } if (n == -1) { n = _parameterList.Count; _parameterList.Add((SQLiteParameter)parameter); } SetParameter(n, parameter); return n; } |
︙ | ︙ | |||
162 163 164 165 166 167 168 | return Add((SQLiteParameter)value); } /// <summary> /// Adds an array of parameters to the collection /// </summary> /// <param name="values">The array of parameters to add</param> | | | 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 | return Add((SQLiteParameter)value); } /// <summary> /// Adds an array of parameters to the collection /// </summary> /// <param name="values">The array of parameters to add</param> public void AddRange(DbParameter[] values) { int x = values.Length; for (int n = 0; n < x; n++) Add(values[n]); } /// <summary> |
︙ | ︙ | |||
257 258 259 260 261 262 263 | /// <param name="parameterName">The name of the parameter to find</param> /// <returns>-1 if not found, otherwise a zero-based index of the parameter</returns> public override int IndexOf(string parameterName) { int x = _parameterList.Count; for (int n = 0; n < x; n++) { | | | 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 | /// <param name="parameterName">The name of the parameter to find</param> /// <returns>-1 if not found, otherwise a zero-based index of the parameter</returns> public override int IndexOf(string parameterName) { int x = _parameterList.Count; for (int n = 0; n < x; n++) { if (String.Compare(parameterName, _parameterList[n].ParameterName, true, System.Globalization.CultureInfo.CurrentCulture) == 0) return n; } return -1; } /// <summary> /// Returns the index of a parameter /// </summary> |
︙ | ︙ | |||
360 361 362 363 364 365 366 | SQLiteStatement stmt; foreach(SQLiteParameter p in _parameterList) { s = p.ParameterName; if (s == null) { | | | 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 | SQLiteStatement stmt; foreach(SQLiteParameter p in _parameterList) { s = p.ParameterName; if (s == null) { s = String.Format(System.Globalization.CultureInfo.InvariantCulture, ";{0}", nUnnamed); nUnnamed++; } int x = _command._statementList.Length; for (n = 0; n < x; n++) { stmt = _command._statementList[n]; |
︙ | ︙ |
Changes to System.Data.SQLite/SQLiteStatement.cs.
︙ | ︙ | |||
69 70 71 72 73 74 75 | _paramValues = new SQLiteParameter[n]; for (x = 0; x < n; x++) { s = _sql.Bind_ParamName(this, x + 1); if (String.IsNullOrEmpty(s)) { | | | 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 | _paramValues = new SQLiteParameter[n]; for (x = 0; x < n; x++) { s = _sql.Bind_ParamName(this, x + 1); if (String.IsNullOrEmpty(s)) { s = String.Format(System.Globalization.CultureInfo.InvariantCulture, ";{0}", nCmdStart); nCmdStart++; } _paramNames[x] = s; _paramValues[x] = null; } } } |
︙ | ︙ | |||
91 92 93 94 95 96 97 | internal void MapParameter(string s, SQLiteParameter p) { if (_paramNames == null) return; int x = _paramNames.Length; for (int n = 0; n < x; n++) { | | | 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 | internal void MapParameter(string s, SQLiteParameter p) { if (_paramNames == null) return; int x = _paramNames.Length; for (int n = 0; n < x; n++) { if (String.Compare(_paramNames[n], s, true, System.Globalization.CultureInfo.CurrentCulture) == 0) { _paramValues[n] = p; break; } } } |
︙ | ︙ | |||
150 151 152 153 154 155 156 | } switch (param.DbType) { case DbType.Date: case DbType.Time: case DbType.DateTime: | | | | | | 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 | } switch (param.DbType) { case DbType.Date: case DbType.Time: case DbType.DateTime: _sql.Bind_DateTime(this, index, Convert.ToDateTime(obj, System.Globalization.CultureInfo.CurrentCulture)); break; case DbType.Int64: case DbType.UInt64: _sql.Bind_Int64(this, index, Convert.ToInt64(obj, System.Globalization.CultureInfo.CurrentCulture)); break; case DbType.Boolean: case DbType.Int16: case DbType.Int32: case DbType.UInt16: case DbType.UInt32: case DbType.SByte: case DbType.Byte: _sql.Bind_Int32(this, index, Convert.ToInt32(obj, System.Globalization.CultureInfo.CurrentCulture)); break; case DbType.Single: case DbType.Double: case DbType.Currency: case DbType.Decimal: _sql.Bind_Double(this, index, Convert.ToDouble(obj, System.Globalization.CultureInfo.CurrentCulture)); break; case DbType.Binary: _sql.Bind_Blob(this, index, (byte[])obj); break; default: _sql.Bind_Text(this, index, obj.ToString()); break; } } } } |
Deleted System.Data.SQLite/System.Data.SQLite.csproj.user.
|
| < < < < < < < |
Changes to readme.htm.
1 2 3 4 5 6 7 | <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> <title></title> </head> <body> ADO.NET 2.0 SQLite Data Provider<br> | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 | <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> <title></title> </head> <body> ADO.NET 2.0 SQLite Data Provider<br> Version 1.0.12 - Aug 5, 2005<br> Interop using SQLite 3.22<br> Written by Robert Simpson (<a href="mailto:robert@blackcastlesoft.com">robert@blackcastlesoft.com</a>)<br> Released to the public domain, use at your own risk!<br> <br> This provider was written and tested using the Visual Studio 2005 Beta 2 release.<br> <br> |
︙ | ︙ | |||
124 125 126 127 128 129 130 | <FONT color="silver">Compile it. </FONT> </li> </ol> <b></b> <h2> <b>Version History</b></h2> <b>1.0.12 - August 2, 2005</b><br> | | | | > | | | | | | | > > > > > > > > > | 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 153 154 155 156 157 158 159 | <FONT color="silver">Compile it. </FONT> </li> </ol> <b></b> <h2> <b>Version History</b></h2> <b>1.0.12 - August 2, 2005</b><br> <UL> <LI> Full support for the Compact Framework. Each build (Debug/Release) now has a platform, either Win32 or Compact Framework. The correct projects are built accordingly. See the <A href="#redist">Distributing SQLite</A> section for information on what files need to be distributed for each platform. <LI> Modified SQLite3.Reset() and Step() functions to transparently handle timeouts while waiting on the database to become available (typically when a writer is waiting on a reader to finish, or a reader is waiting on a writer to finish). <LI> Lots of code cleanup as suggested by the Code Analyzer (FxCop). <LI> Lots of updates to the helpfile. <LI> Statements were already prepared lazily in a SQLiteCommand, but things are relaxed even more now. Statements are now only prepared if the statements haven't been previously prepared and a Prepare() function is called (and the command is associated with a connection) or just prior to the command being executed. </LI></UL> <b>1.0.11 - August 1, 2005</b><br> <ul> <li> <strong>For everything except the Compact Framework, System.Data.SQLite.DLL is now the <em>only</em> DLL required to use this provider!</strong> The assembly is now a multi-module assembly, containing both the native SQLite3 codebase and the C# classes built on top of it. The Compact Framework |
︙ | ︙ |