Merge tag 'upstream/3.0.2'

Upstream version 3.0.2

# gpg: Signature made Fri 30 Jan 2015 05:00:11 PM EST using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"

1 files changed, 5 insertions, 4 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/schemaresolver.cpp b/SQLiteStudio3/coreSQLiteStudio/schemaresolver.cpp
index a1ceca5..f14d23d 100644
--- a/SQLiteStudio3/coreSQLiteStudio/schemaresolver.cpp
+++ b/SQLiteStudio3/coreSQLiteStudio/schemaresolver.cpp
@@ -306,7 +306,7 @@ QString SchemaResolver::getObjectDdl(const QString &database, const QString &nam
     // Validate query results
     if (!results.isValid() || results.isNull())
     {
-        qDebug() << "Could not get object's DDL:" << database << "." << name;
+        qDebug() << "Could not get object's DDL:" << dbName << "." << name;
         return QString::null;
     }
 
@@ -458,9 +458,10 @@ QStringList SchemaResolver::getAllObjects(const QString& database)
     return resList;
 }
 
-QString SchemaResolver::getUniqueName(const QString& database, const QString& namePrefix)
+QString SchemaResolver::getUniqueName(const QString& database, const QString& namePrefix, const QStringList& forbiddenNames)
 {
     QStringList allObjects = getAllObjects(database);
+    allObjects += forbiddenNames;
     QString baseName = namePrefix;
     QString name = baseName;
     for (int i = 0; allObjects.contains(name); i++)
@@ -469,9 +470,9 @@ QString SchemaResolver::getUniqueName(const QString& database, const QString& na
     return name;
 }
 
-QString SchemaResolver::getUniqueName(const QString& namePrefix)
+QString SchemaResolver::getUniqueName(const QString& namePrefix, const QStringList& forbiddenNames)
 {
-    return getUniqueName("main", namePrefix);
+    return getUniqueName("main", namePrefix, forbiddenNames);
 }
 
 QStringList SchemaResolver::getFkReferencingTables(const QString& table)