Back off initial migration to 34

Upgrading from the Havana release to Juno was failing because the
initial Juno migration didn't include a couple of migrations that
weren't in the initial Havana release but were added afterwards.

This change adds the 035 migration from Havana back in and moves
the initial Juno migration back to 034.

Change-Id: I012b3f707659557d1774bae78b1dd652bb1a4dd7
Closes-Bug: #1357498
This commit is contained in:
Brant Knudson 2014-08-17 12:09:26 -05:00
parent 48e508f0c5
commit 84e0218701
3 changed files with 32 additions and 3 deletions

View File

@ -14,4 +14,4 @@
# under the License.
DB_INIT_VERSION = 34
DB_INIT_VERSION = 33

View File

@ -229,8 +229,6 @@ def upgrade(migrate_engine):
# Indexes
sql.Index('ix_token_expires', token.c.expires).create()
sql.Index('ix_token_expires_valid', token.c.expires,
token.c.valid).create()
sql.Index('ix_token_valid', token.c.valid).create()
fkeys = [

View File

@ -0,0 +1,31 @@
# Copyright 2013 Hewlett-Packard Development Company, L.P.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
import sqlalchemy as sql
def upgrade(migrate_engine):
meta = sql.MetaData()
meta.bind = migrate_engine
token = sql.Table('token', meta, autoload=True)
idx = sql.Index('ix_token_expires_valid', token.c.expires, token.c.valid)
idx.create(migrate_engine)
def downgrade(migrate_engine):
meta = sql.MetaData()
meta.bind = migrate_engine
token = sql.Table('token', meta, autoload=True)
idx = sql.Index('ix_token_expires_valid', token.c.expires, token.c.valid)
idx.drop(migrate_engine)