Skip to content

Fixed issue with Postgres driver and Jetbrains DataGrip #138

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.

Sign up for GitHub

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 1 commit into from
Oct 14, 2021
Merged

Fixed issue with Postgres driver and Jetbrains DataGrip #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
118 changes: 115 additions & 3 deletions postgresw/src/main/java/com/arcadedb/postgres/PostgresNetworkExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import com.arcadedb.exception.QueryParsingException;
import com.arcadedb.log.LogManager;
import com.arcadedb.network.binary.ChannelBinaryServer;
import com.arcadedb.query.sql.executor.IteratorResultSet;
import com.arcadedb.query.sql.executor.Result;
import com.arcadedb.query.sql.executor.ResultInternal;
import com.arcadedb.query.sql.executor.ResultSet;
Expand Down Expand Up @@ -63,10 +64,16 @@ public enum ERROR_SEVERITY {FATAL, ERROR}
private long processIdSequence = 0;
private static final Map<Long, Pair<Long, PostgresNetworkExecutor>> ACTIVE_SESSIONS = new ConcurrentHashMap<>();
private final Map<String, PostgresPortal> portals = new HashMap<>();
private final boolean DEBUG = false;
private final boolean DEBUG = true;
private final Map<String, Object> connectionProperties = new HashMap<>();
private boolean explicitTransactionStarted = false;
private boolean errorInTransaction = false;
private Set<String> ignoreQueriesAppNames = new HashSet<>(//
List.of("dbvis", "Database Navigator - Pool"));
private Set<String> ignoreQueries = new HashSet<>(//
List.of(//
"select distinct PRIVILEGE_TYPE as PRIVILEGE_NAME from INFORMATION_SCHEMA.USAGE_PRIVILEGES order by PRIVILEGE_TYPE asc"//
));

private interface ReadMessageCallback {
void read(char type, long length) throws IOException;
Expand Down Expand Up @@ -343,7 +350,12 @@ private void queryCommand() {
language = "mongo";
queryText = queryText.substring("{mongo}".length());
}
final ResultSet resultSet = database.command(language, queryText);

final ResultSet resultSet;
if (queryText.startsWith("SET ")) {
resultSet = new IteratorResultSet(Collections.emptyIterator());
} else
resultSet = database.command(language, queryText);

final List<Result> cachedResultset = browseAndCacheResultset(resultSet);

Expand Down Expand Up @@ -566,8 +578,16 @@ private void parseCommand() {
Thread.currentThread().getId());

final String upperCaseText = portal.query.toUpperCase();
if (upperCaseText.startsWith("SET ")) {

if (portal.query.isEmpty() ||//
(ignoreQueriesAppNames.contains(connectionProperties.get("application_name")) &&//
ignoreQueries.contains(portal.query))) {
// RETURN EMPTY RESULT
portal.executed = true;
portal.cachedResultset = new ArrayList<>();
} else if (upperCaseText.startsWith("SAVEPOINT ")) {
portal.ignoreExecution = true;
} else if (upperCaseText.startsWith("SET ")) {
final String q = portal.query.substring("SET ".length());
final String[] parts = q.split("=");

Expand All @@ -580,6 +600,28 @@ private void parseCommand() {
connectionProperties.put(parts[0], parts[1]);

portal.ignoreExecution = true;
} else if (upperCaseText.equals("SELECT VERSION()")) {
portal.executed = true;
portal.cachedResultset = new ArrayList<>();
final Map<String, Object> map = new HashMap<>();
map.put("VERSION", "11.0.0");

final Result result = new ResultInternal(map);
portal.cachedResultset.add(result);

portal.columns = new HashMap<>();
portal.columns.put("VERSION", PostgresType.VARCHAR);
} else if (upperCaseText.equals("SELECT CURRENT_SCHEMA()")) {
portal.executed = true;
portal.cachedResultset = new ArrayList<>();
final Map<String, Object> map = new HashMap<>();
map.put("CURRENT_SCHEMA", database.getName());

final Result result = new ResultInternal(map);
portal.cachedResultset.add(result);

portal.columns = new HashMap<>();
portal.columns.put("CURRENT_SCHEMA", PostgresType.VARCHAR);
} else if (upperCaseText.startsWith("SHOW ")) {
portal.ignoreExecution = true;
} else if ("dbvis".equals(connectionProperties.get("application_name"))) {
Expand Down Expand Up @@ -635,6 +677,76 @@ private void parseCommand() {
portal.columns.put("REF_GENERATION", PostgresType.VARCHAR);
}
}
} else if (portal.query.equals(
"select distinct GRANTEE as USER_NAME, 'N' as IS_EXPIRED, 'N' as IS_LOCKED from INFORMATION_SCHEMA.USAGE_PRIVILEGES order by GRANTEE asc")) {
portal.executed = true;
portal.cachedResultset = new ArrayList<>();
final Map<String, Object> map = new HashMap<>();
map.put("USER_NAME", "root");
map.put("IS_EXPIRED", 'N');
map.put("IS_LOCKED", 'N');
final Result result = new ResultInternal(map);
portal.cachedResultset.add(result);

portal.columns = new HashMap<>();
portal.columns.put("USER_NAME", PostgresType.VARCHAR);
portal.columns.put("IS_EXPIRED", PostgresType.CHAR);
portal.columns.put("IS_LOCKED", PostgresType.CHAR);

} else if (portal.query.equals(
"select CHARACTER_SET_NAME as CHARSET_NAME, -1 as MAX_LENGTH from INFORMATION_SCHEMA.CHARACTER_SETS order by CHARACTER_SET_NAME asc")) {
portal.executed = true;
portal.cachedResultset = new ArrayList<>();
final Map<String, Object> map = new HashMap<>();
map.put("CHARSET_NAME", "UTF-8");
map.put("MAX_LENGTH", -1);
final Result result = new ResultInternal(map);
portal.cachedResultset.add(result);

portal.columns = new HashMap<>();
portal.columns.put("CHARSET_NAME", PostgresType.VARCHAR);
portal.columns.put("MAX_LENGTH", PostgresType.INTEGER);
} else if (//
portal.query.equals(
"select NSPNAME as SCHEMA_NAME, case when lower(NSPNAME)='pg_catalog' then 'Y' else 'N' end as IS_PUBLIC, case when lower(NSPNAME)='information_schema' then 'Y' else 'N' end as IS_SYSTEM, 'N' as IS_EMPTY from PG_CATALOG.PG_NAMESPACE order by NSPNAME asc")
|| portal.query.equals(
"select SCHEMA_NAME, case when lower(SCHEMA_NAME)='pg_catalog' then 'Y' else 'N' end as IS_PUBLIC, case when lower(SCHEMA_NAME)='information_schema' then 'Y' else 'N' end as IS_SYSTEM, 'N' as IS_EMPTY from INFORMATION_SCHEMA.SCHEMATA order by SCHEMA_NAME asc")) {

portal.executed = true;
portal.cachedResultset = new ArrayList<>();

for (String dbName : server.getDatabaseNames()) {
final Map<String, Object> map = new HashMap<>();
map.put("SCHEMA_NAME", dbName);
map.put("IS_PUBLIC", "Y");
map.put("IS_SYSTEM", "N");
map.put("IS_EMPTY", "N");
final Result result = new ResultInternal(map);
portal.cachedResultset.add(result);
}

portal.columns = new HashMap<>();
portal.columns.put("SCHEMA_NAME", PostgresType.VARCHAR);
portal.columns.put("IS_PUBLIC", PostgresType.CHAR);
portal.columns.put("IS_SYSTEM", PostgresType.CHAR);
portal.columns.put("IS_EMPTY", PostgresType.CHAR);
} else if (portal.query.equals(
"SELECT nspname AS TABLE_SCHEM, NULL AS TABLE_CATALOG FROM pg_catalog.pg_namespace WHERE nspname <> 'pg_toast' AND (nspname !~ '^pg_temp_' OR nspname = (pg_catalog.current_schemas(true))[1]) AND (nspname !~ '^pg_toast_temp_' OR nspname = replace((pg_catalog.current_schemas(true))[1], 'pg_temp_', 'pg_toast_temp_')) AND nspname LIKE E'%' ORDER BY TABLE_SCHEM")) {

portal.executed = true;
portal.cachedResultset = new ArrayList<>();

for (DocumentType t : database.getSchema().getTypes()) {
final Map<String, Object> map = new HashMap<>();
map.put("TABLE_SCHEM", t.getName());
map.put("TABLE_CATALOG", database.getName());
final Result result = new ResultInternal(map);
portal.cachedResultset.add(result);
}

portal.columns = new HashMap<>();
portal.columns.put("TABLE_SCHEM", PostgresType.VARCHAR);
portal.columns.put("TABLE_CATALOG", PostgresType.VARCHAR);
} else
portal.statement = SQLEngine.parse(portal.query, (DatabaseInternal) database);

Expand Down
14 changes: 7 additions & 7 deletions postgresw/src/main/java/com/arcadedb/postgres/PostgresNetworkListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ public interface ClientConnected {
void connected();
}

private final ArcadeDBServer server;
private final ServerSocketFactory socketFactory;
private ServerSocket serverSocket;
private final ArcadeDBServer server;
private final ServerSocketFactory socketFactory;
private ServerSocket serverSocket;
private InetSocketAddress inboundAddr;
private volatile boolean active = true;
private final int socketBufferSize = 0;
private final int protocolVersion = -1;
private final String hostName;
private volatile boolean active = true;
private final int socketBufferSize = 0;
private final int protocolVersion = -1;
private final String hostName;
private int port;
private ClientConnected callback;

Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/com/arcadedb/server/security/ServerSecurityDatabaseUser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ public void updateDatabaseConfiguration(final JSONObject configuredGroups) {
databaseAccessMap[DATABASE_ACCESS.getByName(access.getString(i)).ordinal()] = true;
}

public void updateFileAccess(final DatabaseInternal database, final JSONObject configuredGroups) {
public synchronized void updateFileAccess(final DatabaseInternal database, final JSONObject configuredGroups) {
if (configuredGroups == null)
return;

Expand Down