Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
ensembl-gh-mirror
ensembl-hive
Commits
0a8cd8f4
Commit
0a8cd8f4
authored
Oct 13, 2012
by
Leo Gordon
Browse files
allow database names to contain dashes
parent
ff694cc1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
modules/Bio/EnsEMBL/Hive/PipeConfig/HiveGeneric_conf.pm
modules/Bio/EnsEMBL/Hive/PipeConfig/HiveGeneric_conf.pm
+1
-1
modules/Bio/EnsEMBL/Hive/URLFactory.pm
modules/Bio/EnsEMBL/Hive/URLFactory.pm
+1
-1
No files found.
modules/Bio/EnsEMBL/Hive/PipeConfig/HiveGeneric_conf.pm
View file @
0a8cd8f4
...
...
@@ -109,7 +109,7 @@ sub pipeline_create_commands {
$self
->
db_connect_command
(
$db_conn
)
.
'
<
'
.
$self
->
o
('
ensembl_cvs_root_dir
')
.
'
/ensembl-hive/sql/procedures.sqlite
',
]
:
[
'
mysql
'
.
$self
->
dbconn_2_mysql
(
$db_conn
,
0
)
.
"
-e 'CREATE DATABASE
"
.
$self
->
o
('
pipeline_db
',
'
-dbname
')
.
"
'
",
'
mysql
'
.
$self
->
dbconn_2_mysql
(
$db_conn
,
0
)
.
"
-e 'CREATE DATABASE
`
"
.
$self
->
o
('
pipeline_db
',
'
-dbname
')
.
"
`
'
",
# standard eHive tables, triggers, foreign_keys and procedures:
$self
->
db_connect_command
(
$db_conn
)
.
'
<
'
.
$self
->
o
('
ensembl_cvs_root_dir
')
.
'
/ensembl-hive/sql/tables.sql
',
...
...
modules/Bio/EnsEMBL/Hive/URLFactory.pm
View file @
0a8cd8f4
...
...
@@ -90,7 +90,7 @@ sub fetch {
Bio::EnsEMBL::Hive::
URLFactory
->
new
();
# make sure global instance is created
if
(
my
(
$conn
,
$driver
,
$user
,
$pass
,
$host
,
$port
,
$dbname
,
$table_name
,
$tparam_name
,
$tparam_value
,
$conn_param_string
)
=
$url
=~
m{^((\w*)://(?:(\w+)(?:\:([^/\@]*))?\@)?(?:([\w\-\.]+)(?:\:(\d+))?)?/(\w*))(?:/(\w+)(?:\?(\w+)=(\w+))?)?((?:;(\w+)=(\w+))*)$}
)
{
$url
=~
m{^((\w*)://(?:(\w+)(?:\:([^/\@]*))?\@)?(?:([\w\-\.]+)(?:\:(\d+))?)?/(
[
\w
\-]
*))(?:/(\w+)(?:\?(\w+)=(\w+))?)?((?:;(\w+)=(\w+))*)$}
)
{
my
%conn_param
=
split
(
/[;=]/
,
'
type=hive;discon=0
'
.
$conn_param_string
);
...
...
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