Skip to content

bugfix and set default sql parser #552

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

bugfix and set default sql parser #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2682093
Make the lib behave like the document said
sunnycamel May 16, 2018
30fd73a
change the default sql parser to "delimited"
sunnycamel May 16, 2018
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
2 changes: 1 addition & 1 deletion src/com/activeandroid/Configuration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public static class Builder {

private static final int DEFAULT_CACHE_SIZE = 1024;
private static final String DEFAULT_DB_NAME = "Application.db";
private static final String DEFAULT_SQL_PARSER = SQL_PARSER_LEGACY;
private static final String DEFAULT_SQL_PARSER = SQL_PARSER_DELIMITED;

//////////////////////////////////////////////////////////////////////////////////////
// PRIVATE MEMBERS
Expand Down
6 changes: 3 additions & 3 deletions src/com/activeandroid/DatabaseHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ public final class DatabaseHelper extends SQLiteOpenHelper {
// PRIVATE FIELDS
//////////////////////////////////////////////////////////////////////////////////////

private Configuration mConfiguration;
private final String mSqlParser;

//////////////////////////////////////////////////////////////////////////////////////
Expand All @@ -59,6 +60,7 @@ public DatabaseHelper(Configuration configuration) {
super(configuration.getContext(), configuration.getDatabaseName(), null, configuration.getDatabaseVersion());
copyAttachedDatabase(configuration.getContext(), configuration.getDatabaseName());
mSqlParser = configuration.getSqlParser();
mConfiguration = configuration;
}

//////////////////////////////////////////////////////////////////////////////////////
Expand All @@ -73,15 +75,13 @@ public void onOpen(SQLiteDatabase db) {
@Override
public void onCreate(SQLiteDatabase db) {
executePragmas(db);
executeCreate(db);
executeMigrations(db, -1, db.getVersion());
executeMigrations(db, -1, mConfiguration.getDatabaseVersion());
executeCreateIndex(db);
}

@Override
public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
executePragmas(db);
executeCreate(db);
executeMigrations(db, oldVersion, newVersion);
}

Expand Down