mirror/sqlitebrowser
1
0
Fork 0
mirror of https://github.com/sqlitebrowser/sqlitebrowser.git synced 2026-01-22 03:51:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix CSV export to work with SqliteTableModel

Browse Source
This commit is contained in:
Martin Kleusberg
2013-04-10 18:59:37 +02:00
parent f45b89b6c9
commit 1ba3169428
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/ExportCsvDialog.cpp
View File

@@ -6,6 +6,7 @@
#include "ui_ExportCsvDialog.h"
#include "sqlitedb.h"
#include "PreferencesDialog.h"
#include "sqlitetablemodel.h"
ExportCsvDialog::ExportCsvDialog(DBBrowserDB* db, QWidget* parent)
: QDialog(parent),
@@ -39,7 +40,10 @@ void ExportCsvDialog::accept()
if(fileName.size() > 0)
{
// Get data from selected table
pdb->browseTable(ui->comboTable->currentText());
SqliteTableModel tableModel(this, pdb);
tableModel.setTable(ui->comboTable->currentText());
while(tableModel.canFetchMore())
tableModel.fetchMore();
// Prepare the quote and separating characters
QString quoteChar = ui->comboQuoteCharacter->currentText();
@@ -58,11 +62,10 @@ void ExportCsvDialog::accept()
// Put field names in first row if user wants to have them
if(ui->checkHeader->isChecked())
{
QStringList fields = pdb->browseFields;
for(int i=0;i<fields.count();i++)
for(int i=1;i<tableModel.columnCount();i++)
{
stream << quoteChar << fields.at(i) << quoteChar;
if(i < fields.count() - 1)
stream << quoteChar << tableModel.headerData(i, Qt::Horizontal).toString() << quoteChar;
if(i < tableModel.columnCount() - 1)
stream << sepChar;
else
stream << newlineChar;
@@ -70,15 +73,13 @@ void ExportCsvDialog::accept()
}
// Get and write actual data
rowList data = pdb->browseRecs;
for(int i=0;i<data.size();i++)
for(int i=0;i<tableModel.totalRowCount();i++)
{
QList<QByteArray> row = data[i];
for(int j=1;j<row.size();j++)
for(int j=1;j<tableModel.columnCount();j++)
{
QString content = row[j];
QString content = tableModel.data(tableModel.index(i, j)).toString();
stream << quoteChar << content.replace(quoteChar, quotequoteChar) << quoteChar;
if(j < row.count() - 1)
if(j < tableModel.columnCount() - 1)
stream << sepChar;
else
stream << newlineChar;

1
src/sqlitedb.cpp
View File

@@ -476,7 +476,6 @@ bool DBBrowserDB::browseTable( const QString & tablename, const QString& /*order
QStringList testFields = getTableFields( tablename );
if (testFields.count()>0) {//table exists
//getTableRecords( tablename, orderby );
browseFields = testFields;
hasValidBrowseSet = true;
curBrowseTableName = tablename;

2
src/sqlitetablemodel.h
View File

@@ -15,7 +15,7 @@ public:
int rowCount(const QModelIndex &parent = QModelIndex()) const;
int totalRowCount() const;
int columnCount(const QModelIndex &parent = QModelIndex()) const;
QVariant headerData(int section, Qt::Orientation orientation, int role) const;
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole);
bool canFetchMore(const QModelIndex &parent = QModelIndex()) const;