Update upstream source from tag 'upstream/3.3.3+dfsg1'

Update to upstream version '3.3.3+dfsg1'
with Debian dir 9a301fff4922aed2fec0c04c7d011947168c42f1

1 files changed, 4 insertions, 17 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/constraints/constraintcheckpanel.cpp b/SQLiteStudio3/guiSQLiteStudio/constraints/constraintcheckpanel.cpp
index adb5e2b..8a71777 100644
--- a/SQLiteStudio3/guiSQLiteStudio/constraints/constraintcheckpanel.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/constraints/constraintcheckpanel.cpp
@@ -54,11 +54,8 @@ void ConstraintCheckPanel::constraintAvailable()
     if (constraint.isNull())
         return;
 
-    if (constraint->dialect == Dialect::Sqlite3)
-    {
-        ui->onConflictCheck->setVisible(false);
-        ui->onConflictCombo->setVisible(false);
-    }
+    ui->onConflictCheck->setVisible(false);
+    ui->onConflictCombo->setVisible(false);
 
     readConstraint();
     updateVirtualSql();
@@ -76,14 +73,11 @@ void ConstraintCheckPanel::storeConfiguration()
     newExpr->setParent(constraint.data());
     storeExpr(newExpr);
 
-    QString name = QString::null;
+    QString name = QString();
     if (ui->namedCheck->isChecked())
         name = ui->namedEdit->text();
 
     storeName(name);
-
-    if (constraint->dialect == Dialect::Sqlite2 && ui->onConflictCheck->isChecked())
-        storeConflictAlgo(sqliteConflictAlgo(ui->onConflictCombo->currentText()));
 }
 
 void ConstraintCheckPanel::init()
@@ -116,13 +110,6 @@ void ConstraintCheckPanel::readConstraint()
         ui->namedCheck->setChecked(true);
         ui->namedEdit->setText(name);
     }
-
-    SqliteConflictAlgo onConflict = readConflictAlgo();
-    if (constraint->dialect == Dialect::Sqlite2 && onConflict != SqliteConflictAlgo::null)
-    {
-        ui->onConflictCheck->setChecked(true);
-        ui->onConflictCombo->setCurrentText(sqliteConflictAlgo(onConflict));
-    }
 }
 
 void ConstraintCheckPanel::updateVirtualSql()
@@ -157,7 +144,7 @@ void ConstraintCheckPanel::updateVirtualSql()
 
 SqliteExprPtr ConstraintCheckPanel::parseExpression(const QString& sql)
 {
-    Parser parser(db->getDialect());
+    Parser parser;
     SqliteExpr *expr = parser.parseExpr(sql);
     return SqliteExprPtr(expr);
 }