SQL: DATABASE() and USER() system functions #35946
Merged
Conversation
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
Extracted a base class for system functions
|
Pinging @elastic/es-search |
matriv
reviewed
Nov 27, 2018
| } | ||
|
|
||
| private String randomMode() { | ||
| return randomFrom("plain", "jdbc", ""); |
There was a problem hiding this comment.
Mode is not visible in the qa project.
matriv
reviewed
Nov 27, 2018
x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/plugin/TransportSqlQueryAction.java
Outdated
Show resolved
Hide resolved
matriv
reviewed
Nov 27, 2018
There was a problem hiding this comment.
Looks good! Left some comments.
- Please also add docs for the new functions.
- Please add the system functions here: https://github.com/elastic/elasticsearch/blob/master/x-pack/plugin/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/jdbc/JdbcDatabaseMetaData.java#L214 Also add the
IFNULLfunction which I somehow missed to add in a previous PR. (ref: https://docs.microsoft.com/en-us/sql/odbc/reference/appendixes/system-functions?view=sql-server-2017)
...in/sql/qa/security/src/test/java/org/elasticsearch/xpack/sql/qa/security/UserFunctionIT.java
Outdated
Show resolved
Hide resolved
...in/sql/qa/security/src/test/java/org/elasticsearch/xpack/sql/qa/security/UserFunctionIT.java
Outdated
Show resolved
Hide resolved
|
|
||
| import static org.elasticsearch.xpack.sql.qa.rest.RestSqlTestCase.columnInfo; | ||
|
|
||
| public class UserFunctionIT extends ESRestTestCase { |
There was a problem hiding this comment.
Nice tests! I have some questions/comments though:
- Maybe add a test that USER() is used in WHERE clause.
- Have a test with null user
- What happens if somehow 2 test methods attempt to create the same user? Maybe we need to delete them after each method is run?
There was a problem hiding this comment.
Added tests with WHERE. null user is handled in https://github.com/elastic/elasticsearch/pull/35946/files#diff-36793f91ca7279a48976a3247c18272fR32. Good point about clashing users, so I've changed the way the usernames are managed.
costin
reviewed
Nov 27, 2018
...in/sql/qa/security/src/test/java/org/elasticsearch/xpack/sql/qa/security/UserFunctionIT.java
Show resolved
Hide resolved
...src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/BaseSystemFunction.java
Show resolved
Hide resolved
...src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/BaseSystemFunction.java
Outdated
Show resolved
Hide resolved
x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/plugin/TransportSqlQueryAction.java
Outdated
Show resolved
Hide resolved
x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/session/Configuration.java
Outdated
Show resolved
Hide resolved
x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/analysis/analyzer/Analyzer.java
Outdated
Show resolved
Hide resolved
* added the functions to jdbc metadata list of functions * more tests * polishing
matriv
reviewed
Nov 28, 2018
| import org.elasticsearch.cluster.service.ClusterService; | ||
| import org.elasticsearch.xpack.core.security.SecurityContext; | ||
|
|
||
| class Transports { |
There was a problem hiding this comment.
can also be final with a private constructor
matriv
approved these changes
Nov 28, 2018
astefan
added a commit
that referenced
this pull request
Nov 28, 2018
(cherry picked from commit aabff73)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR adds two system functions to SQL and is fixing #35863.