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.

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

Use UTF-8 functions of SQLite to avoid unexpected data type conversions #84

Merged
merged 1 commit into from
Jul 6, 2016

Conversation

mkauf
Copy link
Contributor

@mkauf mkauf commented Dec 16, 2015

Also don't use modified UTF-8, see #61
Convert Java Strings to "unmodified" UTF-8 and vice versa.
Improve out-of-memory handling.

Fixes #78

@gitblit
Copy link
Collaborator

gitblit commented Jun 23, 2016

@mkauf Would you be willing to rebase this on master and provide some tests to confirm your code works like you think it should?

@mkauf mkauf force-pushed the UTF8_BLOB_Bugfix branch from bbe4c34 to 726b5ed Compare June 28, 2016 15:39
@mkauf
Copy link
Contributor Author

mkauf commented Jun 28, 2016

@gitblit I have updated the pull request and written a test.

@gitblit
Copy link
Collaborator

gitblit commented Jul 1, 2016

@mkauf Sorry, about this but would you be willing to rebase this one more time?

unexpected data type conversions.

Don't use modified UTF-8, see xerial#61
Convert Java Strings to "unmodified" UTF-8 and vice versa.
Improve out-of-memory handling.

Fixes xerial#78
@mkauf mkauf force-pushed the UTF8_BLOB_Bugfix branch from 726b5ed to b8db61d Compare July 4, 2016 12:56
@mkauf
Copy link
Contributor Author

mkauf commented Jul 4, 2016

@gitblit OK, done

@gitblit gitblit added this to the 3.13.0 milestone Jul 5, 2016
@@ -396,4 +397,22 @@ public native synchronized int restore(String dbName, String sourceFileName, Pro
static void throwex(String msg) throws SQLException {
throw new SQLException(msg);
}

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These string util methods should move to org.sqlite.util.StringUtils.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah. Well that complicates the native implementation, doesn't it.

@gitblit gitblit merged commit c30fe3e into xerial:master Jul 6, 2016
@mkauf
Copy link
Contributor Author

mkauf commented Jul 6, 2016

Thank you for merging!

@mkauf mkauf deleted the UTF8_BLOB_Bugfix branch July 6, 2016 14:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants