diff options
Diffstat (limited to 'bin/update-schema')
| -rwxr-xr-x | bin/update-schema | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/bin/update-schema b/bin/update-schema index 1af08b002..1393178f8 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); @@ -195,6 +194,7 @@ else { # By querying the database schema, we can see where we're currently at # (assuming schema change files are never half-applied, which should be the case) sub get_db_version { + return '0039' if column_exists('users', 'facebook_id'); return '0038' if column_exists('admin_log', 'time_spent'); return '0037' if table_exists('response_templates'); return '0036' if constraint_contains('problem_cobrand_check', 'a-z0-9_'); |