@@ -225,7 +225,7 @@ bool QgsSpatiaLiteProvider::featureAtId( int featureId, QgsFeature & feature, bo
225
225
const QString & fieldname = fld.name ();
226
226
sql += " , \" " ;
227
227
sql += fieldname;
228
- sql += " \" " ;
228
+ sql += " \" " ;
229
229
}
230
230
if ( fetchGeometry )
231
231
{
@@ -526,7 +526,7 @@ void QgsSpatiaLiteProvider::select( QgsAttributeList fetchAttributes, QgsRectang
526
526
const QString & fieldname = fld.name ();
527
527
sql += " , \" " ;
528
528
sql += fieldname;
529
- sql += " \" " ;
529
+ sql += " \" " ;
530
530
}
531
531
if ( fetchGeometry )
532
532
{
@@ -872,14 +872,12 @@ void QgsSpatiaLiteProvider::uniqueValues( int index, QList < QVariant > &uniqueV
872
872
uniqueValues.append ( QString ( " %1" ).arg ( sqlite3_column_double ( stmt, 0 ) ) );
873
873
break ;
874
874
case SQLITE_TEXT:
875
- txt = ( const char * ) sqlite3_column_text ( stmt, 0 );
876
- uniqueValues.append ( txt );
875
+ uniqueValues.append ( QString::fromUtf8 (( const char * ) sqlite3_column_text ( stmt, 0 ) ) );
877
876
break ;
878
877
default :
879
- txt = " " ;
880
- uniqueValues.append ( txt );
878
+ uniqueValues.append ( " " );
881
879
break ;
882
- };
880
+ }
883
881
}
884
882
else
885
883
{
@@ -952,7 +950,7 @@ bool QgsSpatiaLiteProvider::addFeatures( QgsFeatureList & flist )
952
950
953
951
sql += " , \" " ;
954
952
sql += fieldname;
955
- sql += " \" " ;
953
+ sql += " \" " ;
956
954
values += " , ?" ;
957
955
}
958
956
@@ -1033,7 +1031,7 @@ bool QgsSpatiaLiteProvider::addFeatures( QgsFeatureList & flist )
1033
1031
// performing actual row insert
1034
1032
ret = sqlite3_step ( stmt );
1035
1033
1036
- if ( ret == SQLITE_DONE || ret == SQLITE_ROW )
1034
+ if ( ret == SQLITE_DONE || ret == SQLITE_ROW )
1037
1035
{
1038
1036
numberFeatures++;
1039
1037
}
@@ -1254,29 +1252,29 @@ bool QgsSpatiaLiteProvider::changeAttributeValues( const QgsChangedAttributesMap
1254
1252
sql += " ," ;
1255
1253
else
1256
1254
first = false ;
1257
-
1258
- QVariant::Type type = siter->type ();
1259
- if ( siter->toString ().isEmpty () )
1260
- {
1261
- // assuming to be a NULL value
1262
- type = QVariant::Invalid;
1263
- }
1264
-
1265
- if ( type == QVariant::Invalid )
1266
- {
1267
- // binding a NULL value
1268
- sql += QString ( " \" %1\" =NULL" ).arg ( fieldName );
1269
- }
1270
- else if ( type == QVariant::Int || type == QVariant::Double )
1271
- {
1272
- // binding a NUMERIC value
1273
- sql += QString ( " \" %1\" =%2" ).arg ( fieldName ).arg ( siter->toString () );
1274
- }
1275
- else
1276
- {
1277
- // binding a TEXT value
1278
- sql += QString ( " \" %1\" =%2" ).arg ( fieldName ).arg ( quotedValue ( siter->toString () ) );
1279
- }
1255
+
1256
+ QVariant::Type type = siter->type ();
1257
+ if ( siter->toString ().isEmpty () )
1258
+ {
1259
+ // assuming to be a NULL value
1260
+ type = QVariant::Invalid;
1261
+ }
1262
+
1263
+ if ( type == QVariant::Invalid )
1264
+ {
1265
+ // binding a NULL value
1266
+ sql += QString ( " \" %1\" =NULL" ).arg ( fieldName );
1267
+ }
1268
+ else if ( type == QVariant::Int || type == QVariant::Double )
1269
+ {
1270
+ // binding a NUMERIC value
1271
+ sql += QString ( " \" %1\" =%2" ).arg ( fieldName ).arg ( siter->toString () );
1272
+ }
1273
+ else
1274
+ {
1275
+ // binding a TEXT value
1276
+ sql += QString ( " \" %1\" =%2" ).arg ( fieldName ).arg ( quotedValue ( siter->toString () ) );
1277
+ }
1280
1278
}
1281
1279
sql += QString ( " WHERE ROWID=%1" ).arg ( fid );
1282
1280
0 commit comments