CL-Softwares
/
Nut
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17 from HamedMasafi/master 

Merge back new commits into dev branch
This commit is contained in:
Hamed Masafi 2018-04-03 12:03:29 +04:30 committed by GitHub
parent feefeb67d7 baa7f7f45b
commit dd30844ee5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/database.cpp
View File

@ -448,7 +448,7 @@ QString Database::tableName(QString className)
if (m)
return m->name();
else
return QString::null;;
return QString();
}
void Database::setDatabaseName(QString databaseName)
@ -534,7 +534,7 @@ bool Database::open(bool updateDatabase)
else if (d->driver == "QSQLITE" || d->driver == "QSQLITE3")
d->sqlGenertor = new SqliteGenerator(this);
else if (d->driver == "QODBC" || d->driver == "QODBC3") {
QString driverName = QString::null;
QString driverName = QString();
QStringList parts = d->databaseName.toLower().split(';');
foreach (QString p, parts)
if (p.trimmed().startsWith("driver="))

6
src/databasemodel.cpp
View File

@ -31,13 +31,13 @@ QMap<QString, DatabaseModel*> DatabaseModel::_models;
#define NODE_VERSION "version"
#define NODE_TABLES "tables"
DatabaseModel::DatabaseModel(const QString &name) :
QList<TableModel*>(), _databaseClassName(name), _version(QString::null)
QList<TableModel*>(), _databaseClassName(name), _version(QString())
{
_models.insert(name, this);
}
DatabaseModel::DatabaseModel(const DatabaseModel &other) :
QList<TableModel*>(other), _version(QString::null)
QList<TableModel*>(other), _version(QString())
{
}
@ -173,7 +173,7 @@ RelationModel *DatabaseModel::relationByTableNames(const QString &masterTableNam
DatabaseModel DatabaseModel::fromJson(QJsonObject &json)
{
DatabaseModel model(QString::null);
DatabaseModel model(QString());
model.setVersion(json.value(NODE_VERSION).toString());

2
src/databasemodel.h
View File

@ -40,7 +40,7 @@ class DatabaseModel : public QList<TableModel *>
static QMap<QString, DatabaseModel *> _models;
public:
DatabaseModel(const QString &name = QString::null);
DatabaseModel(const QString &name = QString());
DatabaseModel(const DatabaseModel &other);
DatabaseModel(const QJsonObject &json);
~DatabaseModel();

2
src/generators/mysqlgenerator.cpp
View File

@ -88,7 +88,7 @@ QString MySqlGenerator::fieldType(FieldModel *field)
qPrintable(field->name),
QMetaType::typeName(field->type),
field->type);
dbType = "";
dbType = QString();
}
if(field->typeName == QStringLiteral("Nut::DbGeography"))

6
src/generators/postgresqlgenerator.cpp
View File

@ -92,7 +92,7 @@ QString PostgreSqlGenerator::fieldType(FieldModel *field)
default:
qDebug() << "Type for " << (int)field->type << field->type << "(" << QMetaType::typeName(field->type) << ")" << "nut supported";
dbType = "";
dbType = QString();
}
if(field->type == (unsigned)QMetaType::type("Nut::DbGeography"))
@ -103,10 +103,10 @@ QString PostgreSqlGenerator::fieldType(FieldModel *field)
QString PostgreSqlGenerator::diff(FieldModel *oldField, FieldModel *newField)
{
QString sql = "";
QString sql = QString();
if(oldField && newField)
if(*oldField == *newField)
return QString::null;
return QString();
if(!newField){
sql = "DROP COLUMN " + oldField->name;

52
src/generators/sqlgeneratorbase.cpp
View File

@ -65,13 +65,13 @@ SqlGeneratorBase::~SqlGeneratorBase()
QString SqlGeneratorBase::masterDatabaseName(QString databaseName)
{
Q_UNUSED(databaseName);
return "";
return QString();
}
QString SqlGeneratorBase::createTable(TableModel *table)
{
Q_UNUSED(table)
return "";
return QString();
}
QString SqlGeneratorBase::saveRecord(Table *t, QString tableName)
@ -92,15 +92,15 @@ QString SqlGeneratorBase::saveRecord(Table *t, QString tableName)
Q_UNREACHABLE();
}
return "";
return QString();
}
QString SqlGeneratorBase::recordsPhrase(TableModel *table)
{
if (!table)
return "";
return QString();
QString ret = "";
QString ret = QString();
foreach (FieldModel *f, table->fields()) {
if (!ret.isEmpty())
ret.append(", ");
@ -144,10 +144,10 @@ QStringList SqlGeneratorBase::diff(DatabaseModel lastModel,
QString SqlGeneratorBase::diff(FieldModel *oldField, FieldModel *newField)
{
QString sql = "";
QString sql = QString();
if (oldField && newField)
if (*oldField == *newField)
return QString::null;
return QString();
if (!newField) {
sql = "DROP COLUMN " + oldField->name;
@ -165,7 +165,7 @@ QString SqlGeneratorBase::diff(TableModel *oldTable, TableModel *newTable)
{
if (oldTable && newTable)
if (*oldTable == *newTable)
return "";
return QString();
if (!newTable)
return "DROP TABLE " + oldTable->name();
@ -235,7 +235,7 @@ QString SqlGeneratorBase::diff(TableModel *oldTable, TableModel *newTable)
QString SqlGeneratorBase::diffRelation(TableModel *oldTable, TableModel *newTable)
{
if (!newTable)
return "";
return QString();
QList<QString> relations;
@ -264,7 +264,7 @@ QString SqlGeneratorBase::diffRelation(TableModel *oldTable, TableModel *newTabl
return "ALTER TABLE " + newTable->name() + "\n"
+ columnSql.join(",\n");
else
return "";
return QString();
}
@ -297,7 +297,7 @@ QString SqlGeneratorBase::diff(RelationModel *oldRel, RelationModel *newRel)
.arg(oldRel->foreignColumn);
// if (*oldRel == *newRel)
return "";
return QString();
}
QString SqlGeneratorBase::join(const QString &mainTable,
@ -340,7 +340,7 @@ QString SqlGeneratorBase::join(const QStringList &list, QStringList *order)
*/
if (!list.count())
return "";
return QString();
if (list.count() == 1)
return "[" + list.first() + "]";
@ -394,7 +394,7 @@ QString SqlGeneratorBase::join(const QStringList &list, QStringList *order)
QString SqlGeneratorBase::insertRecord(Table *t, QString tableName)
{
QString sql = "";
QString sql = QString();
QString key = t->primaryKey();
QStringList values;
@ -403,7 +403,7 @@ QString SqlGeneratorBase::insertRecord(Table *t, QString tableName)
values.append("'" + t->property(f.toLatin1().data()).toString()
+ "'");
QString changedPropertiesText = "";
QString changedPropertiesText = QString();
QSet<QString> props = t->changedProperties();
foreach (QString s, props) {
if (changedPropertiesText != "")
@ -422,7 +422,7 @@ QString SqlGeneratorBase::insertRecord(Table *t, QString tableName)
QString SqlGeneratorBase::updateRecord(Table *t, QString tableName)
{
QString sql = "";
QString sql = QString();
QString key = t->primaryKey();
QStringList values;
@ -476,7 +476,7 @@ QString SqlGeneratorBase::agregateText(const AgregateType &t,
break;
default:
return QString::null;
return QString();
}
}
@ -502,7 +502,7 @@ QString SqlGeneratorBase::fromTableText(const QString &tableName,
qPrintable(tableName),
qPrintable(joinClassName),
qPrintable(joinTableName.isNull() ? "NULL" : joinTableName));
joinClassName = QString::null;
joinClassName = QString();
}
}
@ -511,7 +511,7 @@ QString SqlGeneratorBase::fromTableText(const QString &tableName,
QString SqlGeneratorBase::deleteRecords(QString tableName, QString where)
{
QString sql = "";
QString sql = QString();
if (where.isEmpty() || where.isNull())
sql = "DELETE FROM " + tableName;
else
@ -540,7 +540,7 @@ QString SqlGeneratorBase::selectCommand(const QString &tableName,
foreach (RelationModel *rel, joins)
tables << rel->masterTable << rel->slaveTable;
selectText = "";
selectText = QString();
foreach (TableModel *t, tables) {
if (!selectText.isEmpty())
selectText.append(", ");
@ -625,7 +625,7 @@ QString SqlGeneratorBase::updateCommand(const QString &tableName,
const AssignmentPhraseList &assigments,
const ConditionalPhrase &where)
{
QString assigmentTexts = "";
QString assigmentTexts = QString();
foreach (PhraseData *d, assigments.data) {
if (assigmentTexts != "")
assigmentTexts.append(", ");
@ -821,7 +821,7 @@ QString SqlGeneratorBase::escapeValue(const QVariant &v) const
default:
Q_UNREACHABLE();
return "";
return QString();
}
}
@ -834,7 +834,7 @@ QVariant SqlGeneratorBase::readValue(const QVariant::Type &type,
QString SqlGeneratorBase::phrase(const PhraseData *d) const
{
QString ret = "";
QString ret = QString();
switch (d->type) {
case PhraseData::Field:
@ -939,9 +939,9 @@ void SqlGeneratorBase::appendSkipTake(QString &sql, int skip, int take)
QString SqlGeneratorBase::createConditionalPhrase(const PhraseData *d) const
{
if (!d)
return "";
return QString();
QString ret = "";
QString ret = QString();
PhraseData::Condition op = d->operatorCond;
//apply not (!)
@ -999,7 +999,7 @@ QString SqlGeneratorBase::createConditionalPhrase(const PhraseData *d) const
QString SqlGeneratorBase::createOrderPhrase(const PhraseList &ph)
{
QString ret = "";
QString ret = QString();
foreach (const PhraseData *d, ph.data) {
if (ret != "")
ret.append(", ");
@ -1013,7 +1013,7 @@ QString SqlGeneratorBase::createOrderPhrase(const PhraseList &ph)
QString SqlGeneratorBase::createFieldPhrase(const PhraseList &ph)
{
QString ret = "";
QString ret = QString();
foreach (const PhraseData *d, ph.data) {
if (ret != "")
ret.append(", ");

2
src/generators/sqlgeneratorbase_p.h
View File

@ -131,7 +131,7 @@ protected:
QString createOrderPhrase(const PhraseList &ph);
void createInsertPhrase(const AssignmentPhraseList &ph, QString &fields, QString &values);
QString agregateText(const AgregateType &t, const QString &arg = QString::null) const;
QString agregateText(const AgregateType &t, const QString &arg = QString()) const;
QString fromTableText(const QString &tableName, QString &joinClassName, QString &orderBy) const;
// QString createWhere(QList<WherePhrase> &wheres);
void replaceTableNames(QString &command);

2
src/generators/sqlitegenerator.cpp
View File

@ -65,7 +65,7 @@ QString SqliteGenerator::fieldType(FieldModel *field)
dbType = "text";
break;
default:
dbType = "";
dbType = QString();
}
return dbType;

6
src/generators/sqlservergenerator.cpp
View File

@ -92,7 +92,7 @@ QString SqlServerGenerator::fieldType(FieldModel *field)
default:
Q_UNREACHABLE();
dbType = "";
dbType = QString();
}
return dbType;
@ -100,10 +100,10 @@ QString SqlServerGenerator::fieldType(FieldModel *field)
QString SqlServerGenerator::diff(FieldModel *oldField, FieldModel *newField)
{
QString sql = "";
QString sql = QString();
if (oldField && newField)
if (*oldField == *newField)
return QString::null;
return QString();
if (!newField) {
sql = "DROP COLUMN " + oldField->name;

2
src/tablemodel.cpp
View File

@ -402,7 +402,7 @@ QString TableModel::primaryKey() const
foreach (FieldModel *f, _fields)
if(f->isPrimaryKey)
return f->name;
return QString::null;
return QString();
}
FieldModel::FieldModel(const QJsonObject &json)

8
src/tablemodel.h
View File

@ -31,7 +31,7 @@ NUT_BEGIN_NAMESPACE
class TableModel;
struct FieldModel{
explicit FieldModel() : name(QString::null), length(0), defaultValue(QString::null),
explicit FieldModel() : name(QString()), length(0), defaultValue(QString()),
notNull(false), isPrimaryKey(false), isAutoIncrement(false), isUnique(false)
{
@ -70,8 +70,8 @@ struct FieldModel{
};
struct RelationModel{
RelationModel() : localColumn(""), localProperty(""), slaveTable(0),
foreignColumn(""), masterTable(0), masterClassName("")
RelationModel() : localColumn(QString()), localProperty(QString()), slaveTable(0),
foreignColumn(QString()), masterTable(0), masterClassName(QString())
{}
explicit RelationModel(const QJsonObject &obj);
@ -92,7 +92,7 @@ bool operator !=(const RelationModel &l, const RelationModel &r);
class TableModel
{
public:
explicit TableModel(int typeId, QString tableName = QString::null);
explicit TableModel(int typeId, QString tableName = QString());
explicit TableModel(QJsonObject json, QString tableName);
virtual ~TableModel();