diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2015-01-30 17:00:24 -0500 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2015-01-30 17:00:24 -0500 |
| commit | e4767514ed04e6a0bddf3f4a47f5f0b09e65e0ee (patch) | |
| tree | 86cadc2137831d44fa29fd40a2964f7fb1326de4 /SQLiteStudio3/coreSQLiteStudio/schemaresolver.h | |
| parent | 26ddfe11c2b7fac52e5f57dcd9f5223a50b2a9a7 (diff) | |
| parent | 016003905ca0e8e459e3dc33e786beda8ec92f45 (diff) | |
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>"
Diffstat (limited to 'SQLiteStudio3/coreSQLiteStudio/schemaresolver.h')
| -rw-r--r-- | SQLiteStudio3/coreSQLiteStudio/schemaresolver.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/SQLiteStudio3/coreSQLiteStudio/schemaresolver.h b/SQLiteStudio3/coreSQLiteStudio/schemaresolver.h index e1a8d5d..5316f5a 100644 --- a/SQLiteStudio3/coreSQLiteStudio/schemaresolver.h +++ b/SQLiteStudio3/coreSQLiteStudio/schemaresolver.h @@ -52,8 +52,8 @@ class API_EXPORT SchemaResolver QStringList getObjects(const QString& database, const QString& type); QStringList getAllObjects(); QStringList getAllObjects(const QString& database); - QString getUniqueName(const QString& database, const QString& namePrefix); - QString getUniqueName(const QString& namePrefix = QString::null); + QString getUniqueName(const QString& database, const QString& namePrefix, const QStringList& forbiddenNames = QStringList()); + QString getUniqueName(const QString& namePrefix = QString::null, const QStringList& forbiddenNames = QStringList()); QStringList getFkReferencingTables(const QString& table); QStringList getFkReferencingTables(const QString& database, const QString& table); |