You've already forked linux-packaging-mono
Imported Upstream version 6.12.0.86
Former-commit-id: 7a84ce7d08c42c458ac8e74b27186ca863315d79
This commit is contained in:
parent
92747312ea
commit
0b380204a4
@ -42,7 +42,7 @@ namespace System.Data.Common {
|
||||
// a linked list of key/value and their length in _encryptedUsersConnectionString
|
||||
readonly private NameValuePair _keychain;
|
||||
|
||||
// track the existance of "password" or "pwd" in the connection string
|
||||
// track the existence of "password" or "pwd" in the connection string
|
||||
// not used for anything anymore but must keep it set correct for V1.1 serialization
|
||||
readonly private bool _hasPassword;
|
||||
|
||||
|
@ -60,7 +60,7 @@ namespace System.Data.Odbc{
|
||||
new SchemaFunctionName(OdbcMetaDataCollectionNames.Tables,ODBC32.SQL_API.SQLTABLES),
|
||||
new SchemaFunctionName(OdbcMetaDataCollectionNames.Views,ODBC32.SQL_API.SQLTABLES)};
|
||||
|
||||
// verify the existance of the table in the data set
|
||||
// verify the existence of the table in the data set
|
||||
DataTable metaDataCollectionsTable = CollectionDataSet.Tables[DbMetaDataCollectionNames.MetaDataCollections];
|
||||
if (metaDataCollectionsTable == null){
|
||||
throw ADP.UnableToBuildCollection(DbMetaDataCollectionNames.MetaDataCollections);
|
||||
@ -69,7 +69,7 @@ namespace System.Data.Odbc{
|
||||
// copy the table filtering out any rows that don't apply to the current version of the provider
|
||||
metaDataCollectionsTable = CloneAndFilterCollection(DbMetaDataCollectionNames.MetaDataCollections, null);
|
||||
|
||||
// verify the existance of the table in the data set
|
||||
// verify the existence of the table in the data set
|
||||
DataTable restrictionsTable = CollectionDataSet.Tables[DbMetaDataCollectionNames.Restrictions];
|
||||
if (restrictionsTable != null){
|
||||
// copy the table filtering out any rows that don't apply to the current version of the provider
|
||||
@ -747,7 +747,7 @@ namespace System.Data.Odbc{
|
||||
|
||||
|
||||
|
||||
// verify the existance of the table in the data set
|
||||
// verify the existence of the table in the data set
|
||||
DataTable dataTypesTable = CollectionDataSet.Tables[DbMetaDataCollectionNames.DataTypes];
|
||||
if (dataTypesTable == null){
|
||||
throw ADP.UnableToBuildCollection(DbMetaDataCollectionNames.DataTypes);
|
||||
@ -927,13 +927,13 @@ namespace System.Data.Odbc{
|
||||
throw ADP.TooManyRestrictions(DbMetaDataCollectionNames.ReservedWords);
|
||||
}
|
||||
|
||||
// verify the existance of the table in the data set
|
||||
// verify the existence of the table in the data set
|
||||
DataTable reservedWordsTable = CollectionDataSet.Tables[DbMetaDataCollectionNames.ReservedWords];
|
||||
if (reservedWordsTable == null){
|
||||
throw ADP.UnableToBuildCollection(DbMetaDataCollectionNames.ReservedWords);
|
||||
}
|
||||
|
||||
// copy the table filtering out any rows that don't apply to tho current version of the prrovider
|
||||
// copy the table filtering out any rows that don't apply to tho current version of the provider
|
||||
reservedWordsTable = CloneAndFilterCollection(DbMetaDataCollectionNames.ReservedWords, null);
|
||||
|
||||
DataColumn reservedWordColumn = reservedWordsTable.Columns[DbMetaDataColumnNames.ReservedWord];
|
||||
|
@ -61,7 +61,7 @@ namespace System.Data.OleDb{
|
||||
new SchemaRowsetName(OleDbMetaDataCollectionNames.Tables,OleDbSchemaGuid.Tables),
|
||||
new SchemaRowsetName(OleDbMetaDataCollectionNames.Views,OleDbSchemaGuid.Views)};
|
||||
|
||||
// verify the existance of the table in the data set
|
||||
// verify the existence of the table in the data set
|
||||
DataTable metaDataCollectionsTable = CollectionDataSet.Tables[DbMetaDataCollectionNames.MetaDataCollections];
|
||||
if (metaDataCollectionsTable == null){
|
||||
throw ADP.UnableToBuildCollection(DbMetaDataCollectionNames.MetaDataCollections);
|
||||
@ -70,7 +70,7 @@ namespace System.Data.OleDb{
|
||||
// copy the table filtering out any rows that don't apply to the current version of the provider
|
||||
metaDataCollectionsTable = CloneAndFilterCollection(DbMetaDataCollectionNames.MetaDataCollections, null);
|
||||
|
||||
// verify the existance of the table in the data set
|
||||
// verify the existence of the table in the data set
|
||||
DataTable restrictionsTable = CollectionDataSet.Tables[DbMetaDataCollectionNames.Restrictions];
|
||||
if (restrictionsTable != null){
|
||||
// copy the table filtering out any rows that don't apply to the current version of the provider
|
||||
@ -333,7 +333,7 @@ namespace System.Data.OleDb{
|
||||
|
||||
private DataTable GetDataTypesTable(OleDbConnection connection){
|
||||
|
||||
// verify the existance of the table in the data set
|
||||
// verify the existence of the table in the data set
|
||||
DataTable dataTypesTable = CollectionDataSet.Tables[DbMetaDataCollectionNames.DataTypes];
|
||||
if (dataTypesTable == null){
|
||||
throw ADP.UnableToBuildCollection(DbMetaDataCollectionNames.DataTypes);
|
||||
@ -453,7 +453,7 @@ namespace System.Data.OleDb{
|
||||
|
||||
private DataTable GetReservedWordsTable(OleDbConnectionInternal internalConnection){
|
||||
|
||||
// verify the existance of the table in the data set
|
||||
// verify the existence of the table in the data set
|
||||
DataTable reservedWordsTable = CollectionDataSet.Tables[DbMetaDataCollectionNames.ReservedWords];
|
||||
if (null == reservedWordsTable){
|
||||
throw ADP.UnableToBuildCollection(DbMetaDataCollectionNames.ReservedWords);
|
||||
|
@ -194,7 +194,7 @@ namespace System.Data.OleDb {
|
||||
if (!_hasSupportIRow) {
|
||||
object value = command.GetPropertyValue(OleDbPropertySetGuid.Rowset, ODB.DBPROP_IRow);
|
||||
|
||||
// SQLOLEDB always returns VARIANT_FALSE for DBPROP_IROW, so base the answer on existance
|
||||
// SQLOLEDB always returns VARIANT_FALSE for DBPROP_IROW, so base the answer on existence
|
||||
supportIRow = !(value is OleDbPropertyStatus);
|
||||
_supportIRow = supportIRow;
|
||||
_hasSupportIRow = true;
|
||||
|
@ -242,7 +242,7 @@ namespace System.Data.SqlClient{
|
||||
private DataTable GetDataTypesTable(SqlConnection connection){
|
||||
|
||||
|
||||
// verify the existance of the table in the data set
|
||||
// verify the existence of the table in the data set
|
||||
DataTable dataTypesTable = CollectionDataSet.Tables[DbMetaDataCollectionNames.DataTypes];
|
||||
if (dataTypesTable == null){
|
||||
throw ADP.UnableToBuildCollection(DbMetaDataCollectionNames.DataTypes);
|
||||
|
Reference in New Issue
Block a user