Merge tag 'upstream/3.1.1+dfsg1'

Upstream version 3.1.1+dfsg1

# gpg: Signature made Thu 09 Feb 2017 04:37:24 AM EST
# gpg:                using RSA key 5001E1B09AA3744B
# gpg:                issuer "unit193@ubuntu.com"
# gpg: Good signature from "Unit 193 <unit193@ubuntu.com>" [unknown]
# gpg:                 aka "Unit 193 <unit193@gmail.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8DB3 E586 865D 2B4A 2B18  5A5C 5001 E1B0 9AA3 744B

1 files changed, 30 insertions, 0 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/common/table.cpp b/SQLiteStudio3/coreSQLiteStudio/common/table.cpp
index a9b0f16..20a9864 100644
--- a/SQLiteStudio3/coreSQLiteStudio/common/table.cpp
+++ b/SQLiteStudio3/coreSQLiteStudio/common/table.cpp
@@ -90,3 +90,33 @@ int qHash(AliasedTable table)
 {

     return qHash(table.getDatabase() + "." + table.getTable() + " " + table.getTableAlias());

 }

+

+DbAndTable::DbAndTable() :

+    Table()

+{

+}

+

+DbAndTable::DbAndTable(Db *db, const QString &database, const QString &table) :

+    Table(database, table), db(db)

+{

+}

+

+DbAndTable::DbAndTable(const DbAndTable &other) :

+    Table(other), db(other.db)

+{

+}

+

+int DbAndTable::operator ==(const DbAndTable &other) const

+{

+    return other.database == this->database && other.table == this->table && other.db == this->db;

+}

+

+Db *DbAndTable::getDb() const

+{

+    return db;

+}

+

+void DbAndTable::setDb(Db *value)

+{

+    db = value;

+}