Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
vidjil
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1,688
Issues
1,688
List
Boards
Labels
Service Desk
Milestones
Merge Requests
84
Merge Requests
84
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vidjil
vidjil
Commits
fc95ea04
Commit
fc95ea04
authored
Oct 22, 2020
by
Ryan Herbert
Committed by
Mikaël Salson
Nov 20, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
match sqlite syntax
Set MySQL to use pipes for concat just like SQLITE.
parent
4a234b5c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
server/web2py/applications/vidjil/models/SampleSet.py
server/web2py/applications/vidjil/models/SampleSet.py
+2
-2
server/web2py/applications/vidjil/models/db.py
server/web2py/applications/vidjil/models/db.py
+2
-1
No files found.
server/web2py/applications/vidjil/models/SampleSet.py
View file @
fc95ea04
...
@@ -217,7 +217,7 @@ def get_sample_set_id_from_results_file(results_file_id):
...
@@ -217,7 +217,7 @@ def get_sample_set_id_from_results_file(results_file_id):
return
sample_set_id
return
sample_set_id
def
get_conf_list_select
():
def
get_conf_list_select
():
return
"GROUP_CONCAT(DISTINCT
CONCAT(config.id, ';', config.name, ';',
fused_file.fused_file))"
return
"GROUP_CONCAT(DISTINCT
(config.id || ';' || config.name || ';' ||
fused_file.fused_file))"
def
get_config_ids_select
():
def
get_config_ids_select
():
return
"GROUP_CONCAT(DISTINCT config.id)"
return
"GROUP_CONCAT(DISTINCT config.id)"
...
@@ -229,4 +229,4 @@ def get_group_names_select():
...
@@ -229,4 +229,4 @@ def get_group_names_select():
return
"GROUP_CONCAT(DISTINCT auth_group.role)"
return
"GROUP_CONCAT(DISTINCT auth_group.role)"
def
get_file_sizes_select
():
def
get_file_sizes_select
():
return
"GROUP_CONCAT(DISTINCT
CONCAT(sequence_file.id, ';',
sequence_file.size_file))"
return
"GROUP_CONCAT(DISTINCT
(sequence_file.id || ';' ||
sequence_file.size_file))"
server/web2py/applications/vidjil/models/db.py
View file @
fc95ea04
...
@@ -109,8 +109,9 @@ auth.messages.group_description = 'Group of user %(id)04d - %(first_name)s %(las
...
@@ -109,8 +109,9 @@ auth.messages.group_description = 'Group of user %(id)04d - %(first_name)s %(las
from
gluon.contrib.login_methods.rpx_account
import
use_janrain
from
gluon.contrib.login_methods.rpx_account
import
use_janrain
use_janrain
(
auth
,
filename
=
'private/janrain.key'
)
use_janrain
(
auth
,
filename
=
'private/janrain.key'
)
# TODO: create a custom adapter ?
if
defs
.
DB_ADDRESS
.
split
(
':'
)[
0
]
==
'mysql'
:
if
defs
.
DB_ADDRESS
.
split
(
':'
)[
0
]
==
'mysql'
:
db
.
executesql
(
"SET sql_mode='PIPES_AS_CONCAT,NO_BACKSLASH_ESCAPES
';
"
)
db
.
executesql
(
"SET sql_mode='PIPES_AS_CONCAT,NO_BACKSLASH_ESCAPES
,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION'
"
)
#########################################################################
#########################################################################
## Define your tables below for example
## Define your tables below for example
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment