Created
December 3, 2012 02:08
-
-
Save rhelmer/4192161 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 63930a7..076c325 100755 | |
| --- a/socorro/external/postgresql/setupdb_app.py | |
| +++ b/socorro/external/postgresql/setupdb_app.py | |
| @@ -178,6 +178,16 @@ class SocorroDB(App): | |
| with open('sql/roles.sql') as f: | |
| db.execute(f.read()) | |
| + try: | |
| + db.execute('CREATE EXTENSION citext') | |
| + except ProgrammingError, e: | |
| + if re.match( | |
| + 'type "citext" already exists', | |
| + e.pgerror.strip().split('ERROR: ')[1]): | |
| + # already done, no need to rerun | |
| + # pass ok | |
| + pass | |
| + | |
| if not self.no_schema: | |
| with open('sql/schema.sql') as f: | |
| db.execute(f.read(), ['type "citext" already exists'],) | |
| @@ -188,15 +198,6 @@ class SocorroDB(App): | |
| db.execute( | |
| 'ALTER DATABASE %s OWNER TO breakpad_rw' % | |
| self.database_name) | |
| - try: | |
| - db.execute('CREATE EXTENSION citext') | |
| - except ProgrammingError, e: | |
| - if re.match( | |
| - 'type "citext" already exists', | |
| - e.pgerror.strip().split('ERROR: ')[1]): | |
| - # already done, no need to rerun | |
| - # pass ok | |
| - pass | |
| return 0 | |
| if __name__ == '__main__': # pragma: no cover |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment