Skip to content

Micro-feature: Re-prompt when import SQL file if path incorrect; import to an existing db #3887

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
yfdyh000 wants to merge 3 commits into
base: master
Choose a base branch
from
+49 −20
Open

Micro-feature: Re-prompt when import SQL file if path incorrect; import to an existing db #3887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2041d20
Fill default filename when import SQL file or save project file
yfdyh000 Feb 26, 2025
c8201f7
Re-ask if the user select an existing file to import SQL file
yfdyh000 Feb 26, 2025
36fcaca
Allow to choose an existing file to import SQL file when another data…
yfdyh000 Feb 26, 2025
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
68 changes: 48 additions & 20 deletions src/MainWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1563,32 +1563,56 @@ void MainWindow::importDatabaseFromSQL()
if(!QFile::exists(fileName))
return;

bool doNewDb = true;
bool existingDbOpened = false;
// If there is already a database file opened ask the user whether to import into
// this one or a new one. If no DB is opened just ask for a DB name directly
QString newDbFile;
if((db.isOpen() && QMessageBox::question(this,
QApplication::applicationName(),
tr("Do you want to create a new database file to hold the imported data?\n"
"If you answer no we will attempt to import the data in the SQL file to the current database."),
tr("Do you want to create a new database file or opening another database file to hold the imported data?\n"
"If you answer the No, we will attempt to import the data in the SQL file to the current database."),
QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes) || !db.isOpen())
{
newDbFile = FileDialog::getSaveFileName(
CreateDatabaseFile,
this,
tr("Choose a filename to save under"),
FileDialog::getSqlDatabaseFileFilter());
if(QFile::exists(newDbFile))
{
QMessageBox::information(this, QApplication::applicationName(), tr("File %1 already exists. Please choose a different name.").arg(newDbFile));
return;
} else if(newDbFile.size() == 0) {
return;
}

QString basePathName = db.currentFile();
removeFilenameSuffix(basePathName);
while (true)
{
newDbFile = FileDialog::getSaveFileName(
CreateDatabaseFile,
this,
tr("Choose a filename to save under"),
FileDialog::getSqlDatabaseFileFilter(),
basePathName);
if (newDbFile.isEmpty()) // canceled
return;
if (QFile::exists(newDbFile))
{
if (QMessageBox::question(this,
QApplication::applicationName(),
tr("File %1 already exists.\nDo you want to open the database file to import data?\n"
"If you answer the No, we will re-ask for the path, or you can cancel the import.").arg(newDbFile),
QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes) {
existingDbOpened = fileOpen(newDbFile);
if (!existingDbOpened)
{
// If the file is not a valid database file, we will ask the user to choose another.
QMessageBox::warning(this, QApplication::applicationName(), tr("Database file %1 failed to open! Please try choose a path again.").arg(newDbFile));
continue;
}
doNewDb = false;
break;
}
continue;
}
break;
}
// Create the new file and open it in the browser
db.create(newDbFile);
db.close();
fileOpen(newDbFile);
if (!existingDbOpened) {
db.create(newDbFile);
db.close();
fileOpen(newDbFile);
}
}

// Defer foreign keys. Just deferring them instead of disabling them should work fine because in the import we only expect CREATE and INSERT
Expand Down Expand Up @@ -3145,13 +3169,17 @@ static void saveBrowseDataTableSettings(const BrowseDataTableSettings& object, s
xml.writeEndElement();
}

void MainWindow::removeFilenameSuffix(QString& filename) {
int dotLen = QFileInfo(filename).suffix().isEmpty() ? 0 : 1;
filename.chop(QFileInfo(filename).suffix().size() + dotLen);
}

void MainWindow::saveProject(const QString& currentFilename)
{
QString filename;
if(currentFilename.isEmpty()) {
QString basePathName = db.currentFile();
// Remove database suffix
basePathName.chop(QFileInfo(basePathName).suffix().size()+1);
removeFilenameSuffix(basePathName);
filename = FileDialog::getSaveFileName(
CreateProjectFile,
this,
Expand Down
1 change: 1 addition & 0 deletions src/MainWindow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ friend TableBrowserDock;
void toggleTabVisible(QWidget* tabWidget, bool show);
void restoreOpenTabs(QString tabs);
QString saveOpenTabs();
void removeFilenameSuffix(QString& filename);
void saveProject(const QString& currentFilename);
bool closeProject();
bool askSaveSqlTab(int index, bool& ignoreUnattachedBuffers);
Expand Down