undo some more changes and move init of databaseinterface singleton t…

…o inside singleton() (but without creating the actual tablestructure, this remains the prerogative of DataSetPackage)
jasp-stats · Jan 15, 2025 · 5560bed · 5560bed
1 parent 631bbb5
commit 5560bed
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 14 deletions.
diff --git a/CommonData/databaseinterface.cpp b/CommonData/databaseinterface.cpp
@@ -1369,6 +1369,12 @@ std::string DatabaseInterface::dbFile(bool onlyName) const
 
 DatabaseInterface *DatabaseInterface::singleton() 
 { 
+	if(!_singleton)
+	{
+		Log::log() << "No DatabaseInterface::singleton available here yet, creating an interface for internal.sqlite without recreating the dbstructure" << std::endl;
+		_singleton = new DatabaseInterface(false);
+	}
+
 	return _singleton; 
 }
 

diff --git a/CommonData/dataset.cpp b/CommonData/dataset.cpp
@@ -619,9 +619,3 @@ bool DataSet::initColumnWithStrings(int colIndex, const std::string & newName, c
 	return anyChanges || column->type() != prevType;
 }
 
-bool DataSet::isFilterNameFree(const std::string& filterName)
-{
-	return -1 == db().filterGetId(filterName);
-}
-
-
diff --git a/CommonData/dataset.h b/CommonData/dataset.h
@@ -83,7 +83,6 @@ class DataSet : public DataSetBaseNode
 			void					setWorkspaceEmptyValues(	const stringset& values);
 	const	std::string			&	description()																	const	{ return _description; }
 			void					setDescription(				const std::string& desc);
-	bool							isFilterNameFree(			const std::string& filterName);
 
 private:			
 			void					upgradeTo019(const Json::Value & emptyVals);

diff --git a/CommonData/filter.cpp b/CommonData/filter.cpp
@@ -170,6 +170,11 @@ bool Filter::checkForUpdates()
 		return false;
 }
 
+bool Filter::filterNameIsFree(const std::string &filterName)
+{
+	return -1 == DatabaseInterface::singleton()->filterGetId(filterName);
+}
+
 void Filter::reset()
 {
 	if(!_data->writeBatchedToDB())

diff --git a/CommonData/filter.h b/CommonData/filter.h
@@ -52,8 +52,11 @@ class Filter : public DataSetBaseNode
 	void				dbLoad();
 	bool				dbLoadResultAndError();					///< Loads (updated) filtervalues from database and the (possible) error msg, returns true if an error is set
 	void				dbDelete();
-	void				incRevision()				override;
-	bool				checkForUpdates();	
+	void				incRevision()	override;
+	bool				checkForUpdates();
+
+	static bool			filterNameIsFree(const std::string & filterName);
+
 	void				reset();
 
 	DatabaseInterface		&	db();

diff --git a/Common/jsonutilities.cpp → CommonData/jsonutilities.cpp b/Common/jsonutilities.cpp → CommonData/jsonutilities.cpp
diff --git a/Common/jsonutilities.h → CommonData/jsonutilities.h b/Common/jsonutilities.h → CommonData/jsonutilities.h
diff --git a/QMLComponents/models/listmodelfiltereddataentry.cpp b/QMLComponents/models/listmodelfiltereddataentry.cpp
@@ -17,13 +17,12 @@ ListModelFilteredDataEntry::ListModelFilteredDataEntry(TableViewBase * parent)
 	connect(_tableView,				SIGNAL(colNameSignal(QString)),					this, SLOT(setColName(QString))								);
 	connect(_tableView,				SIGNAL(extraColSignal(QString)),				this, SLOT(setExtraCol(QString))							);
 
-	DataSet* dataSet = VariableInfo::info()->dataSet();
 	static int counter = 0;
 	do
 	{
 		_filterName = "ListModelFilteredDataEntry_" + std::to_string(counter++);
 	}
-	while(!dataSet->isFilterNameFree(_filterName));
+	while(!Filter::filterNameIsFree(_filterName));
 
 	connect(VariableInfo::info(),	&VariableInfo::dataSetChanged,					this, &ListModelFilteredDataEntry::dataSetChangedHandler);
 }

diff --git a/QMLComponents/variableinfo.cpp b/QMLComponents/variableinfo.cpp
@@ -70,8 +70,5 @@ bool VariableInfo::dataAvailable()
 
 DataSet *VariableInfo::dataSet()
 {
-	if(!DatabaseInterface::singleton())
-		new DatabaseInterface(false);
-
 	return _provider ? reinterpret_cast<DataSet*>(_provider->provideInfo(VariableInfo::DataSetPointer).value<void*>()) : nullptr;
 }