Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-01 06:19:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

add columns using data as well. Like pref commit, this does not change behavior.

Browse source
This commit is contained in:
Eric House 2012-11-17 10:20:14 -08:00
parent 9ad41d5a3a
commit 2779139e75
1 changed files with 35 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
xwords4/android/XWords4/src/org/eehouse/android/xw4/DBHelper.java
View file

@ -141,21 +141,6 @@ public class DBHelper extends SQLiteOpenHelper {
return DB_NAME;
}
private void createTable( SQLiteDatabase db, String name, String[] data )
{
StringBuilder query =
new StringBuilder( String.format("CREATE TABLE %s (", name ) );
for ( int ii = 0; ii < data.length; ii += 2 ) {
String col = String.format( " %s %s,", data[ii], data[ii+1] );
query.append( col );
}
query.setLength(query.length() - 1); // nuke the last comma
query.append( ");" );
db.execSQL( query.toString() );
}
@Override
public void onCreate( SQLiteDatabase db )
{
@ -175,26 +160,26 @@ public class DBHelper extends SQLiteOpenHelper {
case 5:
createTable( db, TABLE_NAME_OBITS, s_obitsColsAndTypes );
case 6:
addColumn( db, TURN, "INTEGER" );
addColumn( db, GIFLAGS, "INTEGER" );
addColumn( db, CHAT_HISTORY, "TEXT" );
addSumColumn( db, TURN );
addSumColumn( db, GIFLAGS );
addSumColumn( db, CHAT_HISTORY );
case 7:
addColumn( db, MISSINGPLYRS, "INTEGER" );
addSumColumn( db, MISSINGPLYRS );
case 8:
addColumn( db, GAME_NAME, "TEXT" );
addColumn( db, CONTRACTED, "INTEGER" );
addSumColumn( db, GAME_NAME );
addSumColumn( db, CONTRACTED );
case 9:
addColumn( db, DICTLIST, "TEXT" );
addSumColumn( db, DICTLIST );
case 10:
addColumn( db, INVITEID, "TEXT" );
addSumColumn( db, INVITEID );
case 11:
addColumn( db, REMOTEDEVS, "TEXT" );
addSumColumn( db, REMOTEDEVS );
case 12:
createTable( db, TABLE_NAME_DICTINFO, s_dictInfoColsAndTypes );
createTable( db, TABLE_NAME_DICTBROWSE, s_dictBrowseColsAndTypes );
case 13:
addColumn( db, LASTMOVE, "INTEGER" );
addSumColumn( db, LASTMOVE );
// nothing yet
break;
default:
@ -206,10 +191,34 @@ public class DBHelper extends SQLiteOpenHelper {
}
}
private void addColumn( SQLiteDatabase db, String colName, String colType )
private void addSumColumn( SQLiteDatabase db, String colName )
{
String colType = null;
for ( int ii = 0; ii < s_summaryColsAndTypes.length; ii += 2 ) {
if ( s_summaryColsAndTypes[ii].equals( colName ) ) {
colType = s_summaryColsAndTypes[ii+1];
break;
}
}
String cmd = String.format( "ALTER TABLE %s ADD COLUMN %s %s;",
TABLE_NAME_SUM, colName, colType );
db.execSQL( cmd );
}
private void createTable( SQLiteDatabase db, String name, String[] data )
{
StringBuilder query =
new StringBuilder( String.format("CREATE TABLE %s (", name ) );
for ( int ii = 0; ii < data.length; ii += 2 ) {
String col = String.format( " %s %s,", data[ii], data[ii+1] );
query.append( col );
}
query.setLength(query.length() - 1); // nuke the last comma
query.append( ");" );
db.execSQL( query.toString() );
}
}