Merge branch 'hotfix/db_upgrade'

Author: codinguser

CHANGELOG.md

@@ -1,5 +1,9 @@
 Change Log
 ===============================================================================
+Version 1.5.1 *(2014-10-08)*
+----------------------------
+* Fixed: Crash when upgrading from v1.4.x to v1.5.x
+
 Version 1.5.0 *(2014-10-01)*
 ----------------------------
 * Need for speed! Lots of performance optimizations in the application

app/AndroidManifest.xml

@@ -17,7 +17,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.gnucash.android"
-    android:versionCode="42"
+    android:versionCode="43"
     android:versionName="@string/app_version_name" >
 
     <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="16"/>

app/pom.xml

@@ -22,7 +22,7 @@
     <description>Gnucash Android companion application</description>
 
     <parent>
-        <version>1.5.0-SNAPSHOT</version>
+        <version>1.5.1-SNAPSHOT</version>
         <groupId>org.gnucash.android</groupId>
         <artifactId>gnucash-android-parent</artifactId>
     </parent>

app/res/values/strings.xml

@@ -17,7 +17,7 @@
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">GnuCash</string>
-    <string name="app_version_name">1.5.0</string>
+    <string name="app_version_name">1.5.1</string>
     <string name="title_add_account">Create Account</string>
     <string name="title_edit_account">Edit Account</string>
     <string name="info_details">Info</string>

app/src/org/gnucash/android/db/DatabaseAdapter.java

@@ -62,7 +62,10 @@ public DatabaseAdapter(Context context) {
         mDbHelper = new DatabaseHelper(context);
         mContext = context.getApplicationContext();
         open();
-        createTempView();
+
+        if (mDb.getVersion() >= DatabaseSchema.SPLITS_DB_VERSION) {
+            createTempView();
+        }
     }
 
     /**
@@ -74,7 +77,10 @@ public DatabaseAdapter(SQLiteDatabase db) {
         this.mContext = GnuCashApplication.getAppContext();
         if (!db.isOpen() || db.isReadOnly())
             throw new IllegalArgumentException("Database not open or is read-only. Require writeable database");
-        createTempView();
+
+        if (mDb.getVersion() >= DatabaseSchema.SPLITS_DB_VERSION) {
+            createTempView();
+        }
     }
 
     private void createTempView() {

integration-tests/pom.xml

@@ -17,7 +17,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-		<version>1.5.0-SNAPSHOT</version>
+		<version>1.5.1-SNAPSHOT</version>
 		<groupId>org.gnucash.android</groupId>
 		<artifactId>gnucash-android-parent</artifactId>
 	</parent>

pom.xml

@@ -17,7 +17,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-	<version>1.5.0-SNAPSHOT</version>
+	<version>1.5.1-SNAPSHOT</version>
     <groupId>org.gnucash.android</groupId>
     <artifactId>gnucash-android-parent</artifactId>
     <name>GnuCash Android parent</name>