Skip to content

Adds identifier keyword character trimming on column name prior to attempting to map to object properties #335

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 1 commit into
base: master
Choose a base branch
from
Open

Adds identifier keyword character trimming on column name prior to attempting to map to object properties #335

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
19 changes: 18 additions & 1 deletion src/SQLite.Net/SQLiteCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ public class SQLiteCommand
private readonly SQLiteConnection _conn;
private readonly ISQLitePlatform _sqlitePlatform;
private const string DateTimeFormat = "yyyy-MM-ddTHH:mm:ss.fffffffZ";
private readonly char[] identifierEscapeCharacters = new [] { '"', '`', '[', ']' };

internal SQLiteCommand(ISQLitePlatform platformImplementation, SQLiteConnection conn)
{
Expand Down Expand Up @@ -128,7 +129,8 @@ public IEnumerable<T> ExecuteDeferredQuery<T>(TableMapping map)
for (var i = 0; i < cols.Length; i++)
{
var name = _sqlitePlatform.SQLiteApi.ColumnName16(stmt, i);
cols[i] = map.FindColumn(name);
var trimmedName = TrimIdentifierKeywordEscapeCharacters(name);
cols[i] = map.FindColumn(trimmedName);
}

while (_sqlitePlatform.SQLiteApi.Step(stmt) == Result.Row)
Expand Down Expand Up @@ -585,6 +587,21 @@ private object ReadCol(IDbStatement stmt, int index, ColType type, Type clrType)
throw new NotSupportedException("Don't know how to read " + clrType);
}

private string TrimIdentifierKeywordEscapeCharacters(string identifier)
{
string trimmedIdentifier = identifier;
if (identifierEscapeCharacters.Contains(trimmedIdentifier[0]))
{
trimmedIdentifier = trimmedIdentifier.Remove(0, 1);
}
int lastCharIndex = trimmedIdentifier.Length - 1;
if (identifierEscapeCharacters.Contains(trimmedIdentifier[lastCharIndex]))
{
trimmedIdentifier = trimmedIdentifier.Remove(lastCharIndex);
}
return trimmedIdentifier;
}

private class Binding
{
[CanBeNull]
Expand Down