mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.0.0.42

Browse Source 
Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mcs/class/referencesource/System.Data/System/Data/DataColumn.cs
View File

@ -669,7 +669,7 @@ namespace System.Data {
Debug.Assert(defaultValue != null, "It should not have been set to null.");
if (defaultValue == DBNull.Value && this.implementsINullable) { // for perf I dont access property
if (_storage != null)
defaultValue = _storage.NullValue;
defaultValue = _storage._nullValue;
else if (this.isSqlType)
defaultValue = SqlConvert.ChangeTypeForDefaultValue(defaultValue, this.dataType, FormatProvider);
else if (this.implementsINullable) {
@ -885,21 +885,21 @@ namespace System.Data {
internal bool IsCloneable {
get {
Debug.Assert(null != _storage, "no storage");
return _storage.IsCloneable;
return _storage._isCloneable;
}
}
internal bool IsStringType {
get {
Debug.Assert(null != _storage, "no storage");
return _storage.IsStringType;
return _storage._isStringType;
}
}
internal bool IsValueType {
get {
Debug.Assert(null != _storage, "no storage");
return _storage.IsValueType;
return _storage._isValueType;
}
}
@ -1204,7 +1204,7 @@ namespace System.Data {
internal void FreeRecord(int record) {
Debug.Assert(null != _storage, "no storage");
_storage.Set(record, _storage.NullValue);
_storage.Set(record, _storage._nullValue);
}
/// <devdoc>
@ -1395,7 +1395,7 @@ namespace System.Data {
return;
if (sortIndex != null) {
if (sortIndex.IsKeyInIndex(_storage.NullValue)) {// here we do use strong typed NULL for Sql types
if (sortIndex.IsKeyInIndex(_storage._nullValue)) {// here we do use strong typed NULL for Sql types
throw ExceptionBuilder.NullKeyValues(ColumnName);
}
}
@ -1573,7 +1573,7 @@ namespace System.Data {
internal bool IsCustomType {
get {
if (null != _storage)
return _storage.IsCustomDefinedType;
return _storage._isCustomDefinedType;
return DataStorage.IsTypeCustomType(DataType);
}
}