mirror/sqlitebrowser
1
0
Fork 0
mirror of https://github.com/sqlitebrowser/sqlitebrowser.git synced 2026-01-19 10:20:17 -06:00
Code Issues Packages Projects Releases Wiki Activity

EditTableDialog: Don't quote function in default value when marked '=()'

Browse Source 
When entering a default value like "=(strftime('%s','now'))", don't
quote it but remove the '=' character and use the following expression
as default value.

See issue #166.
This commit is contained in:
Martin Kleusberg
2014-11-29 17:36:54 +01:00
parent 9e4a6df804
commit 5991a144a1
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/EditTableDialog.cpp
View File

@@ -344,19 +344,24 @@ void EditTableDialog::itemChanged(QTreeWidgetItem *item, int column)
new_value.compare("current_date", Qt::CaseInsensitive) &&
new_value.compare("current_timestamp", Qt::CaseInsensitive))
{
if(!((new_value.trimmed().startsWith('\'') ||
new_value.trimmed().startsWith('"')) && (new_value.trimmed().endsWith('\'') || new_value.trimmed().endsWith('"'))))
QChar first_char = new_value.trimmed().at(0);
if(!((first_char == '\'' || first_char == '"') && new_value.trimmed().endsWith(first_char)))
{
bool is_numeric;
new_value.toDouble(&is_numeric);
if(!is_numeric)
{
new_value = QString("'%1'").arg(new_value.replace("'", "''"));
item->setText(column, new_value);
if(new_value.trimmed().startsWith("=(") && new_value.trimmed().endsWith(')'))
{
new_value = new_value.trimmed().mid(1); // Leave the brackets as they are needed for a valid SQL expression
} else {
new_value = QString("'%1'").arg(new_value.replace("'", "''"));
item->setText(column, new_value);
}
}
}
}
field->setDefaultValue(item->text(column));
field->setDefaultValue(new_value);
if(!m_bNewTable)
callRenameColumn = true;
}