Projects >> SWADroid >>5c43182dec3581c1726a27f5ae1e63f2a2d9492e

Chunk
Conflicting content
	public void upgradeDB(Context context) throws XmlPullParserException, IOException {    	
		//cleanTables();    	
		//initializeDB();
<<<<<<< HEAD
		compactDB();


		/* 
		 * Modify database keeping data:
		 * 1. Create temporary table __DB_TABLE_GROUPS (with the new model)
		 * 2. insert in the temporary table all the data (in the new model) from the old table
		 * 3. drop table DB_TABLE_GROUPS
		 * 4. create DB_TABLE_GROUPS with the new model. 
		 * 5. insert in DB_TABLE_GROUPS all the data from __DB_TABLE_GROUPS
		 * 6. insert in DB_TABLE_GROUPS_GROUPTYPES the relationships between the deleted groups and group types
		 * 7. drop __DB_TABLE_GROUPS
		 * Just to modify database without to keep data just 7,6.
		 * 
		 * */
		/*TODO �esto se deber�a ejecutar s�lo cuando se pase una version < 12 a una mayor de 13? en el resto de los casos no 
		�con la version de swadroid?*/
=======
>>>>>>> d3865f22af727762befee9bf2e7b326031b95071
		
		/* From version 11 to 12 
		 * changes on courses table:
Solution content
	public void upgradeDB(Context context) throws XmlPullParserException, IOException {    	
		//cleanTables();    	
		//initializeDB();

		/* 
		 * Modify database keeping data:
		 * 1. Create temporary table __DB_TABLE_GROUPS (with the new model)
		 * 2. insert in the temporary table all the data (in the new model) from the old table
		 * 3. drop table DB_TABLE_GROUPS
		 * 4. create DB_TABLE_GROUPS with the new model. 
		 * 5. insert in DB_TABLE_GROUPS all the data from __DB_TABLE_GROUPS
		 * 6. insert in DB_TABLE_GROUPS_GROUPTYPES the relationships between the deleted groups and group types
		 * 7. drop __DB_TABLE_GROUPS
		 * Just to modify database without to keep data just 7,6.
		 * 
		 * */
		/*TODO �esto se deber�a ejecutar s�lo cuando se pase una version < 12 a una mayor de 13? en el resto de los casos no 
		�con la version de swadroid?*/
		
		/* From version 11 to 12 
		 * changes on courses table:
File
DataBaseHelper.java
Developer's decision
Combination
Kind of conflict
Comment
Method invocation