@@ -120,24 +120,19 @@ bool DBBrowserDB::open(const QString& db)
120
120
return false ;
121
121
}
122
122
123
- if (_db){
123
+ if (_db)
124
+ {
124
125
// set preference defaults
125
126
QSettings settings (QApplication::organizationName (), QApplication::organizationName ());
126
127
settings.sync ();
127
128
bool foreignkeys = settings.value ( " /db/foreignkeys" , false ).toBool ();
128
129
setPragma (" foreign_keys" , foreignkeys ? " 1" : " 0" );
129
130
130
- if (SQLITE_OK==sqlite3_exec (_db," PRAGMA empty_result_callbacks = ON;" ,
131
- NULL ,NULL ,NULL )){
132
- if (SQLITE_OK==sqlite3_exec (_db," PRAGMA show_datatypes = ON;" ,
133
- NULL ,NULL ,NULL )){
134
- ok=true ;
135
- }
136
- curDBFilename = db;
137
- }
138
-
139
131
// Enable extension loading
140
132
sqlite3_enable_load_extension (_db, 1 );
133
+
134
+ ok = true ;
135
+ curDBFilename = db;
141
136
}
142
137
143
138
return ok;
@@ -239,16 +234,8 @@ bool DBBrowserDB::create ( const QString & db)
239
234
return false ;
240
235
}
241
236
242
- if (_db){
243
- if (SQLITE_OK==sqlite3_exec (_db," PRAGMA empty_result_callbacks = ON;" ,
244
- NULL ,NULL ,NULL )){
245
- if (SQLITE_OK==sqlite3_exec (_db," PRAGMA show_datatypes = ON;" ,
246
- NULL ,NULL ,NULL )){
247
- ok=true ;
248
- }
249
- curDBFilename = db;
250
- }
251
-
237
+ if (_db)
238
+ {
252
239
// Enable extension loading
253
240
sqlite3_enable_load_extension (_db, 1 );
254
241
@@ -258,6 +245,9 @@ bool DBBrowserDB::create ( const QString & db)
258
245
sqlite3_exec (_db, " CREATE TABLE notempty (id integer primary key);" , NULL , NULL , NULL );
259
246
sqlite3_exec (_db, " DROP TABLE notempty" , NULL , NULL , NULL );
260
247
sqlite3_exec (_db, " COMMIT;" , NULL , NULL , NULL );
248
+
249
+ ok = true ;
250
+ curDBFilename = db;
261
251
}
262
252
263
253
return ok;
0 commit comments