Development

ouroboroscoding · ouroboroscoding · commit a06e79ce6aa8 · 2023-09-10T14:12:16.000-04:00
- Fixed issues with Data not knowing what the key name is
diff --git a/record/data.py b/record/data.py
@@ -135,15 +135,19 @@ def add(self,
 		"""
 
 		# Add the record and store the ID
-		self._value['_id'] = self._storage.add(self._value, conflict, revision)
+		self._value[self._storage._key] = self._storage.add(
+			self._value,
+			conflict,
+			revision
+		)
 
 		# Clear changes and other flags
 		self._changes = None
 		self._errors = None
 		self._overwrite = False
 
 		# Return the ID
-		return self._value['_id']
+		return self._value[self._storage._key]
 
 	def changed(self) -> bool:
 		"""Changed
@@ -221,15 +225,21 @@ def save(self, revision_info: dict = None) -> bool:
 
 			# Pass the current value to the storage's save method
 			result = self._storage.save(
-				self._value['_id'], self._value, True, revision_info
+				self._value[self._storage._key],
+				self._value,
+				True,
+				revision_info
 			)
 
 		# Else, we are just updating
 		else:
 
 			# Pass the changes to the storage's save method
 			result = self._storage.save(
-				self._value['_id'], self._changes, False, revision_info
+				self._value[self._storage._key],
+				self._changes,
+				False,
+				revision_info
 			)
 
 		# If we were successful, clear all flags and changes
diff --git a/record/storage.py b/record/storage.py
@@ -38,6 +38,35 @@ class Storage(Tree, abc.ABC):
 		define.Tree
 	"""
 
+	def __init__(self,
+		details: dict | str,
+		extend: dict | Literal[False] = undefined,
+		key_name: str = '_id'
+	):
+		"""Constructor
+
+		Initialises the instance
+
+		Arguments:
+			details (dict | str): Definition or filepath to load
+			extend (dict | False): Optional, a dictionary to extend the \
+				definition
+			key_name (str): Optional, the name of the primary key field, \
+				defaults to '_id'
+
+		Raises:
+			KeyError, ValueError
+
+		Returns
+			Storage
+		"""
+
+		# Call the parent constructor
+		super(Storage, self).__init__(details, extend)
+
+		# Store the key name
+		self._key: str = key_name
+
 	@abc.abstractmethod
 	def add(self,
 		value: dict,
