[ovirt-devel] duplicate upgrade scripts -- cannot upgrade db on master

[Greg Sheremeta]

Hi Alona and Roy,

These commits used the same script number, and the database cannot
be upgraded on master.

Thanks,
Greg

commit 354ebb2ac024014987c66d73aa591e749c79fd19
Author: Roy Golan <rgolan at redhat.com>
Date:   Thu Mar 5 00:50:46 2015 +0200

    core: add creation_date to permissions entity
    
    Change-Id: Iedaf56522fc2af4c4cc8da9f5c1c2572fe4de706
    Bug-Url: https://bugzilla.redhat.com/1080029
    Signed-off-by: Roy Golan <rgolan at redhat.com>

M       backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Permission.java
M       backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/PermissionDAODbFacadeImpl.java
M       backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/PermissionDAOTest.java
M       backend/manager/modules/dal/src/test/resources/fixtures.xml
M       packaging/dbscripts/create_views.sql
A       packaging/dbscripts/upgrade/03_06_1100_add_creation_date_to_permissions.sql


commit fb079a64ea6be2a5400a67cd8468e162c52f93c9
Author: Alona Kaplan <alkaplan at redhat.com>
Date:   Tue Mar 24 10:11:49 2015 +0200

    engine: CRUD actions for HostNicVfsConfig
    
    Introducing new table- HostNicVfsConfig and adding crud actions for this
    table.
    
    Change-Id: I022a1d19d935832a8baae41c123322dff0ab779b
    Signed-off-by: Alona Kaplan <alkaplan at redhat.com>

M       backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacade.java
A       backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/HostNicVfsConfigDao.java
A       backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/HostNicVfsConfigDaoDbFacadeImpl.java
M       backend/manager/modules/dal/src/main/jdbc-resources/engine-daos.properties
M       backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/FixturesTool.java
A       backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/HostNicVfsConfigDaoTest.java
M       backend/manager/modules/dal/src/test/resources/fixtures.xml
M       packaging/dbscripts/network_sp.sql
A       packaging/dbscripts/upgrade/03_06_1100_add_host_nic_vfs_config_table.sql



Greg Sheremeta
Red Hat, Inc.
Sr. Software Engineer, RHEV
Cell: 919-807-1086
gshereme at redhat.com