@@ -1187,7 +1187,7 @@ bool QgsOracleProvider::addFeatures( QgsFeatureList &flist, QgsFeatureSink::Flag
1187
1187
1188
1188
bool returnvalue = true ;
1189
1189
1190
- if ( !( flags & QgsFeatureSink::FastInsert ) && !getWorkspace ().isEmpty () && getWorkspace ().toUpper () != " LIVE" )
1190
+ if ( !( flags & QgsFeatureSink::FastInsert ) && !getWorkspace ().isEmpty () && getWorkspace ().compare ( QStringLiteral ( " LIVE" ), Qt::CaseInsensitive ) != 0 )
1191
1191
{
1192
1192
static bool warn = true ;
1193
1193
if ( warn )
@@ -1210,37 +1210,37 @@ bool QgsOracleProvider::addFeatures( QgsFeatureList &flist, QgsFeatureSink::Flag
1210
1210
}
1211
1211
1212
1212
// Prepare the INSERT statement
1213
- QString insert = QString ( " INSERT INTO %1(" ).arg ( mQuery );
1214
- QString values = " ) VALUES (" ;
1215
- QString delim = " " ;
1213
+ QString insert = QStringLiteral ( " INSERT INTO %1(" ).arg ( mQuery );
1214
+ QString values = QStringLiteral ( " ) VALUES (" ) ;
1215
+ QString delim;
1216
1216
1217
1217
QStringList defaultValues;
1218
1218
QList<int > fieldId;
1219
1219
1220
1220
if ( !mGeometryColumn .isNull () )
1221
1221
{
1222
1222
insert += quotedIdentifier ( mGeometryColumn );
1223
- values += " ? " ;
1224
- delim = " , " ;
1223
+ values += ' ? ' ;
1224
+ delim = ' , ' ;
1225
1225
}
1226
1226
1227
1227
if ( mPrimaryKeyType == PktInt || mPrimaryKeyType == PktFidMap )
1228
1228
{
1229
- QString keys, kdelim = " " ;
1229
+ QString keys, kdelim;
1230
1230
1231
1231
Q_FOREACH ( int idx, mPrimaryKeyAttrs )
1232
1232
{
1233
1233
QgsField fld = field ( idx );
1234
1234
insert += delim + quotedIdentifier ( fld.name () );
1235
1235
keys += kdelim + quotedIdentifier ( fld.name () );
1236
- values += delim + " ? " ;
1237
- delim = " , " ;
1238
- kdelim = " , " ;
1236
+ values += delim + ' ? ' ;
1237
+ delim = ' , ' ;
1238
+ kdelim = ' , ' ;
1239
1239
fieldId << idx;
1240
1240
defaultValues << defaultValue ( idx ).toString ();
1241
1241
}
1242
1242
1243
- if ( !getfid.prepare ( QString ( " SELECT %1 FROM %2 WHERE ROWID=?" ).arg ( keys ).arg ( mQuery ) ) )
1243
+ if ( !getfid.prepare ( QStringLiteral ( " SELECT %1 FROM %2 WHERE ROWID=?" ).arg ( keys ).arg ( mQuery ) ) )
1244
1244
{
1245
1245
throw OracleException ( tr ( " Could not prepare get feature id statement" ), getfid );
1246
1246
}
@@ -1270,16 +1270,16 @@ bool QgsOracleProvider::addFeatures( QgsFeatureList &flist, QgsFeatureSink::Flag
1270
1270
1271
1271
QString defVal = defaultValue ( idx ).toString ();
1272
1272
1273
- values += delim + " ? " ;
1273
+ values += delim + ' ? ' ;
1274
1274
defaultValues.append ( defVal );
1275
1275
fieldId.append ( idx );
1276
1276
1277
- delim = " , " ;
1277
+ delim = ' , ' ;
1278
1278
}
1279
1279
1280
1280
insert += values + " )" ;
1281
1281
1282
- QgsDebugMsgLevel ( QString ( " SQL prepare: %1" ).arg ( insert ), 4 );
1282
+ QgsDebugMsgLevel ( QStringLiteral ( " SQL prepare: %1" ).arg ( insert ), 4 );
1283
1283
if ( !ins.prepare ( insert ) )
1284
1284
{
1285
1285
throw OracleException ( tr ( " Could not prepare insert statement" ), ins );
@@ -1289,7 +1289,7 @@ bool QgsOracleProvider::addFeatures( QgsFeatureList &flist, QgsFeatureSink::Flag
1289
1289
{
1290
1290
QgsAttributes attributevec = features->attributes ();
1291
1291
1292
- QgsDebugMsgLevel ( QString ( " insert feature %1" ).arg ( features->id () ), 4 );
1292
+ QgsDebugMsgLevel ( QStringLiteral ( " insert feature %1" ).arg ( features->id () ), 4 );
1293
1293
1294
1294
if ( !mGeometryColumn .isNull () )
1295
1295
{
@@ -1318,7 +1318,7 @@ bool QgsOracleProvider::addFeatures( QgsFeatureList &flist, QgsFeatureSink::Flag
1318
1318
}
1319
1319
}
1320
1320
1321
- QgsDebugMsgLevel ( QString ( " addBindValue: %1" ).arg ( v ), 4 );
1321
+ QgsDebugMsgLevel ( QStringLiteral ( " addBindValue: %1" ).arg ( v ), 4 );
1322
1322
ins.addBindValue ( v );
1323
1323
}
1324
1324
@@ -1330,7 +1330,7 @@ bool QgsOracleProvider::addFeatures( QgsFeatureList &flist, QgsFeatureSink::Flag
1330
1330
if ( mPrimaryKeyType == PktRowId )
1331
1331
{
1332
1332
features->setId ( mShared ->lookupFid ( QList<QVariant>() << QVariant ( ins.lastInsertId () ) ) );
1333
- QgsDebugMsgLevel ( QString ( " new fid=%1" ).arg ( features->id () ), 4 );
1333
+ QgsDebugMsgLevel ( QStringLiteral ( " new fid=%1" ).arg ( features->id () ), 4 );
1334
1334
}
1335
1335
else if ( mPrimaryKeyType == PktInt || mPrimaryKeyType == PktFidMap )
1336
1336
{
@@ -1383,7 +1383,7 @@ bool QgsOracleProvider::addFeatures( QgsFeatureList &flist, QgsFeatureSink::Flag
1383
1383
1384
1384
features->setId ( mShared ->lookupFid ( primaryKeyVals ) );
1385
1385
}
1386
- QgsDebugMsgLevel ( QString ( " new fid=%1" ).arg ( features->id () ), 4 );
1386
+ QgsDebugMsgLevel ( QStringLiteral ( " new fid=%1" ).arg ( features->id () ), 4 );
1387
1387
}
1388
1388
}
1389
1389
}
@@ -1392,7 +1392,7 @@ bool QgsOracleProvider::addFeatures( QgsFeatureList &flist, QgsFeatureSink::Flag
1392
1392
}
1393
1393
catch ( OracleException &e )
1394
1394
{
1395
- QgsDebugMsg ( QString ( " Oracle error: %1" ).arg ( e.errorMessage () ) );
1395
+ QgsDebugMsg ( QStringLiteral ( " Oracle error: %1" ).arg ( e.errorMessage () ) );
1396
1396
pushError ( tr ( " Oracle error while adding features: %1" ).arg ( e.errorMessage () ) );
1397
1397
if ( !db.rollback () )
1398
1398
{
0 commit comments