summaryrefslogtreecommitdiffstats
path: root/config-db/OpenSLX
diff options
context:
space:
mode:
authorOliver Tappe2007-07-21 20:11:04 +0200
committerOliver Tappe2007-07-21 20:11:04 +0200
commitf593fd87df697e132d92330c4e22584a614454e5 (patch)
tree617bc2de21b8294c0a7298a7487f964b1feaa747 /config-db/OpenSLX
parent* added support for automatic selection of most appropriate (newest) kernel (diff)
downloadcore-f593fd87df697e132d92330c4e22584a614454e5.tar.gz
core-f593fd87df697e132d92330c4e22584a614454e5.tar.xz
core-f593fd87df697e132d92330c4e22584a614454e5.zip
* base work towards utf8-cleanness (it is now possible to handle vendor-OSes
whose name contain UTF8-characters * fixed problem with locale-specific number format being used during DB- creation (fixes the problem that database access would only work once for de_DE-locales [reported by Detlef Schulz]) git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1266 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'config-db/OpenSLX')
-rw-r--r--config-db/OpenSLX/MetaDB/SQLite.pm8
-rw-r--r--config-db/OpenSLX/MetaDB/mysql.pm8
2 files changed, 8 insertions, 8 deletions
diff --git a/config-db/OpenSLX/MetaDB/SQLite.pm b/config-db/OpenSLX/MetaDB/SQLite.pm
index f6b395d0..558aebf9 100644
--- a/config-db/OpenSLX/MetaDB/SQLite.pm
+++ b/config-db/OpenSLX/MetaDB/SQLite.pm
@@ -49,10 +49,10 @@ sub connect ## no critic (ProhibitBuiltinHomonyms)
$dbSpec = "dbname=$dbPath/$openslxConfig{'db-name'}";
}
vlog(1, "trying to connect to SQLite-database <$dbSpec>");
- $self->{'dbh'} =
- DBI->connect("dbi:SQLite:$dbSpec", undef, undef,
- {PrintError => 0, AutoCommit => 1})
- or die _tr("Cannot connect to database <%s> (%s)", $dbSpec, $DBI::errstr);
+ $self->{'dbh'} = DBI->connect(
+ "dbi:SQLite:$dbSpec", undef, undef,
+ {PrintError => 0, AutoCommit => 1, unicode => 1}
+ ) or die _tr("Cannot connect to database <%s> (%s)", $dbSpec, $DBI::errstr);
return 1;
}
diff --git a/config-db/OpenSLX/MetaDB/mysql.pm b/config-db/OpenSLX/MetaDB/mysql.pm
index 661b744d..8206ec2a 100644
--- a/config-db/OpenSLX/MetaDB/mysql.pm
+++ b/config-db/OpenSLX/MetaDB/mysql.pm
@@ -46,10 +46,10 @@ sub connect ## no critic (ProhibitBuiltinHomonyms)
}
my $user = (getpwuid($>))[0];
vlog(1, "trying to connect user <$user> to mysql-database <$dbSpec>");
- $self->{'dbh'} =
- DBI->connect("dbi:mysql:$dbSpec", $user, '', {PrintError => 0})
- or die _tr("Cannot connect to database <%s> (%s)", $dbSpec, $DBI::errstr);
- return;
+ $self->{'dbh'} = DBI->connect(
+ "dbi:mysql:$dbSpec", $user, 'secret', {PrintError => 0}
+ ) or die _tr("Cannot connect to database '%s' (%s)", $dbSpec, $DBI::errstr);
+ return 1;
}
sub schemaConvertTypeDescrToNative