Android: Controlling of DB Versions

Question

As I am working on a project that involves multiple developers, and we are using DVCS, each developer will be working on a feature branch assigned to them. That being said, the feature branches are branched out from the latest develop branch. In the develop branch, the db version in the DatabaseHandler is

private static final int DATABASE_VERSION = 2;

In my feature branch, I am required to make a new table. So I have to increase the version to 3, so I can include the following in onUpgrade to execute the CREATE_APPLIANCE_TABLE statement.

@Override
    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
        Log.d("Database onUpgrade", "Old is: " + oldVersion + ". New is: " + newVersion);
        switch(oldVersion) {
            case 1:
            db.execSQL(CREATE_USER);
        case 2:
            db.execSQL(CREATE_APPLIANCE_ACTIVITY); // for version 3
    }
}

My concern is, what if another developer needs to make a new table too, and he carries out the same process as me. Do he increase the version in his feature branch to 3? And if so, what should be our next step when either or both of us close our feature branch and merged it into develop? Since we both edited the same file, there may be chance of conflict. So in the develop branch, do the version stay at 3, or?

Thanks in advance. :)

Oleg Skidan · Accepted Answer · 2016-07-27 06:05:59Z

2

As I understand your questions. When you will merge your code files, you can put all your and his tables creating in one database version. Like that:

public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
    Log.d("Database onUpgrade", "Old is: " + oldVersion + ". New is: " + newVersion);
    switch(oldVersion) {
        case **N**:
        db.execSQL(CREATE_YOUR_DATABASE); 
        db.execSQL(CREATE_HIS_DATABASE);
}

edited Jul 27, 2016 at 6:05

answered Jul 27, 2016 at 6:03

Oleg Skidan

6178 silver badges24 bronze badges

Sign up to request clarification or add additional context in comments.

4 Comments

Zhi Kai Over a year ago

So does that means when both of our files are merged into develop, the database version will be 3? Initially in develop is 2. But on our individual feature, we increased to 3 because we need to add 1 new table for our feature.

Oleg Skidan Over a year ago

If you both make it 3 - it will be 3. If you make it 2, but he make it 3 - it will be 3

Zhi Kai Over a year ago

Yup, we both made it 3 in order for onUpgrade to be executed. Alright, thanks for the help!

Oleg Skidan Over a year ago

You're welcome! Just use merge tool =) Please, will not forget to choose my answer.

Ritesh Gune · Accepted Answer · 2016-07-27 06:29:05Z

1

As I understand, Whenever two developers work on the same file , at the time of merging branches last one to pull the changes will get the conflict in that file. So the last developer to pull changes can merge the changes manually after resolving all the conflicts.

In your case if version on develop is 2(Assuming version in market apk is 2) then next release version (market apk) for all branches will be 3, provided all features are included in that release.

edited Jul 27, 2016 at 6:29

answered Jul 27, 2016 at 6:10

Ritesh Gune

16.7k6 gold badges47 silver badges73 bronze badges

1 Comment

Oleg Skidan Over a year ago

yeap, last developer will see Code A (his) and Code B (of first developer), and he must to merge both to Code C.

Collectives™ on Stack Overflow

Android: Controlling of DB Versions

2 Answers 2

4 Comments

1 Comment

Your Answer

Hot Network Questions

Collectives™ on Stack Overflow

2 Answers 2

4 Comments

1 Comment

Your Answer

Sign up or log in

Post as a guest

Related