Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | The GetSchemaTable method must verify the base table name (for a column) actually refers to a base table before attempting to query its metadata. Pursuant to [baf42ee135]. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
63ae5401bfd3fbba2468b9f7cdaf8625 |
| User & Date: | mistachkin 2018-03-09 17:45:03 |
Context
|
2018-03-09
| ||
| 21:47 | Fix typos in the data reader class that could lead to them returning the wrong value for GetDatabaseName / GetTableName methods. check-in: 785601b768 user: mistachkin tags: trunk | |
| 17:45 | The GetSchemaTable method must verify the base table name (for a column) actually refers to a base table before attempting to query its metadata. Pursuant to [baf42ee135]. check-in: 63ae5401bf user: mistachkin tags: trunk | |
| 17:41 | Further improvements to the catalog name and master table name handling in the connection class. check-in: 9bb5fe6f96 user: mistachkin tags: trunk | |
Changes
Changes to System.Data.SQLite/SQLite3.cs.
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
....
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
2113
|
int len = 0;
return UTF8ToString(UnsafeNativeMethods.sqlite3_column_table_name_interop(stmt._sqlite_stmt, index, ref len), len);
#else
return UTF8ToString(UnsafeNativeMethods.sqlite3_column_table_name(stmt._sqlite_stmt, index), -1);
#endif
}
internal override void ColumnMetaData(string dataBase, string table, string column, ref string dataType, ref string collateSequence, ref bool notNull, ref bool primaryKey, ref bool autoIncrement)
{
IntPtr dataTypePtr = IntPtr.Zero;
IntPtr collSeqPtr = IntPtr.Zero;
int nnotNull = 0;
int nprimaryKey = 0;
int nautoInc = 0;
SQLiteErrorCode n;
................................................................................
n = UnsafeNativeMethods.sqlite3_table_column_metadata_interop(_sql, ToUTF8(dataBase), ToUTF8(table), ToUTF8(column), ref dataTypePtr, ref collSeqPtr, ref nnotNull, ref nprimaryKey, ref nautoInc, ref dtLen, ref csLen);
#else
dtLen = -1;
csLen = -1;
n = UnsafeNativeMethods.sqlite3_table_column_metadata(_sql, ToUTF8(dataBase), ToUTF8(table), ToUTF8(column), ref dataTypePtr, ref collSeqPtr, ref nnotNull, ref nprimaryKey, ref nautoInc);
#endif
if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
dataType = UTF8ToString(dataTypePtr, dtLen);
collateSequence = UTF8ToString(collSeqPtr, csLen);
notNull = (nnotNull == 1);
primaryKey = (nprimaryKey == 1);
autoIncrement = (nautoInc == 1);
}
internal override object GetObject(SQLiteStatement stmt, int index)
{
switch (ColumnAffinity(stmt, index))
{
case TypeAffinity.Int64:
|
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
|
|
>
>
|
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
....
2109
2110
2111
2112
2113
2114
2115
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
|
int len = 0;
return UTF8ToString(UnsafeNativeMethods.sqlite3_column_table_name_interop(stmt._sqlite_stmt, index, ref len), len);
#else
return UTF8ToString(UnsafeNativeMethods.sqlite3_column_table_name(stmt._sqlite_stmt, index), -1);
#endif
}
internal override bool DoesTableExist(
string dataBase,
string table
)
{
string dataType = null; /* NOT USED */
string collateSequence = null; /* NOT USED */
bool notNull = false; /* NOT USED */
bool primaryKey = false; /* NOT USED */
bool autoIncrement = false; /* NOT USED */
return ColumnMetaData(
dataBase, table, null, false, ref dataType,
ref collateSequence, ref notNull, ref primaryKey,
ref autoIncrement);
}
internal override bool ColumnMetaData(string dataBase, string table, string column, bool canThrow, ref string dataType, ref string collateSequence, ref bool notNull, ref bool primaryKey, ref bool autoIncrement)
{
IntPtr dataTypePtr = IntPtr.Zero;
IntPtr collSeqPtr = IntPtr.Zero;
int nnotNull = 0;
int nprimaryKey = 0;
int nautoInc = 0;
SQLiteErrorCode n;
................................................................................
n = UnsafeNativeMethods.sqlite3_table_column_metadata_interop(_sql, ToUTF8(dataBase), ToUTF8(table), ToUTF8(column), ref dataTypePtr, ref collSeqPtr, ref nnotNull, ref nprimaryKey, ref nautoInc, ref dtLen, ref csLen);
#else
dtLen = -1;
csLen = -1;
n = UnsafeNativeMethods.sqlite3_table_column_metadata(_sql, ToUTF8(dataBase), ToUTF8(table), ToUTF8(column), ref dataTypePtr, ref collSeqPtr, ref nnotNull, ref nprimaryKey, ref nautoInc);
#endif
if (canThrow && (n != SQLiteErrorCode.Ok)) throw new SQLiteException(n, GetLastError());
dataType = UTF8ToString(dataTypePtr, dtLen);
collateSequence = UTF8ToString(collSeqPtr, csLen);
notNull = (nnotNull == 1);
primaryKey = (nprimaryKey == 1);
autoIncrement = (nautoInc == 1);
return (n == SQLiteErrorCode.Ok);
}
internal override object GetObject(SQLiteStatement stmt, int index)
{
switch (ColumnAffinity(stmt, index))
{
case TypeAffinity.Int64:
|
Changes to System.Data.SQLite/SQLiteBase.cs.
251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 |
internal abstract string ColumnName(SQLiteStatement stmt, int index);
internal abstract TypeAffinity ColumnAffinity(SQLiteStatement stmt, int index);
internal abstract string ColumnType(SQLiteStatement stmt, int index, ref TypeAffinity nAffinity);
internal abstract int ColumnIndex(SQLiteStatement stmt, string columnName);
internal abstract string ColumnOriginalName(SQLiteStatement stmt, int index);
internal abstract string ColumnDatabaseName(SQLiteStatement stmt, int index);
internal abstract string ColumnTableName(SQLiteStatement stmt, int index);
internal abstract void ColumnMetaData(string dataBase, string table, string column, ref string dataType, ref string collateSequence, ref bool notNull, ref bool primaryKey, ref bool autoIncrement);
internal abstract void GetIndexColumnExtendedInfo(string database, string index, string column, ref int sortMode, ref int onError, ref string collationSequence);
internal abstract object GetObject(SQLiteStatement stmt, int index);
internal abstract double GetDouble(SQLiteStatement stmt, int index);
internal abstract Boolean GetBoolean(SQLiteStatement stmt, int index);
internal abstract SByte GetSByte(SQLiteStatement stmt, int index);
internal abstract Byte GetByte(SQLiteStatement stmt, int index);
|
> | |
251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 |
internal abstract string ColumnName(SQLiteStatement stmt, int index);
internal abstract TypeAffinity ColumnAffinity(SQLiteStatement stmt, int index);
internal abstract string ColumnType(SQLiteStatement stmt, int index, ref TypeAffinity nAffinity);
internal abstract int ColumnIndex(SQLiteStatement stmt, string columnName);
internal abstract string ColumnOriginalName(SQLiteStatement stmt, int index);
internal abstract string ColumnDatabaseName(SQLiteStatement stmt, int index);
internal abstract string ColumnTableName(SQLiteStatement stmt, int index);
internal abstract bool DoesTableExist(string dataBase, string table);
internal abstract bool ColumnMetaData(string dataBase, string table, string column, bool canThrow, ref string dataType, ref string collateSequence, ref bool notNull, ref bool primaryKey, ref bool autoIncrement);
internal abstract void GetIndexColumnExtendedInfo(string database, string index, string column, ref int sortMode, ref int onError, ref string collationSequence);
internal abstract object GetObject(SQLiteStatement stmt, int index);
internal abstract double GetDouble(SQLiteStatement stmt, int index);
internal abstract Boolean GetBoolean(SQLiteStatement stmt, int index);
internal abstract SByte GetSByte(SQLiteStatement stmt, int index);
internal abstract Byte GetByte(SQLiteStatement stmt, int index);
|
Changes to System.Data.SQLite/SQLiteDataReader.cs.
1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 .... 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 .... 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 .... 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 .... 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 |
// 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;
................................................................................
baseCatalogName = (string)row[SchemaTableOptionalColumn.BaseCatalogName];
string baseTableName = String.Empty;
if (row[SchemaTableColumn.BaseTableName] != DBNull.Value)
baseTableName = (string)row[SchemaTableColumn.BaseTableName];
string baseColumnName = String.Empty;
if (row[SchemaTableColumn.BaseColumnName] != DBNull.Value)
baseColumnName = (string)row[SchemaTableColumn.BaseColumnName];
string collSeq = null;
bool bNotNull = false;
................................................................................
string[] arSize;
// Get the column meta data
_command.Connection._sql.ColumnMetaData(
baseCatalogName,
baseTableName,
strColumn,
ref dataType, ref collSeq, ref bNotNull, ref bPrimaryKey, ref bAutoIncrement);
if (bNotNull || bPrimaryKey) row[SchemaTableColumn.AllowDBNull] = false;
bool allowDbNull = (bool)row[SchemaTableColumn.AllowDBNull];
row[SchemaTableColumn.IsKey] = bPrimaryKey && CountParents(parentToColumns) <= 1;
row[SchemaTableOptionalColumn.IsAutoIncrement] = bAutoIncrement;
................................................................................
}
}
}
// Determine IsUnique properly, which is a pain in the butt!
if (wantUniqueInfo)
{
if (baseCatalogName != strCatalog
|| baseTableName != strTable)
{
strCatalog = baseCatalogName;
strTable = baseTableName;
tblIndexes = _command.Connection.GetSchema("Indexes", new string[] {
baseCatalogName,
null,
baseTableName,
null });
}
foreach (DataRow rowIndexes in tblIndexes.Rows)
{
tblIndexColumns = _command.Connection.GetSchema("IndexColumns", new string[] {
baseCatalogName,
null,
................................................................................
row[SchemaTableColumn.IsUnique] = rowIndexes["UNIQUE"];
// If its an integer primary key and the only primary key in the table, then its a rowid alias and is autoincrement
// NOTE: Currently commented out because this is not always the desired behavior. For example, a 1:1 relationship with
// another table, where the other table is autoincrement, but this one is not, and uses the rowid from the other.
// It is safer to only set Autoincrement on tables where we're SURE the user specified AUTOINCREMENT, even if its a rowid column.
if (tblIndexColumns.Rows.Count == 1 && (bool)rowIndexes["PRIMARY_KEY"] == true && String.IsNullOrEmpty(dataType) == false &&
String.Compare(dataType, "integer", StringComparison.OrdinalIgnoreCase) == 0)
{
// row[SchemaTableOptionalColumn.IsAutoIncrement] = true;
}
break;
}
}
}
}
if (String.IsNullOrEmpty(dataType))
{
TypeAffinity affin = TypeAffinity.Uninitialized;
dataType = _activeStatement._sql.ColumnType(_activeStatement, n, ref affin);
}
if (String.IsNullOrEmpty(dataType) == false)
row["DataTypeName"] = dataType;
}
tbl.Rows.Add(row);
}
if (_keyInfo != null)
_keyInfo.AppendSchemaTable(tbl);
tbl.AcceptChanges();
|
> | | > > > | < | > | | < > | < > > > |
1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 .... 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 .... 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 .... 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 .... 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 |
// 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;
SQLiteBase sql = _command.Connection._sql;
GetStatementColumnParents(
sql, _activeStatement, _fieldCount,
ref parentToColumns, ref columnToParent);
DataTable tbl = new DataTable("SchemaTable");
DataTable tblIndexes = null;
DataTable tblIndexColumns;
DataRow row;
string temp;
................................................................................
baseCatalogName = (string)row[SchemaTableOptionalColumn.BaseCatalogName];
string baseTableName = String.Empty;
if (row[SchemaTableColumn.BaseTableName] != DBNull.Value)
baseTableName = (string)row[SchemaTableColumn.BaseTableName];
if (sql.DoesTableExist(baseCatalogName, baseTableName))
{
string baseColumnName = String.Empty;
if (row[SchemaTableColumn.BaseColumnName] != DBNull.Value)
baseColumnName = (string)row[SchemaTableColumn.BaseColumnName];
string collSeq = null;
bool bNotNull = false;
................................................................................
string[] arSize;
// Get the column meta data
_command.Connection._sql.ColumnMetaData(
baseCatalogName,
baseTableName,
strColumn,
true,
ref dataType, ref collSeq, ref bNotNull, ref bPrimaryKey, ref bAutoIncrement);
if (bNotNull || bPrimaryKey) row[SchemaTableColumn.AllowDBNull] = false;
bool allowDbNull = (bool)row[SchemaTableColumn.AllowDBNull];
row[SchemaTableColumn.IsKey] = bPrimaryKey && CountParents(parentToColumns) <= 1;
row[SchemaTableOptionalColumn.IsAutoIncrement] = bAutoIncrement;
................................................................................
}
}
}
// Determine IsUnique properly, which is a pain in the butt!
if (wantUniqueInfo)
{
if (baseCatalogName != strCatalog || baseTableName != strTable)
{
strCatalog = baseCatalogName;
strTable = baseTableName;
tblIndexes = _command.Connection.GetSchema("Indexes", new string[] {
baseCatalogName,
null,
baseTableName,
null
});
}
foreach (DataRow rowIndexes in tblIndexes.Rows)
{
tblIndexColumns = _command.Connection.GetSchema("IndexColumns", new string[] {
baseCatalogName,
null,
................................................................................
row[SchemaTableColumn.IsUnique] = rowIndexes["UNIQUE"];
// If its an integer primary key and the only primary key in the table, then its a rowid alias and is autoincrement
// NOTE: Currently commented out because this is not always the desired behavior. For example, a 1:1 relationship with
// another table, where the other table is autoincrement, but this one is not, and uses the rowid from the other.
// It is safer to only set Autoincrement on tables where we're SURE the user specified AUTOINCREMENT, even if its a rowid column.
//if (tblIndexColumns.Rows.Count == 1 && (bool)rowIndexes["PRIMARY_KEY"] == true && String.IsNullOrEmpty(dataType) == false &&
// String.Compare(dataType, "integer", StringComparison.OrdinalIgnoreCase) == 0)
//{
// // row[SchemaTableOptionalColumn.IsAutoIncrement] = true;
//}
break;
}
}
}
}
}
if (String.IsNullOrEmpty(dataType))
{
TypeAffinity affin = TypeAffinity.Uninitialized;
dataType = _activeStatement._sql.ColumnType(_activeStatement, n, ref affin);
}
if (String.IsNullOrEmpty(dataType) == false)
row["DataTypeName"] = dataType;
}
tbl.Rows.Add(row);
}
if (_keyInfo != null)
_keyInfo.AppendSchemaTable(tbl);
tbl.AcceptChanges();
|