From efef0cc5ac00124c6d8c368fda49bf90969706d3 Mon Sep 17 00:00:00 2001 From: Peinthor Rene Date: Sun, 24 Mar 2013 13:01:58 +0100 Subject: [PATCH] rename createColumn to addColumn and make it work with the new sqltypes --- src/sqlitedb.cpp | 7 +++---- src/sqlitedb.h | 5 ++++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/sqlitedb.cpp b/src/sqlitedb.cpp index 470f067c..20b4ed47 100644 --- a/src/sqlitedb.cpp +++ b/src/sqlitedb.cpp @@ -1,7 +1,6 @@ #include "sqlitedb.h" #include "MainWindow.h" -#include "sqlitetypes.h" #include #include @@ -508,10 +507,10 @@ bool DBBrowserDB::createTable(const QString& name, const QList& return executeSQL(sql, false); } -bool DBBrowserDB::createColumn(const QString& tablename, const QString& fieldname, const QString& fieldtype) +bool DBBrowserDB::addColumn(const QString& tablename, const sqlb::FieldPtr& field) { - QString sql = QString("ALTER TABLE `%1` ADD COLUMN `%2` %3").arg(tablename).arg(fieldname).arg(fieldtype); - return executeSQL(sql); + QString sql = QString("ALTER TABLE `%1` ADD COLUMN %2").arg(tablename).arg(field->toString()); + return executeSQL(sql, false); } bool DBBrowserDB::renameColumn(const QString& tablename, const QString& from, const QString& to, const QString& type) diff --git a/src/sqlitedb.h b/src/sqlitedb.h index ad85dfc7..23120045 100644 --- a/src/sqlitedb.h +++ b/src/sqlitedb.h @@ -1,10 +1,13 @@ #ifndef SQLITEDB_H #define SQLITEDB_H +#include "sqlitetypes.h" + #include #include #include #include + class MainWindow; enum @@ -103,7 +106,7 @@ public: bool createTable(const QString& name, const QList& structure); bool renameTable(const QString& from_table, const QString& to_table); - bool createColumn(const QString& table, const QString& field, const QString& type); + bool addColumn(const QString& table, const sqlb::FieldPtr& field); bool renameColumn(const QString& tablename, const QString& from, const QString& to, const QString& type); bool dropColumn(const QString& tablename, const QString& column);