mirror of
https://github.com/dbeaver/cloudbeaver.git
synced 2026-09-24 16:04:36 +08:00
Merge remote-tracking branch 'origin/devel' into feat-access-managment
This commit is contained in:
@@ -127,6 +127,9 @@ type DriverInfo {
|
||||
# Driver Java class name
|
||||
driverClassName: String
|
||||
defaultPort: String
|
||||
defaultDatabase: String
|
||||
defaultServer: String
|
||||
defaultUser: String
|
||||
sampleURL: String
|
||||
driverInfoURL: String
|
||||
driverPropertiesURL: String
|
||||
|
||||
+15
@@ -87,6 +87,21 @@ public class WebDatabaseDriverConfig {
|
||||
return driver.getDefaultPort();
|
||||
}
|
||||
|
||||
@Property
|
||||
public String getDefaultDatabase() {
|
||||
return driver.getDefaultDatabase();
|
||||
}
|
||||
|
||||
@Property
|
||||
public String getDefaultServer() {
|
||||
return driver.getDefaultServer();
|
||||
}
|
||||
|
||||
@Property
|
||||
public String getDefaultUser() {
|
||||
return driver.getDefaultUser();
|
||||
}
|
||||
|
||||
@Property
|
||||
public String getSampleURL() {
|
||||
return driver.getSampleURL();
|
||||
|
||||
+1
-1
@@ -556,7 +556,7 @@ class CBSecurityController implements DBWSecurityController {
|
||||
{
|
||||
StringBuilder sql = new StringBuilder("SELECT DA.DATASOURCE_ID,DA.SUBJECT_ID,S.SUBJECT_TYPE FROM CB_DATASOURCE_ACCESS DA,\n" +
|
||||
"CB_AUTH_SUBJECT S\nWHERE S.SUBJECT_ID = DA.SUBJECT_ID AND DA.SUBJECT_ID IN (");
|
||||
appendStringParameters(sql, subjectIds);
|
||||
appendStringParameters(sql, allSubjects.toArray(new String[0]));
|
||||
sql.append(")");
|
||||
|
||||
if (allSubjects.isEmpty()) {
|
||||
|
||||
Reference in New Issue
Block a user