Return numeric values from model when appropriate

mgrojo · mgrojo · commit 1ebe7bf2505d · 2024-08-04T18:58:34.000+02:00
When the EditRole is requested, the column type is numeric, and the stored value is numeric, the returned variant is a number (double or long-long). That allows differentiating the value for a SQL copy/paste operation. See issue #1952.
diff --git a/src/ExtendedTableWidget.cpp b/src/ExtendedTableWidget.cpp
@@ -684,9 +684,20 @@ void ExtendedTableWidget::copyMimeData(const QModelIndexList& fromIndices, QMime
                 // Text data
                 QByteArray text = bArrdata.toByteArray();
 
-                if (inSQL)
-                    result.append(sqlb::escapeString(text));
-                else {
+                if (inSQL) {
+                    // Escape string only if it isn't a number.
+                    switch(bArrdata.type()) {
+                    case QVariant::Double:
+                    case QVariant::Int:
+                    case QVariant::LongLong:
+                    case QVariant::UInt:
+                    case QVariant::ULongLong:
+                        result.append(text);
+                        break;
+                    default:
+                        result.append(sqlb::escapeString(text));
+                    }
+                } else {
                     result.append(text);
                     // Table cell data: text
                     if (text.contains('\n') || text.contains('\t'))
diff --git a/src/sqlitetablemodel.cpp b/src/sqlitetablemodel.cpp
@@ -361,9 +361,18 @@ QVariant SqliteTableModel::data(const QModelIndex &index, int role) const
             }
         }
     } else if(role == Qt::EditRole) {
-        if(!row_available)
+        if(!row_available || data.isNull())
             return QVariant();
-        return decode(data);
+        QVariant decodedData = decode(data);
+        // For the edit role, return the data according to its column type if possible.
+        if(m_vDataTypes.at(column) == SQLITE_INTEGER &&
+           decodedData.canConvert(QMetaType::LongLong)) {
+            decodedData.convert(QMetaType::LongLong);
+        } else if(m_vDataTypes.at(column) == SQLITE_FLOAT &&
+                  decodedData.canConvert(QMetaType::Double)) {
+            decodedData.convert(QMetaType::Double);
+        }
+        return decodedData;
     } else if(role == Qt::FontRole) {
         QFont font = m_font;
         if(!row_available || data.isNull() || isBinary(data))
