Created
November 20, 2012 20:29
-
-
Save rhelmer/4120858 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/socorro/external/postgresql/setupdb_app.py b/socorro/external/postgresql/setupdb_app.py | |
| index 95e8c7e..4e7ba47 100755 | |
| --- a/socorro/external/postgresql/setupdb_app.py | |
| +++ b/socorro/external/postgresql/setupdb_app.py | |
| @@ -139,9 +139,9 @@ class SocorroDB(App): | |
| with PostgreSQLManager(dsn, self.config.logger) as db: | |
| db_version = db.version() | |
| - if not re.match(r'9\.[01][.*]', db_version): | |
| + if not re.match(r'9\.[2][.*]', db_version): | |
| print 'ERROR - unrecognized PostgreSQL vesion: %s' % db_version | |
| - print 'Only 9.0.x and 9.1.x are supported at this time.' | |
| + print 'Only 9.1.x is supported at this time.' | |
| return 1 | |
| if self.config.get('dropdb'): | |
| if 'test' not in self.database_name: | |
| @@ -184,11 +184,7 @@ class SocorroDB(App): | |
| db.execute( | |
| 'ALTER DATABASE %s OWNER TO breakpad_rw' % | |
| self.database_name) | |
| - if re.match(r'9\.0[.*]', db_version): | |
| - with open(self.citext) as f: | |
| - db.execute(f.read()) | |
| - elif re.match(r'9\.[12][.*]', db_version): | |
| - db.execute('CREATE EXTENSION citext from unpackaged') | |
| + db.execute('CREATE EXTENSION citext') | |
| return 0 | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment