Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-05 20:45:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

cleanup: move method

Browse source
This commit is contained in:
Eric House 2016-04-22 07:08:13 -07:00
parent bf871a20fb
commit 1216ec49d7
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -444,7 +444,7 @@ public class DBHelper extends SQLiteOpenHelper {
db.beginTransaction(); db.beginTransaction();
try { try {
String query; String query;
String[] columnNames = DBUtils.getColumns( db, name ); String[] columnNames = getColumns( db, name );
if ( null != columnNames ) { // no data means no need to copy if ( null != columnNames ) { // no data means no need to copy
query = String.format( "ALTER table %s RENAME TO 'temp_%s'", query = String.format( "ALTER table %s RENAME TO 'temp_%s'",
name, name ); name, name );
@ -516,6 +516,15 @@ public class DBHelper extends SQLiteOpenHelper {
return result; return result;
} }
private static String[] getColumns( SQLiteDatabase db, String name )
{
String query = String.format( "SELECT * FROM %s LIMIT 1", name );
Cursor cursor = db.rawQuery( query, null );
String[] colNames = cursor.getColumnNames();
cursor.close();
return colNames;
}
private class TableAndVersion { private class TableAndVersion {
public String name; public String name;
public int addedVersion; public int addedVersion;

9
xwords4/android/XWords4/src/org/eehouse/android/xw4/DBUtils.java
View file

@ -2070,15 +2070,6 @@ public class DBUtils {
return exists; return exists;
} }
public static String[] getColumns( SQLiteDatabase db, String name )
{
String query = String.format( "SELECT * FROM %s LIMIT 1", name );
Cursor cursor = db.rawQuery( query, null );
String[] colNames = cursor.getColumnNames();
cursor.close();
return colNames;
}
public static void addToStudyList( Context context, String word, public static void addToStudyList( Context context, String word,
int lang ) int lang )
{ {