Skip to content

Update SQLite.cs "not an error" bug #81

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
drew-fc wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update SQLite.cs "not an error" bug #81

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
73 changes: 39 additions & 34 deletions Runtime/sqlite-net/SQLite.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3069,25 +3069,29 @@ public int ExecuteNonQuery ()
_conn.Tracer?.Invoke ("Executing: " + this);
}

var r = SQLite3.Result.OK;
var stmt = Prepare ();
r = SQLite3.Step (stmt);
Finalize (stmt);
if (r == SQLite3.Result.Done) {
int rowsAffected = SQLite3.Changes (_conn.Handle);
return rowsAffected;
}
else if (r == SQLite3.Result.Error) {
string msg = SQLite3.GetErrmsg (_conn.Handle);
throw SQLiteException.New (r, msg);
}
else if (r == SQLite3.Result.Constraint) {
if (SQLite3.ExtendedErrCode (_conn.Handle) == SQLite3.ExtendedResult.ConstraintNotNull) {
throw NotNullConstraintViolationException.New (r, SQLite3.GetErrmsg (_conn.Handle));
try {
// FIX: Use try/finally to ensure Finalize runs, and throw exceptions
// BEFORE finally block so GetErrmsg is called while error state is valid.
// See: https://github.com/praeclarum/sqlite-net/issues/1041
var r = SQLite3.Step (stmt);
if (r == SQLite3.Result.Done || r == SQLite3.Result.Row) {
int rowsAffected = SQLite3.Changes (_conn.Handle);
return rowsAffected;
}
else if (r == SQLite3.Result.Error) {
throw SQLiteException.New (r, SQLite3.GetErrmsg (_conn.Handle));
}
else if (r == SQLite3.Result.Constraint) {
if (SQLite3.ExtendedErrCode (_conn.Handle) == SQLite3.ExtendedResult.ConstraintNotNull) {
throw NotNullConstraintViolationException.New (r, SQLite3.GetErrmsg (_conn.Handle));
}
}
throw SQLiteException.New (r, SQLite3.GetErrmsg (_conn.Handle));
}
finally {
Finalize (stmt);
}

throw SQLiteException.New (r, SQLite3.GetErrmsg (_conn.Handle));
}

public IEnumerable<T> ExecuteDeferredQuery<T> ()
Expand Down Expand Up @@ -3748,8 +3752,6 @@ public int ExecuteNonQuery (object[] source)
Connection.Tracer?.Invoke ("Executing: " + CommandText);
}

var r = SQLite3.Result.OK;

if (!Initialized) {
Statement = SQLite3.Prepare2 (Connection.Handle, CommandText);
Initialized = true;
Expand All @@ -3761,25 +3763,28 @@ public int ExecuteNonQuery (object[] source)
SQLiteCommand.BindParameter (Statement, i + 1, source[i], Connection.StoreDateTimeAsTicks, Connection.DateTimeStringFormat, Connection.StoreTimeSpanAsTicks);
}
}
r = SQLite3.Step (Statement);

if (r == SQLite3.Result.Done) {
int rowsAffected = SQLite3.Changes (Connection.Handle);
SQLite3.Reset (Statement);
return rowsAffected;
}
else if (r == SQLite3.Result.Error) {
string msg = SQLite3.GetErrmsg (Connection.Handle);
SQLite3.Reset (Statement);
throw SQLiteException.New (r, msg);
}
else if (r == SQLite3.Result.Constraint && SQLite3.ExtendedErrCode (Connection.Handle) == SQLite3.ExtendedResult.ConstraintNotNull) {
SQLite3.Reset (Statement);
throw NotNullConstraintViolationException.New (r, SQLite3.GetErrmsg (Connection.Handle));
try {
// FIX: Use try/finally to ensure Reset runs, and throw exceptions
// BEFORE finally block so GetErrmsg is called while error state is valid.
// See: https://github.com/praeclarum/sqlite-net/issues/1041
var r = SQLite3.Step (Statement);
if (r == SQLite3.Result.Done || r == SQLite3.Result.Row) {
int rowsAffected = SQLite3.Changes (Connection.Handle);
return rowsAffected;
}
else if (r == SQLite3.Result.Error) {
throw SQLiteException.New (r, SQLite3.GetErrmsg (Connection.Handle));
}
else if (r == SQLite3.Result.Constraint) {
if (SQLite3.ExtendedErrCode (Connection.Handle) == SQLite3.ExtendedResult.ConstraintNotNull) {
throw NotNullConstraintViolationException.New (r, SQLite3.GetErrmsg (Connection.Handle));
}
}
throw SQLiteException.New (r, SQLite3.GetErrmsg (Connection.Handle));
}
else {
finally {
SQLite3.Reset (Statement);
throw SQLiteException.New (r, SQLite3.GetErrmsg (Connection.Handle));
}
}

Expand Down