GeezerVison is showing github.com — Allow space characters in table and index names, disallow ` chars · feiva/sqlitebrowser@0ae6f18
File tree
Expand file treeCollapse file tree
Open diff view settings
Expand file treeCollapse file tree
Open diff view settings
Collapse file
Copy file name to clipboardExpand all lines: src/CreateIndexDialog.cpp +1-3Lines changed: 1 addition & 3 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -52,10 +52,8 @@ void CreateIndexDialog::tableChanged(const QString& new_table) |
52 | 52 |
|
53 | 53 | void CreateIndexDialog::checkInput() |
54 | 54 | { |
55 | | - ui->editIndexName->setText(ui->editIndexName->text().trimmed()); |
56 | | - |
57 | 55 | bool valid = true; |
58 | | - if(ui->editIndexName->text().isEmpty() || ui->editIndexName->text().contains(" ")) |
| 56 | + if(ui->editIndexName->text().isEmpty() || ui->editIndexName->text().contains("`")) |
59 | 57 | valid = false; |
60 | 58 |
|
61 | 59 | int num_columns = 0; |
|
Collapse file
Copy file name to clipboardExpand all lines: src/EditTableDialog.cpp +1-2Lines changed: 1 addition & 2 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -149,9 +149,8 @@ void EditTableDialog::updateSqlText() |
149 | 149 | void EditTableDialog::checkInput() |
150 | 150 | { |
151 | 151 | QString normTableName = ui->editTableName->text().trimmed(); |
152 | | - ui->editTableName->setText(normTableName); |
153 | 152 | bool valid = true; |
154 | | - if(normTableName.isEmpty() || normTableName.contains(" ")) |
| 153 | + if(normTableName.isEmpty() || normTableName.contains("`")) |
155 | 154 | valid = false; |
156 | 155 | if(ui->treeWidget->topLevelItemCount() == 0) |
157 | 156 | valid = false; |
|
Collapse file
Copy file name to clipboardExpand all lines: src/ImportCsvDialog.cpp +2-3Lines changed: 2 additions & 3 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -57,6 +57,7 @@ void ImportCsvDialog::accept() |
57 | 57 | { |
58 | 58 | // Remove invalid characters |
59 | 59 | QString thisfield = curList.front(); |
| 60 | + thisfield.replace("`", ""); |
60 | 61 | thisfield.replace(" ", ""); |
61 | 62 | thisfield.replace('"', ""); |
62 | 63 | thisfield.replace("'",""); |
@@ -196,10 +197,8 @@ void ImportCsvDialog::updatePreview() |
196 | 197 |
|
197 | 198 | void ImportCsvDialog::checkInput() |
198 | 199 | { |
199 | | - ui->editName->setText(ui->editName->text().trimmed()); |
200 | | - |
201 | 200 | bool valid = true; |
202 | | - if(ui->editName->text().isEmpty() || ui->editName->text().contains(" ")) |
| 201 | + if(ui->editName->text().isEmpty() || ui->editName->text().contains("`")) |
203 | 202 | valid = false; |
204 | 203 |
|
205 | 204 | ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(valid); |
|