-
Notifications
You must be signed in to change notification settings - Fork 934
Add support for single-argument truncate to dialects that do not support it natively #1597
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
42 changes: 42 additions & 0 deletions
42
src/NHibernate/Dialect/Function/StandardSQLFunctionWithRequiredParameters.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
using System; | ||
using System.Collections; | ||
using System.Linq; | ||
using NHibernate.Engine; | ||
using NHibernate.SqlCommand; | ||
using NHibernate.Type; | ||
|
||
namespace NHibernate.Dialect.Function | ||
{ | ||
/// <summary> | ||
/// A SQL function which substitutes required missing parameters with defaults. | ||
/// </summary> | ||
[Serializable] | ||
internal class StandardSQLFunctionWithRequiredParameters : StandardSQLFunction | ||
{ | ||
private readonly object[] _requiredArgs; | ||
|
||
/// <inheritdoc /> | ||
public StandardSQLFunctionWithRequiredParameters(string name, object[] requiredArgs) | ||
: base(name) | ||
{ | ||
_requiredArgs = requiredArgs; | ||
} | ||
|
||
/// <inheritdoc /> | ||
public StandardSQLFunctionWithRequiredParameters(string name, IType typeValue, object[] requiredArgs) | ||
: base(name, typeValue) | ||
{ | ||
_requiredArgs = requiredArgs; | ||
} | ||
|
||
/// <inheritdoc /> | ||
public override SqlString Render(IList args, ISessionFactoryImplementor factory) | ||
{ | ||
var combinedArgs = | ||
args.Cast<object>() | ||
.Concat(_requiredArgs.Skip(args.Count)) | ||
.ToArray(); | ||
return base.Render(combinedArgs, factory); | ||
} | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -140,12 +140,13 @@ protected virtual void RegisterMathFunctions() | |
RegisterFunction("radians", new StandardSQLFunction("radians", NHibernateUtil.Double)); | ||
RegisterFunction("rand", new StandardSQLFunction("rand", NHibernateUtil.Double)); | ||
RegisterFunction("remainder", new StandardSQLFunction("remainder")); | ||
RegisterFunction("round", new StandardSQLFunction("round")); | ||
RegisterFunction("round", new StandardSQLFunctionWithRequiredParameters("round", new object[] {null, "0"})); | ||
RegisterFunction("sign", new StandardSQLFunction("sign", NHibernateUtil.Int32)); | ||
RegisterFunction("sin", new StandardSQLFunction("sin", NHibernateUtil.Double)); | ||
RegisterFunction("sqrt", new StandardSQLFunction("sqrt", NHibernateUtil.Double)); | ||
RegisterFunction("tan", new StandardSQLFunction("tan", NHibernateUtil.Double)); | ||
RegisterFunction("truncate", new StandardSQLFunction("truncate")); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Removed, it was an invalid registration. |
||
RegisterFunction("truncnum", new StandardSQLFunctionWithRequiredParameters("truncnum", new object[] {null, "0"})); | ||
RegisterFunction("truncate", new StandardSQLFunctionWithRequiredParameters("truncnum", new object[] {null, "0"})); | ||
} | ||
|
||
protected virtual void RegisterXmlFunctions() | ||
|
@@ -343,8 +344,6 @@ protected virtual void RegisterMiscellaneousFunctions() | |
RegisterFunction("transactsql", new StandardSQLFunction("transactsql", NHibernateUtil.String)); | ||
RegisterFunction("varexists", new StandardSQLFunction("varexists", NHibernateUtil.Int32)); | ||
RegisterFunction("watcomsql", new StandardSQLFunction("watcomsql", NHibernateUtil.String)); | ||
RegisterFunction("truncnum", new StandardSafeSQLFunction("truncnum", 2)); | ||
RegisterFunction("truncate", new StandardSafeSQLFunction("truncnum", 2)); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Moved to |
||
} | ||
|
||
#region private static readonly string[] DialectKeywords = { ... } | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As written here, I consider supporting dialect specific names (
trunc
here) as a bad practice. But since there is some disagreement about this, I will not fight against it and so I am still adding it here.