Add New Column from Excel while importing Excel(Issue No #4). Library Size Reduced.

Author: androidmads

app/build.gradle

@@ -20,8 +20,11 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-//    compile project(path: ':library')
-    compile 'com.ajts.androidmads.SQLite2Excel:library:1.0.1'
+    compile project(path: ':library')
+//    compile 'com.ajts.androidmads.SQLite2Excel:library:1.0.1'
     compile 'com.android.support:appcompat-v7:25.2.0'
     compile 'com.android.support:design:25.2.0'
 }
+repositories {
+    mavenCentral()
+}

app/src/main/java/com/ajts/androidmads/sqlite2xlDemo/Excel2SQLiteActivity.java

@@ -46,7 +46,11 @@ public void onClick(final View view) {
                     return;
                 }
                 dbQueries.open();
-                ExcelToSQLite excelToSQLite = new ExcelToSQLite(getApplicationContext(), DBHelper.DB_NAME);
+                // Is used to import data from excel without dropping table
+                // ExcelToSQLite excelToSQLite = new ExcelToSQLite(getApplicationContext(), DBHelper.DB_NAME);
+
+                // if you want to add column in excel and import into DB, you must drop the table
+                ExcelToSQLite excelToSQLite = new ExcelToSQLite(getApplicationContext(), DBHelper.DB_NAME, false);
                 // Import EXCEL FILE to SQLite
                 excelToSQLite.importFromFile(directory_path, new ExcelToSQLite.ImportListener() {
                     @Override

build.gradle

@@ -8,7 +8,6 @@ buildscript {
         classpath 'com.android.tools.build:gradle:2.3.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
-
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

library/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'com.jfrog.bintray'
 apply plugin: 'com.github.dcendents.android-maven'
 
 group = 'com.ajts.androidmads.SQLite2Excel'
-version = '1.0.1'
+version = '1.0.2'
 
 android {
     compileSdkVersion 25
@@ -24,8 +24,7 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile files('libs/poi.jar')
+    compile 'org.apache.poi:poi:3.16'
 }
 
 def siteUrl = 'https://github.com/androidmads/SQLite2XL'      // Homepage URL of the library
@@ -34,6 +33,27 @@ def gitUrl = 'https://github.com/androidmads/SQLite2XL.git'   // Git URL
 Properties properties = new Properties()
 properties.load(project.rootProject.file('local.properties').newDataInputStream())
 
+bintray {
+    user = properties.getProperty("bintray.user")
+    key = properties.getProperty("bintray.apikey")
+    configurations = ['archives']
+    pkg {
+        repo = 'maven'
+        name = 'com.ajts.androidmads.SQLite2Excel'
+
+        version {
+            name = '1.0.2'
+            desc = 'Library to Convert SQlite Data to Excel'
+            released = new Date()
+            vcsTag = '1.0.2'
+        }
+
+        licenses = ['Apache-2.0']
+        vcsUrl = gitUrl
+        websiteUrl = siteUrl
+    }
+}
+
 install {
     repositories.mavenInstaller {
         // This generates POM.xml with proper parameters
@@ -68,26 +88,6 @@ install {
         }
     }
 }
-bintray {
-    user = properties.getProperty("bintray.user")
-    key = properties.getProperty("bintray.apikey")
-    configurations = ['archives']
-    pkg {
-        repo = 'maven'
-        name = 'com.ajts.androidmads.SQLite2Excel'
-
-        version {
-            name = '1.0.1'
-            desc = 'Library to Convert SQlite Data to Excel'
-            released = new Date()
-            vcsTag = '1.0.1'
-        }
-
-        licenses = ['Apache-2.0']
-        vcsUrl = gitUrl
-        websiteUrl = siteUrl
-    }
-}
 
 task generateSourcesJar(type: Jar) {
     from android.sourceSets.main.java.srcDirs
@@ -107,5 +107,4 @@ task generateJavadocsJar(type: Jar) {
 artifacts {
     archives generateSourcesJar
     archives generateJavadocsJar
-}
-
+}

library/libs/poi.jar

@@ -2,6 +2,7 @@
 
 import android.content.ContentValues;
 import android.content.Context;
+import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.Handler;
 import android.os.Looper;
@@ -25,6 +26,7 @@ public class ExcelToSQLite {
     private Context mContext;
     private SQLiteDatabase database;
     private String mDbName;
+    private boolean dropTable = false;
 
     public ExcelToSQLite(Context context, String dbName) {
         mContext = context;
@@ -36,6 +38,17 @@ public ExcelToSQLite(Context context, String dbName) {
         }
     }
 
+    public ExcelToSQLite(Context context, String dbName, boolean dropTable) {
+        mContext = context;
+        mDbName = dbName;
+        this.dropTable = dropTable;
+        try {
+            database = SQLiteDatabase.openOrCreateDatabase(mContext.getDatabasePath(mDbName).getAbsolutePath(), null);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
     public void importFromAsset(final String assetFileName, final ImportListener listener) {
         if (listener != null) {
             listener.onStart();
@@ -135,7 +148,22 @@ private void createTable(Sheet sheet) {
             columns.add(rowHeader.getCell(i).getStringCellValue());
         }
         createTableSql.append(")");
+
+        if (dropTable)
+            database.execSQL("DROP TABLE IF EXISTS " + sheet.getSheetName());
+
         database.execSQL(createTableSql.toString());
+
+        for (String column : columns) {
+            Cursor cursor = database.rawQuery("SELECT * FROM " + sheet.getSheetName(), null); // grab cursor for all data
+            int deleteStateColumnIndex = cursor.getColumnIndex(column);  // see if the column is there
+            if (deleteStateColumnIndex < 0) {
+                String type = "TEXT";
+                // missing_column not there - add it
+                database.execSQL("ALTER TABLE " + sheet.getSheetName() + " ADD COLUMN " + column + " " + type + " NULL;");
+            }
+        }
+
         while (rit.hasNext()) {
             Row row = rit.next();
             ContentValues values = new ContentValues();
@@ -146,9 +174,9 @@ private void createTable(Sheet sheet) {
                     values.put(columns.get(n), row.getCell(n).getStringCellValue());
                 }
             }
-            long result = database.insert(sheet.getSheetName(), null, values);
+            long result = database.insertWithOnConflict(sheet.getSheetName(), null, values, SQLiteDatabase.CONFLICT_IGNORE);
             if (result < 0) {
-                throw new RuntimeException("insert value failed!");
+                throw new RuntimeException("Insert value failed!");
             }
         }
     }