Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
caosdb-server
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
caosdb
Software
caosdb-server
Commits
7bcc1781
Commit
7bcc1781
authored
4 years ago
by
Timm Fitschen
Committed by
Florian Spreckelsen
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
fix SELECT name FROM ENTITY
parent
8409cfe0
No related branches found
No related tags found
2 merge requests
!21
Release v0.4.0
,
!9
fix SELECT name FROM ENTITY
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CHANGELOG.md
+2
-0
2 additions, 0 deletions
CHANGELOG.md
Makefile
+1
-1
1 addition, 1 deletion
Makefile
src/main/java/org/caosdb/server/query/Query.java
+8
-6
8 additions, 6 deletions
src/main/java/org/caosdb/server/query/Query.java
with
11 additions
and
7 deletions
CHANGELOG.md
+
2
−
0
View file @
7bcc1781
...
@@ -29,6 +29,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
...
@@ -29,6 +29,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
### Fixed
*
#130 - Error during
`FIND ENTITY`
when
`QUERY_FILTER_ENTITIES_WITHOUT_RETRIEVE_PERMISSIONS=False`
.
*
#125 -
`bend_symlinks`
script did not allow whitespace in filename.
*
#125 -
`bend_symlinks`
script did not allow whitespace in filename.
*
#122 - Dead-lock due to error in the DatabaseAccessManager.
*
#122 - Dead-lock due to error in the DatabaseAccessManager.
*
#120 - Editing entities that were created with a no longer existing user
*
#120 - Editing entities that were created with a no longer existing user
...
...
This diff is collapsed.
Click to expand it.
Makefile
+
1
−
1
View file @
7bcc1781
...
@@ -64,7 +64,7 @@ antlr:
...
@@ -64,7 +64,7 @@ antlr:
mvn antlr4:antlr4
mvn antlr4:antlr4
test
:
print-version easy-units
test
:
print-version easy-units
MAVEN_DEBUG_OPTS
=
"-Xdebug -Xnoagent -Djava.compiler=NONE -Dcaosdb.debug=true -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=0.0.0.0:
9000
"
MAVEN_DEBUG_OPTS
=
"-Xdebug -Xnoagent -Djava.compiler=NONE -Dcaosdb.debug=true -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=0.0.0.0:
$(
JPDA_PORT
)
"
mvn
test
-X
mvn
test
-X
test_misc
:
test_misc
:
...
...
This diff is collapsed.
Click to expand it.
src/main/java/org/caosdb/server/query/Query.java
+
8
−
6
View file @
7bcc1781
...
@@ -206,7 +206,7 @@ public class Query implements QueryInterface, ToElementable, TransactionInterfac
...
@@ -206,7 +206,7 @@ public class Query implements QueryInterface, ToElementable, TransactionInterfac
}
}
}
}
private
static
boolean
filterEntitiesWithoutRetrievePermisions
=
private
boolean
filterEntitiesWithoutRetrievePermisions
=
!
CaosDBServer
.
getServerProperty
(
!
CaosDBServer
.
getServerProperty
(
ServerProperties
.
KEY_QUERY_FILTER_ENTITIES_WITHOUT_RETRIEVE_PERMISSIONS
)
ServerProperties
.
KEY_QUERY_FILTER_ENTITIES_WITHOUT_RETRIEVE_PERMISSIONS
)
.
equalsIgnoreCase
(
"FALSE"
);
.
equalsIgnoreCase
(
"FALSE"
);
...
@@ -663,13 +663,15 @@ public class Query implements QueryInterface, ToElementable, TransactionInterfac
...
@@ -663,13 +663,15 @@ public class Query implements QueryInterface, ToElementable, TransactionInterfac
if
(
this
.
container
!=
null
&&
this
.
type
==
Type
.
FIND
)
{
if
(
this
.
container
!=
null
&&
this
.
type
==
Type
.
FIND
)
{
for
(
final
IdVersionPair
p
:
this
.
resultSet
)
{
for
(
final
IdVersionPair
p
:
this
.
resultSet
)
{
final
Entity
e
=
new
RetrieveEntity
(
p
.
id
,
p
.
version
);
if
(
p
.
id
>
99
)
{
final
Entity
e
=
new
RetrieveEntity
(
p
.
id
,
p
.
version
);
// if query has select-clause:
// if query has select-clause:
if
(
this
.
selections
!=
null
&&
!
this
.
selections
.
isEmpty
())
{
if
(
this
.
selections
!=
null
&&
!
this
.
selections
.
isEmpty
())
{
e
.
addSelections
(
this
.
selections
);
e
.
addSelections
(
this
.
selections
);
}
this
.
container
.
add
(
e
);
}
}
this
.
container
.
add
(
e
);
}
}
}
}
return
this
;
return
this
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment