Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

small changes to clean Schema generator #408

Merged
merged 3 commits into from
Nov 4, 2015
Merged

small changes to clean Schema generator #408

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
30c3900
Schema cleanup
RoyMontoya Oct 26, 2015
9aa3b3e
fixed conflicts
RoyMontoya Oct 26, 2015
bd1ba7b
fixed conflicts
RoyMontoya Oct 27, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 22 additions & 17 deletions library/src/main/java/com/orm/SchemaGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ public class SchemaGenerator {

private Context context;

public static final String NULL = " NULL";
public static final String NOT_NULL = " NOT NULL";
public static final String UNIQUE = " UNIQUE";
public static final String SUGAR = "Sugar";

public SchemaGenerator(Context context) {
this.context = context;
}
Expand All @@ -44,8 +49,8 @@ public void doUpgrade(SQLiteDatabase sqLiteDatabase, int oldVersion, int newVers
List<Class> domainClasses = getDomainClasses(context);
String sql = "select count(*) from sqlite_master where type='table' and name='%s';";
for (Class domain : domainClasses) {
Cursor c = sqLiteDatabase.rawQuery(String.format(sql, NamingHelper.toSQLName(domain)), null);
if (c.moveToFirst() && c.getInt(0) == 0) {
Cursor cursor = sqLiteDatabase.rawQuery(String.format(sql, NamingHelper.toSQLName(domain)), null);
if (cursor.moveToFirst() && cursor.getInt(0) == 0) {
createTable(domain, sqLiteDatabase);
}
}
Expand All @@ -66,7 +71,7 @@ private boolean executeSugarUpgrade(SQLiteDatabase db, int oldVersion, int newVe
List<String> files = Arrays.asList(this.context.getAssets().list("sugar_upgrades"));
Collections.sort(files, new NumberComparator());
for (String file : files) {
Log.i("Sugar", "filename : " + file);
Log.i(SUGAR, "filename : " + file);

try {
int version = Integer.valueOf(file.replace(".sql", ""));
Expand All @@ -76,12 +81,12 @@ private boolean executeSugarUpgrade(SQLiteDatabase db, int oldVersion, int newVe
isSuccess = true;
}
} catch (NumberFormatException e) {
Log.i("Sugar", "not a sugar script. ignored." + file);
Log.i(SUGAR, "not a sugar script. ignored." + file);
}

}
} catch (IOException e) {
Log.e("Sugar", e.getMessage());
Log.e(SUGAR, e.getMessage());
}

return isSuccess;
Expand All @@ -94,17 +99,17 @@ private void executeScript(SQLiteDatabase db, String file) {
String line;
while ((line = reader.readLine()) != null) {
Log.i("Sugar script", line);
db.execSQL(line.toString());
db.execSQL(line);
}
} catch (IOException e) {
Log.e("Sugar", e.getMessage());
Log.e(SUGAR, e.getMessage());
}

Log.i("Sugar", "Script executed");
Log.i(SUGAR, "Script executed");
}

private void createTable(Class<?> table, SQLiteDatabase sqLiteDatabase) {
Log.i("Sugar", "Create table if not exists");
Log.i(SUGAR, "Create table if not exists");
List<Field> fields = ReflectionUtil.getTableFields(table);
String tableName = NamingHelper.toSQLName(table);
StringBuilder sb = new StringBuilder("CREATE TABLE IF NOT EXISTS ");
Expand All @@ -126,37 +131,37 @@ private void createTable(Class<?> table, SQLiteDatabase sqLiteDatabase) {
sb.append(", ").append(columnName).append(" ").append(columnType);

if (columnAnnotation.notNull()) {
if (columnType.endsWith(" NULL")) {
if (columnType.endsWith(NULL)) {
sb.delete(sb.length() - 5, sb.length());
}
sb.append(" NOT NULL");
sb.append(NOT_NULL);
}

if (columnAnnotation.unique()) {
sb.append(" UNIQUE");
sb.append(UNIQUE);
}

} else {
sb.append(", ").append(columnName).append(" ").append(columnType);

if (column.isAnnotationPresent(NotNull.class)) {
if (columnType.endsWith(" NULL")) {
if (columnType.endsWith(NULL)) {
sb.delete(sb.length() - 5, sb.length());
}
sb.append(" NOT NULL");
sb.append(NOT_NULL);
}

if (column.isAnnotationPresent(Unique.class)) {
sb.append(" UNIQUE");
sb.append(UNIQUE);
}
}
}
}

sb.append(" ) ");
Log.i("Sugar", "Creating table " + tableName);
Log.i(SUGAR, "Creating table " + tableName);

if (!"".equals(sb.toString())) {
if (!sb.toString().isEmpty()) {
try {
sqLiteDatabase.execSQL(sb.toString());
} catch (SQLException e) {
Expand Down