System.Data.SQLite

Check-in [c93b891f69]
Login

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

Overview
Comment:Properly handle NULL values in the 'name' column of the results returned by PRAGMA index_info(). Fix for [5251bd0878].
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | tkt-5251bd0878
Files: files | file ages | folders
SHA1: c93b891f69483b6994bd0c43e21b5d70ec7be31b
User & Date: mistachkin 2015-12-11 23:35:06.340
Context
2015-12-12
01:59
Revise fix for [5251bd0878] to use null for the 'COLUMN_NAME' if the original value was DBNull.Value. check-in: f8c2007d48 user: mistachkin tags: tkt-5251bd0878
2015-12-11
23:35
Properly handle NULL values in the 'name' column of the results returned by PRAGMA index_info(). Fix for [5251bd0878]. check-in: c93b891f69 user: mistachkin tags: tkt-5251bd0878
23:10
Add test case for ticket [5251bd0878]. check-in: 5f7617eb79 user: mistachkin tags: tkt-5251bd0878
Changes
Side-by-Side Diff Ignore Whitespace Patch
Changes to System.Data.SQLite/SQLiteConnection.cs.
︙
4753
4754
4755
4756
4757
4758
4759


4760
4761
4762
4763
4764
4765

4766
4767
4768
4769
4770
4771


4772

4773
4774
4775
4776
4777
4778
4779

4753
4754
4755
4756
4757
4758
4759
4760
4761
4762
4763
4764
4765
4766

4767
4768
4769
4770
4771
4772
4773
4774
4775

4776
4777
4778
4779
4780
4781
4782
4783








+
+





-
+






+
+
-
+








                  try
                  {
                    using (SQLiteCommand cmdIndex = new SQLiteCommand(UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, "PRAGMA [{0}].index_info([{1}])", strCatalog, rdIndexes.GetString(1)), this))
                    using (SQLiteDataReader rdIndex = cmdIndex.ExecuteReader())
                    {
                      while (rdIndex.Read())
                      {
                        string columnName = rdIndex.IsDBNull(2) ? String.Empty : rdIndex.GetString(2);

                        row = tbl.NewRow();
                        row["CONSTRAINT_CATALOG"] = strCatalog;
                        row["CONSTRAINT_NAME"] = rdIndexes.GetString(1);
                        row["TABLE_CATALOG"] = strCatalog;
                        row["TABLE_NAME"] = rdIndexes.GetString(2);
                        row["COLUMN_NAME"] = rdIndex.GetString(2);
                        row["COLUMN_NAME"] = columnName;
                        row["INDEX_NAME"] = rdIndexes.GetString(1);
                        row["ORDINAL_POSITION"] = ordinal; // rdIndex.GetInt32(1);

                        string collationSequence = null;
                        int sortMode = 0;
                        int onError = 0;

                        if(!String.IsNullOrEmpty(columnName))
                        _sql.GetIndexColumnExtendedInfo(strCatalog, rdIndexes.GetString(1), rdIndex.GetString(2), ref sortMode, ref onError, ref collationSequence);
                          _sql.GetIndexColumnExtendedInfo(strCatalog, rdIndexes.GetString(1), columnName, ref sortMode, ref onError, ref collationSequence);

                        if (String.IsNullOrEmpty(collationSequence) == false)
                          row["COLLATION_NAME"] = collationSequence;

                        row["SORT_MODE"] = (sortMode == 0) ? "ASC" : "DESC";
                        row["CONFLICT_OPTION"] = onError;
︙