Skip to content

Commit ee0ad01

Browse files
committed
NH-3807 - GetSchema not supported in .netstandard.
1 parent 6230207 commit ee0ad01

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed

src/NHibernate/Dialect/Schema/AbstractDataBaseSchema.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,13 @@ public virtual DataTable GetForeignKeys(string catalog, string schema, string ta
9494
public virtual ISet<string> GetReservedWords()
9595
{
9696
var result = new HashSet<string>();
97+
#if !NETSTANDARD2_0
9798
DataTable dtReservedWords = connection.GetSchema(DbMetaDataCollectionNames.ReservedWords);
9899
foreach (DataRow row in dtReservedWords.Rows)
99100
{
100101
result.Add(row["ReservedWord"].ToString());
101102
}
103+
#endif
102104
return result;
103105
}
104106

@@ -109,4 +111,4 @@ protected virtual string ForeignKeysSchemaName
109111

110112
#endregion
111113
}
112-
}
114+
}

src/NHibernate/Dialect/Schema/SybaseAnywhereMetaData.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,13 @@ public override ITableMetadata GetTableMetadata(DataRow rs, bool extras)
1919
public override ISet<string> GetReservedWords()
2020
{
2121
var result = new HashSet<string>();
22+
#if !NETSTANDARD2_0
2223
DataTable dtReservedWords = Connection.GetSchema(DbMetaDataCollectionNames.ReservedWords);
2324
foreach (DataRow row in dtReservedWords.Rows)
2425
{
2526
result.Add(row["reserved_word"].ToString());
2627
}
28+
#endif
2729
return result;
2830
}
2931

@@ -143,4 +145,4 @@ public SybaseAnywhereForeignKeyMetaData(DataRow rs) : base(rs)
143145
Name = (string) rs["COLUMN_NAME"];
144146
}
145147
}
146-
}
148+
}

src/NHibernate/Driver/NDataReader.cs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,11 @@ public override int Depth
166166
/// <summary></summary>
167167
public override DataTable GetSchemaTable()
168168
{
169+
#if NETSTANDARD2_0
170+
throw new NotSupportedException("GetSchemaTable not supported in NETSTANDARD2_0 implementations");
171+
#else
169172
return GetCurrentResult().GetSchemaTable();
173+
#endif
170174
}
171175

172176
protected override void Dispose(bool disposing)
@@ -466,7 +470,9 @@ private class NResult
466470
private readonly object[][] records;
467471
private int colCount = 0;
468472

473+
#if !NETSTANDARD2_0
469474
private readonly DataTable schemaTable;
475+
#endif
470476

471477
// key = field name
472478
// index = field index
@@ -485,7 +491,9 @@ private class NResult
485491
/// </param>
486492
internal NResult(DbDataReader reader, bool isMidstream)
487493
{
494+
#if !NETSTANDARD2_0
488495
schemaTable = reader.GetSchemaTable();
496+
#endif
489497

490498
List<object[]> recordsList = new List<object[]>();
491499
int rowIndex = 0;
@@ -561,11 +569,13 @@ public string GetName(int colIndex)
561569
return fieldIndexToName[colIndex];
562570
}
563571

572+
#if !NETSTANDARD2_0
564573
/// <summary></summary>
565574
public DataTable GetSchemaTable()
566575
{
567576
return schemaTable;
568577
}
578+
#endif
569579

570580
/// <summary>
571581
///
@@ -635,4 +645,4 @@ public int RowCount
635645
}
636646
}
637647
}
638-
}
648+
}

0 commit comments

Comments
 (0)