solentware-base 5.2.2__tar.gz → 5.2.3__tar.gz

{solentware_base-5.2.2/solentware_base.egg-info → solentware_base-5.2.3}/PKG-INFO

@@ -1,28 +1,12 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: solentware-base
-Version: 5.2.2
+Version: 5.2.3
 Summary: Bitmapped record number databases.
 Author-email: Roger Marsh <roger.marsh@solentware.co.uk>
-License: Licence for solentware_base package
-        Copyright (c) 2009, Roger Marsh
-        All rights reserved.
-        
-        Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-        
-        
-        Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-        
-        Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-        
-        Neither the name of the owner nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-        
-        
-        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-        
+License-Expression: BSD-3-Clause
 Project-URL: Homepage, http://www.solentware.co.uk
 Project-URL: Repository, https://github.com/RogerMarsh/solentware-base.git
 Project-URL: Bug Tracker, https://github.com/RogerMarsh/solentware-base/issues
-Classifier: License :: OSI Approved :: BSD License
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -32,6 +16,7 @@ Classifier: Topic :: Database
 Classifier: Intended Audience :: Developers
 Classifier: Development Status :: 3 - Alpha
 License-File: LICENCE
+Dynamic: license-file
 
 =========================================================================
 A bitmapped record number database interface for various database engines

{solentware_base-5.2.2 → solentware_base-5.2.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [build-system]
 requires = [
-    "setuptools>=61.0",
+    "setuptools>=77.0.3",
     "wheel"
 ]
 build-backend = "setuptools.build_meta"
@@ -10,13 +10,12 @@ line-length = 79
 
 [project]
 name = "solentware-base"
-version = "5.2.2"
+version = "5.2.3"
 authors = [
   { name="Roger Marsh", email="roger.marsh@solentware.co.uk" },
 ]
 description = "Bitmapped record number databases."
 classifiers = [
-    "License :: OSI Approved :: BSD License",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
@@ -26,7 +25,8 @@ classifiers = [
     "Intended Audience :: Developers",
     "Development Status :: 3 - Alpha",
 ]
-license = {file = "LICENCE"}
+license = "BSD-3-Clause"
+license-files = ["LICENCE"]
 readme = "README"
 
 [project.urls]

{solentware_base-5.2.2 → solentware_base-5.2.3}/solentware_base/core/_database.py

@@ -24,6 +24,10 @@ from .recordset import (
 )
 
 
+class DatabaseError(Exception):
+    """Exception for Database class."""
+
+
 class DataSourceCursorError(Exception):
     """Exception for database-specific DataSourceCursor setting."""
 

{solentware_base-5.2.2 → solentware_base-5.2.3}/solentware_base/core/_databasedu.py

@@ -16,7 +16,7 @@ from .bytebit import Bitarray
 from . import merge
 
 
-class DatabaseduError(Exception):
+class DatabaseduError(_database.DatabaseError):
     """Exception for Database class."""
 
 

{solentware_base-5.2.2 → solentware_base-5.2.3}/solentware_base/core/_db.py

@@ -63,7 +63,7 @@ _openbsd_platform = sys.platform.startswith("openbsd")
 del sys
 
 
-class DatabaseError(Exception):
+class DatabaseError(_database.DatabaseError):
     """Exception for Database class."""
 
 
@@ -549,7 +549,10 @@ class Database(_database.Database):
             for field in specification[SECONDARY]:
                 secondary = SUBFILE_DELIMITER.join((file, field))
                 if secondary in self.table:
-                    self.table[secondary].close()
+                    try:
+                        self.table[secondary].close()
+                    except AttributeError:
+                        pass
                     self.table[secondary] = None
         for k, dbo in self.table.items():
             if dbo is not None:

{solentware_base-5.2.2 → solentware_base-5.2.3}/solentware_base/core/_db_tkinter.py

@@ -62,7 +62,7 @@ _openbsd_platform = sys.platform.startswith("openbsd")
 del sys
 
 
-class DatabaseError(Exception):
+class DatabaseError(_database.DatabaseError):
     """Exception for Database class."""
 
 
@@ -713,7 +713,10 @@ class Database(_database.Database):
                     # careless about deleting closed secondary database DB
                     # objects in deferred update mode.  Exceptions occur
                     # here if that is allowed to happen with the Tcl API.
-                    tcl_tk_call((self.table[secondary], "close"))
+                    try:
+                        tcl_tk_call((self.table[secondary], "close"))
+                    except AttributeError:
+                        pass
                     self.table[secondary] = None
         for k, dbo in self.table.items():
             if dbo is not None:

{solentware_base-5.2.2 → solentware_base-5.2.3}/solentware_base/core/_dbdu.py

@@ -21,7 +21,7 @@ from .recordset import (
 from . import _databasedu
 
 
-class DatabaseError(Exception):
+class DatabaseError(_databasedu.DatabaseduError):
     """Exception for Database class."""
 
 
@@ -481,7 +481,7 @@ class Database(_databasedu.Database):
             assert len(record) == 2
             value, segment = record
             if len(segment) == 6:
-                count = b"x00\x01"
+                count = b"\x00\x01"
                 reference = segment[4:]
             else:
                 count = segment[4:6]
@@ -529,17 +529,23 @@ class Database(_databasedu.Database):
                     self.prev_key = item[0]
                     item_type = item.pop(2)
                     if item_type == EXISTING_SEGMENT_REFERENCE:
-                        self.cursor.put(item[0], b"".join(item[1:]), keylast)
                         assert len(item) == 4
+                        if item[-2] == b"\x00\x01":
+                            item.pop(-2)
+                        self.cursor.put(item[0], b"".join(item[1:]), keylast)
+                        length = len(b"".join(item[1:]))
+                        assert length == 10 or length == 6
                         return
                     if int.from_bytes(item[-2], byteorder="big") > 1:
                         item[-1] = segment_table.append(
                             item[-1], txn=self.database.dbtxn
                         ).to_bytes(4, byteorder="big")
                         assert len(item) == 4
+                        assert len(b"".join(item[1:])) == 10
                     else:
                         item.pop(2)
                         assert len(item) == 3
+                        assert len(b"".join(item[1:])) == 6
                     self.cursor.put(item[0], b"".join(item[1:]), keylast)
                     assert item_type == NEW_SEGMENT_CONTENT
                     return
@@ -547,22 +553,22 @@ class Database(_databasedu.Database):
                     assert item[2] == NEW_SEGMENT_CONTENT
                     del item[2]
                     high = read_high_item_in_index(self.cursor)
-                    existing_segment = make_segment_from_high(
+                    new_segment = make_segment_from_item(item)
+                    new_segment |= make_segment_from_high(
                         high, self.database.dbtxn
                     )
-                    new_segment = make_segment_from_item(item)
-                    new_segment |= existing_segment
                     new_segment.normalize()
                     item[-2] = (
                         self.database.encode_number_for_sequential_file_dump(
                             new_segment.count_records(), 2
                         )
                     )
-                    if int.from_bytes(high[-2], byteorder="big") == 1:
+                    if high[2] == b"\x00\x01":
                         item[-1] = segment_table.append(
                             new_segment.tobytes(), txn=self.database.dbtxn
                         ).to_bytes(4, byteorder="big")
                         self.cursor.delete()
+                        assert len(b"".join(item[1:])) == 10
                         self.cursor.put(item[0], b"".join(item[1:]), keylast)
                     else:
                         segment_table.put(
@@ -572,14 +578,19 @@ class Database(_databasedu.Database):
                         )
                         self.cursor.delete()
                         item[-1] = high[-1]
+                        assert len(b"".join(item[1:])) == 10
                         self.cursor.put(item[0], b"".join(item[1:]), keylast)
                     assert len(item) == 4
                     return
                 item_type = item.pop(2)
                 if item_type == EXISTING_SEGMENT_REFERENCE:
+                    assert len(item) == 4
                     self.prev_key = item[0]
+                    if item[-2] == b"\x00\x01":
+                        item.pop(-2)
                     self.cursor.put(item[0], b"".join(item[1:]), keylast)
-                    assert len(item) == 4
+                    length = len(b"".join(item[1:]))
+                    assert length == 10 or length == 6
                     return
                 if int.from_bytes(item[-2], byteorder="big") > 1:
                     item[-1] = segment_table.append(
@@ -587,9 +598,11 @@ class Database(_databasedu.Database):
                         txn=self.database.dbtxn,
                     ).to_bytes(4, byteorder="big")
                     assert len(item) == 4
+                    assert len(b"".join(item[1:])) == 10
                 else:
                     item.pop(2)
                     assert len(item) == 3
+                    assert len(b"".join(item[1:])) == 6
                 self.cursor.put(item[0], b"".join(item[1:]), keylast)
                 assert item_type == NEW_SEGMENT_CONTENT
                 return

{solentware_base-5.2.2 → solentware_base-5.2.3}/solentware_base/core/_dbdu_tkinter.py

@@ -22,7 +22,7 @@ from .recordset import (
 from . import _databasedu
 
 
-class DatabaseError(Exception):
+class DatabaseError(_databasedu.DatabaseduError):
     """Exception for Database class."""
 
 
@@ -576,7 +576,7 @@ class Database(_databasedu.Database):
             assert len(record) == 1
             value, segment = record[0]
             if len(segment) == 6:
-                count = b"x00\x01"
+                count = b"\x00\x01"
                 reference = segment[4:]
             else:
                 count = segment[4:6]
@@ -664,22 +664,28 @@ class Database(_databasedu.Database):
                     self.prev_key = item[0]
                     item_type = item.pop(2)
                     if item_type == EXISTING_SEGMENT_REFERENCE:
+                        assert len(item) == 4
+                        if item[-2] == b"\x00\x01":
+                            item.pop(-2)
                         tcl_tk_call(
                             tuple(
                                 self.write_item_to_index
                                 + [item[0], b"".join(item[1:])]
                             )
                         )
-                        assert len(item) == 4
+                        length = len(b"".join(item[1:]))
+                        assert length == 10 or length == 6
                         return
                     if int.from_bytes(item[-2], byteorder="big") > 1:
                         item[-1] = tcl_tk_call(
                             tuple(self.write_segment_value + [item[-1]])
                         ).to_bytes(4, byteorder="big")
                         assert len(item) == 4
+                        assert len(b"".join(item[1:])) == 10
                     else:
                         item.pop(2)
                         assert len(item) == 3
+                        assert len(b"".join(item[1:])) == 6
                     tcl_tk_call(
                         tuple(
                             self.write_item_to_index
@@ -694,22 +700,22 @@ class Database(_databasedu.Database):
                     high = read_high_item_in_index(
                         self.get_last_record_in_index
                     )
-                    existing_segment = make_segment_from_high(
+                    new_segment = make_segment_from_item(item)
+                    new_segment |= make_segment_from_high(
                         high, self.get_segment_value
                     )
-                    new_segment = make_segment_from_item(item)
-                    new_segment |= existing_segment
                     new_segment.normalize()
                     item[-2] = (
                         self.database.encode_number_for_sequential_file_dump(
                             new_segment.count_records(), 2
                         )
                     )
-                    if int.from_bytes(high[-2], byteorder="big") == 1:
+                    if high[2] == b"\x00\x01":
                         item[-1] = tcl_tk_call(
                             tuple(self.write_segment_value + [item[-1]])
                         ).to_bytes(4, byteorder="big")
                         tcl_tk_call(tuple(self.delete_index_item))
+                        assert len(b"".join(item[1:])) == 10
                         tcl_tk_call(
                             tuple(
                                 self.write_item_to_index
@@ -728,6 +734,7 @@ class Database(_databasedu.Database):
                         )
                         tcl_tk_call(tuple(self.delete_index_item))
                         item[-1] = high[-1]
+                        assert len(b"".join(item[1:])) == 10
                         tcl_tk_call(
                             tuple(
                                 self.write_item_to_index
@@ -738,23 +745,29 @@ class Database(_databasedu.Database):
                     return
                 item_type = item.pop(2)
                 if item_type == EXISTING_SEGMENT_REFERENCE:
+                    assert len(item) == 4
                     self.prev_key = item[0]
+                    if item[-2] == b"\x00\x01":
+                        item.pop(-2)
                     tcl_tk_call(
                         tuple(
                             self.write_item_to_index
                             + [item[0], b"".join(item[1:])]
                         )
                     )
-                    assert len(item) == 4
+                    length = len(b"".join(item[1:]))
+                    assert length == 10 or length == 6
                     return
                 if int.from_bytes(item[-2], byteorder="big") > 1:
                     item[-1] = tcl_tk_call(
                         tuple(self.write_segment_value + [item[-1]])
                     ).to_bytes(4, byteorder="big")
                     assert len(item) == 4
+                    assert len(b"".join(item[1:])) == 10
                 else:
                     item.pop(2)
                     assert len(item) == 3
+                    assert len(b"".join(item[1:])) == 6
                 tcl_tk_call(
                     tuple(
                         self.write_item_to_index

{solentware_base-5.2.2 → solentware_base-5.2.3}/solentware_base/core/_dpt.py

@@ -63,7 +63,7 @@ FILE_PARAMETER_LIST = (
 SegmentSize.db_segment_size_bytes = TABLE_B_SIZE
 
 
-class DatabaseError(Exception):
+class DatabaseError(_database.DatabaseError):
     """Raise when an exceptional case is encountered in Database class."""
 
 
@@ -1292,6 +1292,11 @@ class DPTFile:
         # Open the file for normal use.
         self.open_existing_file(dbenv)
 
+        # Check requested fields exist.
+        # A RuntimeError is raised by GetFieldAtts() if field does not exist.
+        for field in self.fields:
+            self.opencontext.GetFieldAtts(field)
+
         # Permanent instances for efficient file updates.
         self.fieldvalue = dptapi.APIFieldValue()
         self._putrecordcopy = dptapi.APIStoreRecordTemplate()

{solentware_base-5.2.2 → solentware_base-5.2.3}/solentware_base/core/_lmdb.py

@@ -38,7 +38,7 @@ from .recordset import (
 )
 
 
-class DatabaseError(Exception):
+class DatabaseError(_database.DatabaseError):
     """Exception for Database class."""
 
 

{solentware_base-5.2.2 → solentware_base-5.2.3}/solentware_base/core/_lmdbdu.py

@@ -19,7 +19,7 @@ from .recordset import (
 from . import _databasedu
 
 
-class DatabaseError(Exception):
+class DatabaseError(_databasedu.DatabaseduError):
     """Exception for Database class."""
 
 
@@ -530,7 +530,7 @@ class Database(_databasedu.Database):
             assert len(record) == 2
             value, segment = record
             if len(segment) == 6:
-                count = b"x00\x01"
+                count = b"\x00\x01"
                 reference = segment[4:]
             else:
                 count = segment[4:6]
@@ -587,17 +587,23 @@ class Database(_databasedu.Database):
                     self.prev_key = item[0]
                     item_type = item.pop(2)
                     if item_type == EXISTING_SEGMENT_REFERENCE:
-                        self.cursor.put(item[0], b"".join(item[1:]))
                         assert len(item) == 4
+                        if item[-2] == b"\x00\x01":
+                            item.pop(-2)
+                        self.cursor.put(item[0], b"".join(item[1:]))
+                        length = len(b"".join(item[1:]))
+                        assert length == 10 or length == 6
                         return
                     if int.from_bytes(item[-2], byteorder="big") > 1:
                         item[-1] = write_segment_value(
                             item[-1], self.segment_cursor
                         )
                         assert len(item) == 4
+                        assert len(b"".join(item[1:])) == 10
                     else:
                         item.pop(2)
                         assert len(item) == 3
+                        assert len(b"".join(item[1:])) == 6
                     self.cursor.put(item[0], b"".join(item[1:]))
                     assert item_type == NEW_SEGMENT_CONTENT
                     return
@@ -605,22 +611,22 @@ class Database(_databasedu.Database):
                     assert item[2] == NEW_SEGMENT_CONTENT
                     del item[2]
                     high = read_high_item_in_index(self.cursor)
-                    existing_segment = make_segment_from_high(
+                    new_segment = make_segment_from_item(item)
+                    new_segment |= make_segment_from_high(
                         high, self.database.dbtxn.transaction
                     )
-                    new_segment = make_segment_from_item(item)
-                    new_segment |= existing_segment
                     new_segment.normalize()
                     item[-2] = (
                         self.database.encode_number_for_sequential_file_dump(
                             new_segment.count_records(), 2
                         )
                     )
-                    if int.from_bytes(item[-2], byteorder="big") == 1:
+                    if high[2] == b"\x00\x01":
                         item[-1] = write_segment_value(
                             new_segment.tobytes(), self.segment_cursor
                         )
                         self.cursor.delete()
+                        assert len(b"".join(item[1:])) == 10
                         self.cursor.put(item[0], b"".join(item[1:]))
                     else:
                         self.database.dbtxn.transaction.put(
@@ -630,23 +636,30 @@ class Database(_databasedu.Database):
                         )
                         self.cursor.delete()
                         item[-1] = high[-1]
+                        assert len(b"".join(item[1:])) == 10
                         self.cursor.put(item[0], b"".join(item[1:]))
                     assert len(item) == 4
                     return
                 item_type = item.pop(2)
                 if item_type == EXISTING_SEGMENT_REFERENCE:
+                    assert len(item) == 4
                     self.prev_key = item[0]
+                    if item[-2] == b"\x00\x01":
+                        item.pop(-2)
                     self.cursor.put(item[0], b"".join(item[1:]))
-                    assert len(item) == 4
+                    length = len(b"".join(item[1:]))
+                    assert length == 10 or length == 6
                     return
                 if int.from_bytes(item[-2], byteorder="big") > 1:
                     item[-1] = write_segment_value(
                         item[-1], self.segment_cursor
                     )
                     assert len(item) == 4
+                    assert len(b"".join(item[1:])) == 10
                 else:
                     item.pop(2)
                     assert len(item) == 3
+                    assert len(b"".join(item[1:])) == 6
                 self.cursor.put(item[0], b"".join(item[1:]))
                 assert item_type == NEW_SEGMENT_CONTENT
                 return

{solentware_base-5.2.2 → solentware_base-5.2.3}/solentware_base/core/_nosql.py

@@ -59,7 +59,7 @@ from .recordset import (
 )
 
 
-class DatabaseError(Exception):
+class DatabaseError(_database.DatabaseError):
     """Exception for Database class."""
 
 
@@ -293,6 +293,12 @@ class Database(_database.Database):
             (self.table[CONTROL_FILE], FIELD_REGISTER_KEY.decode())
         )
 
+        # These two moved from the try clauses just below to keep the tests
+        # with memory-only databases passing.  Implication is memory-only
+        # databases behave differently when adding fields, and the tests no
+        # longer truly test the code.
+        rsk = None
+        rssbk = None
         # The ___control table should be present already if the file exists.
         if self.database_file is not None:
             dbenv = dbclass(self.database_file)
@@ -300,11 +306,11 @@ class Database(_database.Database):
             if specification_key in dbenv:
                 rsk = dbenv[specification_key]
             else:
-                rsk = None
+                pass
             if segment_size_bytes_key in dbenv:
                 rssbk = dbenv[segment_size_bytes_key]
             else:
-                rssbk = None
+                pass
             if rsk is not None and rssbk is not None:
                 spec_from_db = literal_eval(rsk.decode())
                 if self._use_specification_items is not None:
@@ -383,6 +389,28 @@ class Database(_database.Database):
             dbenv = dbclass()
             dbenv.disable_autocommit()
 
+        if rsk:
+            if len(table_register) != len(self.specification) + 1:
+                raise DatabaseError(
+                    "Specification and table register sizes inconsistent"
+                )
+            if set(self.specification.keys()).difference(table_register):
+                raise DatabaseError(
+                    "Specification and table register content inconsistent"
+                )
+            for speckey in self.specification:
+                if len(self.specification[speckey][SECONDARY]) > len(
+                    field_register[speckey]
+                ):
+                    raise DatabaseError(
+                        "Specification and field register size inconsistent"
+                    )
+                if set(self.specification[speckey][SECONDARY]).difference(
+                    set(field_register[speckey])
+                ):
+                    raise DatabaseError(
+                        "Specification and field register content inconsistent"
+                    )
         self.set_segment_size()
         self.dbenv = dbenv
         if files is None:

{solentware_base-5.2.2 → solentware_base-5.2.3}/solentware_base/core/_nosqldu.py

@@ -26,7 +26,7 @@ from . import _databasedu
 from .recordset import RecordsetSegmentList
 
 
-class DatabaseError(Exception):
+class DatabaseError(_databasedu.DatabaseduError):
     """Exception for Database class."""
 
 

{solentware_base-5.2.2 → solentware_base-5.2.3}/solentware_base/core/_sqlite.py

@@ -47,7 +47,7 @@ from .recordset import (
 )
 
 
-class DatabaseError(Exception):
+class DatabaseError(_database.DatabaseError):
     """Exception for Database class."""
 
 
@@ -161,6 +161,12 @@ class Database(_database.Database):
                 if not os.path.isdir(self.home_directory):
                     raise
 
+        # These two moved from the try clauses just below to keep the tests
+        # with memory-only databases passing.  Implication is memory-only
+        # databases behave differently when adding fields, and the tests no
+        # longer truly test the code.
+        rsk = None
+        rssbk = None
         # The ___control table should be present already if the file exists.
         if self.database_file is not None:
             dbenv = dbe.Connection(self.database_file)
@@ -180,12 +186,12 @@ class Database(_database.Database):
                 cursor.execute(statement, (SPECIFICATION_KEY,))
                 rsk = cursor.fetchall()
             except Exception:
-                rsk = None
+                pass
             try:
                 cursor.execute(statement, (SEGMENT_SIZE_BYTES_KEY,))
                 rssbk = cursor.fetchall()
             except Exception:
-                rssbk = None
+                pass
             if rsk is not None and rssbk is not None:
                 spec_from_db = literal_eval(rsk[0][0])
                 if self._use_specification_items is not None:
@@ -230,91 +236,98 @@ class Database(_database.Database):
         self.start_transaction()
         cursor = self.dbenv.cursor()
         self.table[CONTROL_FILE] = CONTROL_FILE
-        statement = " ".join(
-            (
-                create_table,
-                CONTROL_FILE,
-                "(",
-                CONTROL_FILE,
-                ",",
-                SQLITE_VALUE_COLUMN,
-                ",",
-                "primary key",
-                "(",
-                CONTROL_FILE,
-                ",",
-                SQLITE_VALUE_COLUMN,
-                ") )",
-            )
-        )
-        cursor.execute(statement)
-        for file, specification in self.specification.items():
-            if file not in files:
-                continue
-            fields = specification[SECONDARY]
-            self.table[file] = file
+        if rsk is None:
             statement = " ".join(
                 (
                     create_table,
-                    self.table[file],
+                    CONTROL_FILE,
                     "(",
-                    file,
-                    db_key,
+                    CONTROL_FILE,
+                    ",",
                     SQLITE_VALUE_COLUMN,
-                    ")",
-                )
-            )
-            cursor.execute(statement)
-            self.ebm_control[file] = ExistenceBitmapControl(file, self)
-            segmentfile = SUBFILE_DELIMITER.join((file, SEGMENT_SUFFIX))
-            self.segment_table[file] = segmentfile
-            statement = " ".join(
-                (
-                    create_table,
-                    segmentfile,
+                    ",",
+                    "primary key",
                     "(",
-                    SQLITE_RECORDS_COLUMN,
-                    ")",
+                    CONTROL_FILE,
+                    ",",
+                    SQLITE_VALUE_COLUMN,
+                    ") )",
                 )
             )
             cursor.execute(statement)
-            for field in fields:
-                secondary = SUBFILE_DELIMITER.join((file, field))
-                self.table[secondary] = secondary
+        for file, specification in self.specification.items():
+            if file not in files:
+                continue
+            fields = specification[SECONDARY]
+            self.table[file] = file
+            if rsk is None:
                 statement = " ".join(
                     (
                         create_table,
-                        secondary,
+                        self.table[file],
                         "(",
-                        field,
-                        ",",
-                        SQLITE_SEGMENT_COLUMN,
-                        ",",
-                        SQLITE_COUNT_COLUMN,
-                        ",",
                         file,
+                        db_key,
+                        SQLITE_VALUE_COLUMN,
                         ")",
                     )
                 )
                 cursor.execute(statement)
-                indexname = "".join(
-                    (INDEXPREFIX, SUBFILE_DELIMITER.join((file, field)))
-                )
-                self.index[secondary] = indexname
+            self.ebm_control[file] = ExistenceBitmapControl(file, self)
+            segmentfile = SUBFILE_DELIMITER.join((file, SEGMENT_SUFFIX))
+            self.segment_table[file] = segmentfile
+            if rsk is None:
                 statement = " ".join(
                     (
-                        db_create_index,
-                        indexname,
-                        "on",
-                        secondary,
+                        create_table,
+                        segmentfile,
                         "(",
-                        field,
-                        ",",
-                        SQLITE_SEGMENT_COLUMN,
+                        SQLITE_RECORDS_COLUMN,
                         ")",
                     )
                 )
                 cursor.execute(statement)
+            for field in fields:
+                secondary = SUBFILE_DELIMITER.join((file, field))
+                self.table[secondary] = secondary
+                if rsk is None:
+                    statement = " ".join(
+                        (
+                            create_table,
+                            secondary,
+                            "(",
+                            field,
+                            ",",
+                            SQLITE_SEGMENT_COLUMN,
+                            ",",
+                            SQLITE_COUNT_COLUMN,
+                            ",",
+                            file,
+                            ")",
+                        )
+                    )
+                    cursor.execute(statement)
+                else:
+                    self._raise_if_no_object("table", secondary)
+                indexname = "".join(
+                    (INDEXPREFIX, SUBFILE_DELIMITER.join((file, field)))
+                )
+                self.index[secondary] = indexname
+                if rsk is None:
+                    statement = " ".join(
+                        (
+                            db_create_index,
+                            indexname,
+                            "on",
+                            secondary,
+                            "(",
+                            field,
+                            ",",
+                            SQLITE_SEGMENT_COLUMN,
+                            ")",
+                        )
+                    )
+                    cursor.execute(statement)
         if self.database_file is not None:
             if rsk is None and rssbk is None:
                 statement = " ".join(
@@ -338,6 +351,33 @@ class Database(_database.Database):
                 )
         self.commit()
 
+    def _raise_if_no_object(self, type_, name):
+        """Raise DatabaseError if object of type_ and name does not exist."""
+        statement = " ".join(
+            (
+                "select name from sqlite_master where type",
+                "== ?",
+                "and name",
+                "== ?",
+            )
+        )
+        cursor = self.dbenv.cursor()
+        try:
+            if cursor.execute(statement, (type_, name)).fetchone() is None:
+                raise DatabaseError(
+                    "".join(
+                        (
+                            "Database does not have '",
+                            type_,
+                            "' named '",
+                            name,
+                            "'",
+                        )
+                    )
+                )
+        finally:
+            cursor.close()
+
     def close_database_contexts(self, files=None):
         """Close files in database.
 

{solentware_base-5.2.2 → solentware_base-5.2.3}/solentware_base/core/_sqlitedu.py

@@ -27,7 +27,7 @@ from .recordset import (
 )
 
 
-class DatabaseError(Exception):
+class DatabaseError(_databasedu.DatabaseduError):
     """Exception for Database class."""
 
 

{solentware_base-5.2.2 → solentware_base-5.2.3}/solentware_base/core/merge.py

@@ -110,9 +110,12 @@ class SortIndiciesToSequentialFiles:
                     reference.clear()
                 count = (self.segment + 1) * SegmentSize.db_segment_size
             self.segment = segment
-        for index, reference in self.indicies.items():
-            for item in value[index]:
-                reference.setdefault(item, []).append(key)
+        indicies = self.indicies
+        for index, values in value.items():
+            reference = indicies.get(index)
+            if reference is not None:
+                for item in values:
+                    reference.setdefault(item, []).append(key)
         return count
 
     def write_segment_to_sequential_file(self, index, reference):

{solentware_base-5.2.2 → solentware_base-5.2.3/solentware_base.egg-info}/PKG-INFO

@@ -1,28 +1,12 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: solentware-base
-Version: 5.2.2
+Version: 5.2.3
 Summary: Bitmapped record number databases.
 Author-email: Roger Marsh <roger.marsh@solentware.co.uk>
-License: Licence for solentware_base package
-        Copyright (c) 2009, Roger Marsh
-        All rights reserved.
-        
-        Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-        
-        
-        Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-        
-        Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-        
-        Neither the name of the owner nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-        
-        
-        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-        
+License-Expression: BSD-3-Clause
 Project-URL: Homepage, http://www.solentware.co.uk
 Project-URL: Repository, https://github.com/RogerMarsh/solentware-base.git
 Project-URL: Bug Tracker, https://github.com/RogerMarsh/solentware-base/issues
-Classifier: License :: OSI Approved :: BSD License
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -32,6 +16,7 @@ Classifier: Topic :: Database
 Classifier: Intended Audience :: Developers
 Classifier: Development Status :: 3 - Alpha
 License-File: LICENCE
+Dynamic: license-file
 
 =========================================================================
 A bitmapped record number database interface for various database engines