Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/NHibernate.Test/NHibernate.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<Reference Include="System.Threading.Tasks" />
<Reference Include="System.Data.OracleClient" />
<PackageReference Include="Microsoft.SqlServer.Compact" Version="4.0.8876.1" />
<PackageReference Include="Oracle.ManagedDataAccess" Version="21.14.0" />
<PackageReference Include="Oracle.ManagedDataAccess" Version="23.9.1" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.0" />
Expand All @@ -86,7 +86,7 @@
<PackageReference Include="System.Data.OracleClient" Version="1.0.8">
<ExcludeAssets>compile</ExcludeAssets>
</PackageReference>
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.140" />
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="23.9.1" />
<PackageReference Include="System.Data.Odbc" Version="4.7.0" />
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
<PackageReference Include="NUnitLite" Version="3.14.0" />
Expand Down
18 changes: 6 additions & 12 deletions src/NHibernate/Dialect/Oracle9iDialect.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,10 @@ namespace NHibernate.Dialect
{
public class Oracle9iDialect : Oracle8iDialect
{
public override string CurrentTimestampSelectString
{
get { return "select systimestamp from dual"; }
}
public override string CurrentTimestampSelectString =>
$"select {CurrentTimestampSQLFunctionName} from dual";

public override string CurrentTimestampSQLFunctionName
{
get
{
// the standard SQL function name is current_timestamp...
return "current_timestamp";
}
}
public override string CurrentTimestampSQLFunctionName => "localtimestamp";

// Current_timestamp is a timestamp with time zone, so it can always be converted back to UTC.
/// <inheritdoc />
Expand All @@ -46,6 +37,9 @@ protected override void RegisterFunctions()
{
base.RegisterFunctions();

RegisterFunction(
"current_timestamp",
new NoArgSQLFunction("localtimestamp", NHibernateUtil.LocalDateTime, false));
RegisterFunction(
"current_utctimestamp",
new SQLFunctionTemplate(NHibernateUtil.UtcDateTime, "SYS_EXTRACT_UTC(current_timestamp)"));
Expand Down
Loading