odb:

     1) Add error when trying to destroy instance
        that has an associated scan instance;
     2) Add schema for the inst->scan inst map.

Signed-off-by: Arthur Koucher <[email protected]>

Author: AcKoucher

src/odb/src/db/dbBlock.cpp

@@ -1025,7 +1025,7 @@ dbIStream& operator>>(dbIStream& stream, _dbBlock& block)
   if (db->isSchema(db_schema_bterm_top_layer_grid)) {
     stream >> block._bterm_top_layer_grid;
   }
-  if (db->isSchema(db_schema_block_owns_scan_insts)) {
+  if (db->isSchema(db_schema_map_insts_to_scan_insts)) {
     stream >> block._inst_scan_inst_map;
   }
 

src/odb/src/db/dbDatabase.h

@@ -43,8 +43,14 @@ namespace odb {
 const uint db_schema_major = 0;  // Not used...
 const uint db_schema_initial = 57;
 
-const uint db_schema_minor = 110;  // Current revision number
+const uint db_schema_minor = 111;  // Current revision number
 
+// Revision where the map which associates instances to their
+// scan version was added
+const uint db_schema_map_insts_to_scan_insts = 111;
+
+// Revision where the ownership of the scan insts was changed
+// from the its scan list to the block
 const uint db_schema_block_owns_scan_insts = 110;
 
 // Revision where is_connect_to_term_ flag was added to dbGuide

src/odb/src/db/dbInst.cpp

@@ -1428,6 +1428,15 @@ void dbInst::destroy(dbInst* inst_)
                              inst->_name);
   }
 
+  dbScanInst* scan_inst = inst_->getScanInst();
+  if (scan_inst) {
+    inst->getLogger()->error(
+        utl::ODB,
+        505,
+        "Attempt to destroy instance {} with an associated scan inst.",
+        inst->_name);
+  }
+
   uint i;
   uint n = inst->_iterms.size();