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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
caosdb
Software
caosdb-server
Merge requests
!41
REL: update changelog, bump version of pom.xml, update DEPENDENCIES
Code
Review changes
Check out branch
Open in Workspace
Download
Patches
Plain diff
Expand sidebar
Merged
REL: update changelog, bump version of pom.xml, update DEPENDENCIES
release-v0.5.0
into
main
Overview
0
Commits
58
Pipelines
2
Changes
2
Merged
Timm Fitschen
requested to merge
release-v0.5.0
into
main
3 years ago
Overview
0
Commits
58
Pipelines
2
Changes
2
0
0
Merge request reports
Viewing commit
b9052587
Prev
Next
Show latest version
2 files
+
13
−
4
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
b9052587
Merge branch 'f-date-time' into 'dev'
· b9052587
Florian Spreckelsen
authored
3 years ago
FIX
#183
See merge request
!37
src/main/java/org/caosdb/server/datatype/DateTimeDatatype.java
+
11
−
4
View file @ b9052587
Edit in single-file editor
Open in Web IDE
Show full file
@@ -37,12 +37,19 @@ public class DateTimeDatatype extends AbstractDatatype {
try
{
if
(
value
instanceof
UTCDateTime
||
value
instanceof
Date
)
{
return
(
DateTimeInterface
)
value
;
}
else
if
(
value
instanceof
GenericValue
)
{
return
DateTimeFactory2
.
valueOf
(((
GenericValue
)
value
).
toDatabaseString
());
}
DateTimeInterface
result
;
if
(
value
instanceof
GenericValue
)
{
result
=
DateTimeFactory2
.
valueOf
(((
GenericValue
)
value
).
toDatabaseString
());
}
else
{
re
turn
DateTimeFactory2
.
valueOf
(
value
.
toString
());
re
sult
=
DateTimeFactory2
.
valueOf
(
value
.
toString
());
}
}
catch
(
final
IllegalArgumentException
e
)
{
// Test if this is storable
result
.
toDatabaseString
();
return
result
;
}
catch
(
final
UnsupportedOperationException
|
IllegalArgumentException
e
)
{
throw
ServerMessages
.
CANNOT_PARSE_DATETIME_VALUE
;
}
}
Loading