aboutsummaryrefslogtreecommitdiffstats
path: root/bin/update-schema
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@mysociety.org>2015-11-20 21:37:17 +0000
committerMatthew Somerville <matthew@mysociety.org>2015-12-02 17:41:42 +0000
commit23949e52f20020fa56cd54655a487ef97ebbc222 (patch)
treefd8a58a3b6df905851ecbed5d83919d7d9d88ed1 /bin/update-schema
parentd48de55d99bd55b28c5aa0fd9f095e9c918b52cb (diff)
Remove many uses of mySociety::Config.
Diffstat (limited to 'bin/update-schema')
-rwxr-xr-xbin/update-schema13
1 files changed, 6 insertions, 7 deletions
diff --git a/bin/update-schema b/bin/update-schema
index 1af08b002..c6b197deb 100755
--- a/bin/update-schema
+++ b/bin/update-schema
@@ -39,20 +39,19 @@ BEGIN {
require "$bin_dir/../setenv.pl";
}
-use mySociety::Config;
+use FixMyStreet;
use mySociety::DBHandle qw(dbh);
use mySociety::MaPit;
use Getopt::Long;
use Pod::Usage;
-mySociety::Config::set_file("$bin_dir/../conf/general");
my %args = (
- Name => mySociety::Config::get('FMS_DB_NAME'),
- User => mySociety::Config::get('FMS_DB_USER'),
- Password => mySociety::Config::get('FMS_DB_PASS'),
+ Name => FixMyStreet->config('FMS_DB_NAME'),
+ User => FixMyStreet->config('FMS_DB_USER'),
+ Password => FixMyStreet->config('FMS_DB_PASS'),
);
-$args{Host} = mySociety::Config::get('FMS_DB_HOST', undef) if mySociety::Config::get('FMS_DB_HOST');
-$args{Port} = mySociety::Config::get('FMS_DB_PORT', undef) if mySociety::Config::get('FMS_DB_PORT');
+$args{Host} = FixMyStreet->config('FMS_DB_HOST', undef) if FixMyStreet->config('FMS_DB_HOST');
+$args{Port} = FixMyStreet->config('FMS_DB_PORT', undef) if FixMyStreet->config('FMS_DB_PORT');
mySociety::DBHandle::configure( %args );
my ($commit, $version, $downgrade, $help);