dbt-adapters 1.14.7__py3-none-any.whl → 1.15__py3-none-any.whl

dbt/adapters/__about__.py

@@ -1 +1 @@
-version = "1.14.7"
+version = "1.15"

dbt/adapters/base/impl.py

@@ -1289,7 +1289,17 @@ class BaseAdapter(metaclass=AdapterMeta):
         table = table_from_rows(
             table.rows,
             table.column_names,
-            text_only_columns=["table_database", "table_schema", "table_name"],
+            text_only_columns=[
+                "table_database",
+                "table_schema",
+                "table_name",
+                "table_type",
+                "table_comment",
+                "table_owner",
+                "column_name",
+                "column_type",
+                "column_comment",
+            ],
         )
         return table.where(_catalog_filter_schemas(used_schemas))
 

dbt/adapters/base/query_headers.py

@@ -54,6 +54,8 @@ QueryStringFunc = Callable[[str, Optional[QueryHeaderContextWrapper]], str]
 
 
 class MacroQueryStringSetter:
+    DEFAULT_QUERY_COMMENT_APPEND = False
+
     def __init__(
         self, config: AdapterRequiredConfig, query_header_context: Dict[str, Any]
     ) -> None:
@@ -95,7 +97,10 @@ class MacroQueryStringSetter:
             wrapped = QueryHeaderContextWrapper(query_header_context)
         comment_str = self.generator(name, wrapped)
 
-        append = False
-        if isinstance(self.config.query_comment, QueryComment):
+        append = self.DEFAULT_QUERY_COMMENT_APPEND
+        if (
+            isinstance(self.config.query_comment, QueryComment)
+            and self.config.query_comment.append is not None
+        ):
             append = self.config.query_comment.append
         self.comment.set(comment_str, append)

dbt/adapters/catalogs/_client.py

@@ -28,7 +28,7 @@ class CatalogIntegrationClient:
 
     def __init__(self, supported_catalogs: Iterable[Type[CatalogIntegration]]):
         self.__supported_catalogs: Dict[str, Type[CatalogIntegration]] = {
-            catalog.catalog_type: catalog for catalog in supported_catalogs
+            catalog.catalog_type.casefold(): catalog for catalog in supported_catalogs
         }
         self.__catalog_integrations: Dict[str, CatalogIntegration] = {}
 
@@ -47,7 +47,7 @@ class CatalogIntegrationClient:
 
     def __catalog_integration_factory(self, catalog_type: str) -> Type[CatalogIntegration]:
         try:
-            return self.__supported_catalogs[catalog_type]
+            return self.__supported_catalogs[catalog_type.casefold()]
         except KeyError as e:
             raise DbtCatalogIntegrationNotSupportedError(
                 catalog_type, self.__supported_catalogs.keys()

dbt/adapters/catalogs/_exceptions.py

@@ -25,8 +25,8 @@ class DbtCatalogIntegrationNotSupportedError(DbtConfigError):
     def __init__(self, catalog_type: str, supported_catalog_types: Iterable[str]) -> None:
         self.catalog_type = catalog_type
         msg = (
-            f"Catalog type is not supported."
-            f"Received: {catalog_type}"
+            f"Catalog type is not supported.\n"
+            f"Received: {catalog_type}\n"
             f"Expected one of: {', '.join(supported_catalog_types)}"
         )
         super().__init__(msg)

dbt/adapters/contracts/connection.py

@@ -217,7 +217,7 @@ DEFAULT_QUERY_COMMENT = """
 @dataclass
 class QueryComment(dbtClassMixin):
     comment: str = DEFAULT_QUERY_COMMENT
-    append: bool = False
+    append: Optional[bool] = None
     job_label: bool = field(default=False, metadata={"alias": "job-label"})
 
 

dbt/adapters/events/README.md

@@ -8,13 +8,7 @@ The event module provides types that represent what is happening in dbt in `even
 When events are processed via `fire_event`, nearly everything is logged. Whether or not the user has enabled the debug flag, all debug messages are still logged to the file. However, some events are particularly time consuming to construct because they return a huge amount of data. Today, the only messages in this category are cache events and are only logged if the `--log-cache-events` flag is on. This is important because these messages should not be created unless they are going to be logged, because they cause a noticable performance degredation. These events use a "fire_event_if" functions.
 
 # Adding a New Event
-* Add a new message in types.proto, and a second message with the same name + "Msg". The "Msg" message should have two fields, an "info" field of EventInfo, and a "data" field referring to the message name without "Msg"
-* run the protoc compiler to update adapter_types_pb2.py:   make adapter_proto_types
-* Add a wrapping class in core/dbt/adapters/event/types.py with a Level superclass  plus code and message methods
-
-We have switched from using betterproto to using google protobuf, because of a lack of support for Struct fields in betterproto.
-
-The google protobuf interface is janky and very much non-Pythonic. The "generated" classes in types_pb2.py do not resemble regular Python classes. They do not have normal constructors; they can only be constructed empty. They can be "filled" by setting fields individually or using a json_format method like ParseDict.  We have wrapped the logging events with a class (in types.py) which allows using a constructor -- keywords only, no positional parameters.
+All protos have been moved into the central protos repository. To edit an event proto, edit https://github.com/dbt-labs/proto-python-public or open an issue on that repository.
 
 ## Required for Every Event
 

dbt/adapters/events/adapter_types_pb2.py

@@ -1,220 +1,2 @@
-# -*- coding: utf-8 -*-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# NO CHECKED-IN PROTOBUF GENCODE
-# source: adapter_types.proto
-# Protobuf Python Version: 5.28.3
-"""Generated protocol buffer code."""
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import descriptor_pool as _descriptor_pool
-from google.protobuf import runtime_version as _runtime_version
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf.internal import builder as _builder
-_runtime_version.ValidateProtobufRuntimeVersion(
-    _runtime_version.Domain.PUBLIC,
-    5,
-    28,
-    3,
-    '',
-    'adapter_types.proto'
-)
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2
-from google.protobuf import struct_pb2 as google_dot_protobuf_dot_struct__pb2
-
-
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x13\x61\x64\x61pter_types.proto\x12\x0bproto_types\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1cgoogle/protobuf/struct.proto\"\xab\x02\n\x16\x41\x64\x61pterCommonEventInfo\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0c\n\x04\x63ode\x18\x02 \x01(\t\x12\x0b\n\x03msg\x18\x03 \x01(\t\x12\r\n\x05level\x18\x04 \x01(\t\x12\x15\n\rinvocation_id\x18\x05 \x01(\t\x12\x0b\n\x03pid\x18\x06 \x01(\x05\x12\x0e\n\x06thread\x18\x07 \x01(\t\x12&\n\x02ts\x18\x08 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12=\n\x05\x65xtra\x18\t \x03(\x0b\x32..proto_types.AdapterCommonEventInfo.ExtraEntry\x12\x10\n\x08\x63\x61tegory\x18\n \x01(\t\x1a,\n\nExtraEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"]\n\x13\x41\x64\x61pterNodeRelation\x12\x10\n\x08\x64\x61tabase\x18\n \x01(\t\x12\x0e\n\x06schema\x18\x0b \x01(\t\x12\r\n\x05\x61lias\x18\x0c \x01(\t\x12\x15\n\rrelation_name\x18\r \x01(\t\"\xb6\x02\n\x0f\x41\x64\x61pterNodeInfo\x12\x11\n\tnode_path\x18\x01 \x01(\t\x12\x11\n\tnode_name\x18\x02 \x01(\t\x12\x11\n\tunique_id\x18\x03 \x01(\t\x12\x15\n\rresource_type\x18\x04 \x01(\t\x12\x14\n\x0cmaterialized\x18\x05 \x01(\t\x12\x13\n\x0bnode_status\x18\x06 \x01(\t\x12\x17\n\x0fnode_started_at\x18\x07 \x01(\t\x12\x18\n\x10node_finished_at\x18\x08 \x01(\t\x12%\n\x04meta\x18\t \x01(\x0b\x32\x17.google.protobuf.Struct\x12\x37\n\rnode_relation\x18\n \x01(\x0b\x32 .proto_types.AdapterNodeRelation\x12\x15\n\rnode_checksum\x18\x0b \x01(\t\"G\n\x0fReferenceKeyMsg\x12\x10\n\x08\x64\x61tabase\x18\x01 \x01(\t\x12\x0e\n\x06schema\x18\x02 \x01(\t\x12\x12\n\nidentifier\x18\x03 \x01(\t\"?\n\x19\x41\x64\x61pterDeprecationWarning\x12\x10\n\x08old_name\x18\x01 \x01(\t\x12\x10\n\x08new_name\x18\x02 \x01(\t\"\x87\x01\n\x1c\x41\x64\x61pterDeprecationWarningMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12\x34\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32&.proto_types.AdapterDeprecationWarning\"!\n\x1f\x43ollectFreshnessReturnSignature\"\x93\x01\n\"CollectFreshnessReturnSignatureMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12:\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32,.proto_types.CollectFreshnessReturnSignature\"\x8e\x01\n\x11\x41\x64\x61pterEventDebug\x12/\n\tnode_info\x18\x01 \x01(\x0b\x32\x1c.proto_types.AdapterNodeInfo\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x10\n\x08\x62\x61se_msg\x18\x03 \x01(\t\x12(\n\x04\x61rgs\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.ListValue\"w\n\x14\x41\x64\x61pterEventDebugMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12,\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x1e.proto_types.AdapterEventDebug\"\x8d\x01\n\x10\x41\x64\x61pterEventInfo\x12/\n\tnode_info\x18\x01 \x01(\x0b\x32\x1c.proto_types.AdapterNodeInfo\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x10\n\x08\x62\x61se_msg\x18\x03 \x01(\t\x12(\n\x04\x61rgs\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.ListValue\"u\n\x13\x41\x64\x61pterEventInfoMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12+\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x1d.proto_types.AdapterEventInfo\"\x90\x01\n\x13\x41\x64\x61pterEventWarning\x12/\n\tnode_info\x18\x01 \x01(\x0b\x32\x1c.proto_types.AdapterNodeInfo\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x10\n\x08\x62\x61se_msg\x18\x03 \x01(\t\x12(\n\x04\x61rgs\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.ListValue\"{\n\x16\x41\x64\x61pterEventWarningMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12.\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32 .proto_types.AdapterEventWarning\"\xa0\x01\n\x11\x41\x64\x61pterEventError\x12/\n\tnode_info\x18\x01 \x01(\x0b\x32\x1c.proto_types.AdapterNodeInfo\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x10\n\x08\x62\x61se_msg\x18\x03 \x01(\t\x12(\n\x04\x61rgs\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.ListValue\x12\x10\n\x08\x65xc_info\x18\x05 \x01(\t\"w\n\x14\x41\x64\x61pterEventErrorMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12,\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x1e.proto_types.AdapterEventError\"f\n\rNewConnection\x12/\n\tnode_info\x18\x01 \x01(\x0b\x32\x1c.proto_types.AdapterNodeInfo\x12\x11\n\tconn_type\x18\x02 \x01(\t\x12\x11\n\tconn_name\x18\x03 \x01(\t\"o\n\x10NewConnectionMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12(\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x1a.proto_types.NewConnection\"=\n\x10\x43onnectionReused\x12\x11\n\tconn_name\x18\x01 \x01(\t\x12\x16\n\x0eorig_conn_name\x18\x02 \x01(\t\"u\n\x13\x43onnectionReusedMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12+\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x1d.proto_types.ConnectionReused\"0\n\x1b\x43onnectionLeftOpenInCleanup\x12\x11\n\tconn_name\x18\x01 \x01(\t\"\x8b\x01\n\x1e\x43onnectionLeftOpenInCleanupMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12\x36\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32(.proto_types.ConnectionLeftOpenInCleanup\".\n\x19\x43onnectionClosedInCleanup\x12\x11\n\tconn_name\x18\x01 \x01(\t\"\x87\x01\n\x1c\x43onnectionClosedInCleanupMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12\x34\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32&.proto_types.ConnectionClosedInCleanup\"f\n\x0eRollbackFailed\x12/\n\tnode_info\x18\x01 \x01(\x0b\x32\x1c.proto_types.AdapterNodeInfo\x12\x11\n\tconn_name\x18\x02 \x01(\t\x12\x10\n\x08\x65xc_info\x18\x03 \x01(\t\"q\n\x11RollbackFailedMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12)\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x1b.proto_types.RollbackFailed\"V\n\x10\x43onnectionClosed\x12/\n\tnode_info\x18\x01 \x01(\x0b\x32\x1c.proto_types.AdapterNodeInfo\x12\x11\n\tconn_name\x18\x02 \x01(\t\"u\n\x13\x43onnectionClosedMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12+\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x1d.proto_types.ConnectionClosed\"X\n\x12\x43onnectionLeftOpen\x12/\n\tnode_info\x18\x01 \x01(\x0b\x32\x1c.proto_types.AdapterNodeInfo\x12\x11\n\tconn_name\x18\x02 \x01(\t\"y\n\x15\x43onnectionLeftOpenMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12-\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x1f.proto_types.ConnectionLeftOpen\"N\n\x08Rollback\x12/\n\tnode_info\x18\x01 \x01(\x0b\x32\x1c.proto_types.AdapterNodeInfo\x12\x11\n\tconn_name\x18\x02 \x01(\t\"e\n\x0bRollbackMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12#\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x15.proto_types.Rollback\"@\n\tCacheMiss\x12\x11\n\tconn_name\x18\x01 \x01(\t\x12\x10\n\x08\x64\x61tabase\x18\x02 \x01(\t\x12\x0e\n\x06schema\x18\x03 \x01(\t\"g\n\x0c\x43\x61\x63heMissMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12$\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x16.proto_types.CacheMiss\"b\n\rListRelations\x12\x10\n\x08\x64\x61tabase\x18\x01 \x01(\t\x12\x0e\n\x06schema\x18\x02 \x01(\t\x12/\n\trelations\x18\x03 \x03(\x0b\x32\x1c.proto_types.ReferenceKeyMsg\"o\n\x10ListRelationsMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12(\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x1a.proto_types.ListRelations\"g\n\x0e\x43onnectionUsed\x12/\n\tnode_info\x18\x01 \x01(\x0b\x32\x1c.proto_types.AdapterNodeInfo\x12\x11\n\tconn_type\x18\x02 \x01(\t\x12\x11\n\tconn_name\x18\x03 \x01(\t\"q\n\x11\x43onnectionUsedMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12)\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x1b.proto_types.ConnectionUsed\"[\n\x08SQLQuery\x12/\n\tnode_info\x18\x01 \x01(\x0b\x32\x1c.proto_types.AdapterNodeInfo\x12\x11\n\tconn_name\x18\x02 \x01(\t\x12\x0b\n\x03sql\x18\x03 \x01(\t\"e\n\x0bSQLQueryMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12#\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x15.proto_types.SQLQuery\"t\n\x0eSQLQueryStatus\x12/\n\tnode_info\x18\x01 \x01(\x0b\x32\x1c.proto_types.AdapterNodeInfo\x12\x0e\n\x06status\x18\x02 \x01(\t\x12\x0f\n\x07\x65lapsed\x18\x03 \x01(\x02\x12\x10\n\x08query_id\x18\x04 \x01(\t\"q\n\x11SQLQueryStatusMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12)\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x1b.proto_types.SQLQueryStatus\"O\n\tSQLCommit\x12/\n\tnode_info\x18\x01 \x01(\x0b\x32\x1c.proto_types.AdapterNodeInfo\x12\x11\n\tconn_name\x18\x02 \x01(\t\"g\n\x0cSQLCommitMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12$\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x16.proto_types.SQLCommit\"a\n\rColTypeChange\x12\x11\n\torig_type\x18\x01 \x01(\t\x12\x10\n\x08new_type\x18\x02 \x01(\t\x12+\n\x05table\x18\x03 \x01(\x0b\x32\x1c.proto_types.ReferenceKeyMsg\"o\n\x10\x43olTypeChangeMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12(\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x1a.proto_types.ColTypeChange\"@\n\x0eSchemaCreation\x12.\n\x08relation\x18\x01 \x01(\x0b\x32\x1c.proto_types.ReferenceKeyMsg\"q\n\x11SchemaCreationMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12)\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x1b.proto_types.SchemaCreation\"<\n\nSchemaDrop\x12.\n\x08relation\x18\x01 \x01(\x0b\x32\x1c.proto_types.ReferenceKeyMsg\"i\n\rSchemaDropMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12%\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x17.proto_types.SchemaDrop\"\xde\x01\n\x0b\x43\x61\x63heAction\x12\x0e\n\x06\x61\x63tion\x18\x01 \x01(\t\x12-\n\x07ref_key\x18\x02 \x01(\x0b\x32\x1c.proto_types.ReferenceKeyMsg\x12/\n\tref_key_2\x18\x03 \x01(\x0b\x32\x1c.proto_types.ReferenceKeyMsg\x12/\n\tref_key_3\x18\x04 \x01(\x0b\x32\x1c.proto_types.ReferenceKeyMsg\x12.\n\x08ref_list\x18\x05 \x03(\x0b\x32\x1c.proto_types.ReferenceKeyMsg\"k\n\x0e\x43\x61\x63heActionMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12&\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x18.proto_types.CacheAction\"\x98\x01\n\x0e\x43\x61\x63heDumpGraph\x12\x33\n\x04\x64ump\x18\x01 \x03(\x0b\x32%.proto_types.CacheDumpGraph.DumpEntry\x12\x14\n\x0c\x62\x65\x66ore_after\x18\x02 \x01(\t\x12\x0e\n\x06\x61\x63tion\x18\x03 \x01(\t\x1a+\n\tDumpEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"q\n\x11\x43\x61\x63heDumpGraphMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12)\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x1b.proto_types.CacheDumpGraph\"B\n\x11\x41\x64\x61pterRegistered\x12\x14\n\x0c\x61\x64\x61pter_name\x18\x01 \x01(\t\x12\x17\n\x0f\x61\x64\x61pter_version\x18\x02 \x01(\t\"w\n\x14\x41\x64\x61pterRegisteredMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12,\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x1e.proto_types.AdapterRegistered\"!\n\x12\x41\x64\x61pterImportError\x12\x0b\n\x03\x65xc\x18\x01 \x01(\t\"y\n\x15\x41\x64\x61pterImportErrorMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12-\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x1f.proto_types.AdapterImportError\"#\n\x0fPluginLoadError\x12\x10\n\x08\x65xc_info\x18\x01 \x01(\t\"s\n\x12PluginLoadErrorMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12*\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x1c.proto_types.PluginLoadError\"a\n\x14NewConnectionOpening\x12/\n\tnode_info\x18\x01 \x01(\x0b\x32\x1c.proto_types.AdapterNodeInfo\x12\x18\n\x10\x63onnection_state\x18\x02 \x01(\t\"}\n\x17NewConnectionOpeningMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12/\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32!.proto_types.NewConnectionOpening\"8\n\rCodeExecution\x12\x11\n\tconn_name\x18\x01 \x01(\t\x12\x14\n\x0c\x63ode_content\x18\x02 \x01(\t\"o\n\x10\x43odeExecutionMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12(\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x1a.proto_types.CodeExecution\"6\n\x13\x43odeExecutionStatus\x12\x0e\n\x06status\x18\x01 \x01(\t\x12\x0f\n\x07\x65lapsed\x18\x02 \x01(\x02\"{\n\x16\x43odeExecutionStatusMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12.\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32 .proto_types.CodeExecutionStatus\"%\n\x16\x43\x61talogGenerationError\x12\x0b\n\x03\x65xc\x18\x01 \x01(\t\"\x81\x01\n\x19\x43\x61talogGenerationErrorMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12\x31\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32#.proto_types.CatalogGenerationError\"-\n\x13WriteCatalogFailure\x12\x16\n\x0enum_exceptions\x18\x01 \x01(\x05\"{\n\x16WriteCatalogFailureMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12.\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32 .proto_types.WriteCatalogFailure\"\x1e\n\x0e\x43\x61talogWritten\x12\x0c\n\x04path\x18\x01 \x01(\t\"q\n\x11\x43\x61talogWrittenMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12)\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x1b.proto_types.CatalogWritten\"\x14\n\x12\x43\x61nnotGenerateDocs\"y\n\x15\x43\x61nnotGenerateDocsMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12-\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x1f.proto_types.CannotGenerateDocs\"\x11\n\x0f\x42uildingCatalog\"s\n\x12\x42uildingCatalogMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12*\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x1c.proto_types.BuildingCatalog\"-\n\x18\x44\x61tabaseErrorRunningHook\x12\x11\n\thook_type\x18\x01 \x01(\t\"\x85\x01\n\x1b\x44\x61tabaseErrorRunningHookMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12\x33\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32%.proto_types.DatabaseErrorRunningHook\"4\n\x0cHooksRunning\x12\x11\n\tnum_hooks\x18\x01 \x01(\x05\x12\x11\n\thook_type\x18\x02 \x01(\t\"m\n\x0fHooksRunningMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12\'\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x19.proto_types.HooksRunning\"T\n\x14\x46inishedRunningStats\x12\x11\n\tstat_line\x18\x01 \x01(\t\x12\x11\n\texecution\x18\x02 \x01(\t\x12\x16\n\x0e\x65xecution_time\x18\x03 \x01(\x02\"}\n\x17\x46inishedRunningStatsMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12/\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32!.proto_types.FinishedRunningStats\"<\n\x15\x43onstraintNotEnforced\x12\x12\n\nconstraint\x18\x01 \x01(\t\x12\x0f\n\x07\x61\x64\x61pter\x18\x02 \x01(\t\"\x7f\n\x18\x43onstraintNotEnforcedMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12\x30\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\".proto_types.ConstraintNotEnforced\"=\n\x16\x43onstraintNotSupported\x12\x12\n\nconstraint\x18\x01 \x01(\t\x12\x0f\n\x07\x61\x64\x61pter\x18\x02 \x01(\t\"\x81\x01\n\x19\x43onstraintNotSupportedMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12\x31\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32#.proto_types.ConstraintNotSupported\"%\n\x10TypeCodeNotFound\x12\x11\n\ttype_code\x18\x01 \x01(\x05\"u\n\x13TypeCodeNotFoundMsg\x12\x31\n\x04info\x18\x01 \x01(\x0b\x32#.proto_types.AdapterCommonEventInfo\x12+\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x1d.proto_types.TypeCodeNotFoundb\x06proto3')
-
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'adapter_types_pb2', _globals)
-if not _descriptor._USE_C_DESCRIPTORS:
-  DESCRIPTOR._loaded_options = None
-  _globals['_ADAPTERCOMMONEVENTINFO_EXTRAENTRY']._loaded_options = None
-  _globals['_ADAPTERCOMMONEVENTINFO_EXTRAENTRY']._serialized_options = b'8\001'
-  _globals['_CACHEDUMPGRAPH_DUMPENTRY']._loaded_options = None
-  _globals['_CACHEDUMPGRAPH_DUMPENTRY']._serialized_options = b'8\001'
-  _globals['_ADAPTERCOMMONEVENTINFO']._serialized_start=100
-  _globals['_ADAPTERCOMMONEVENTINFO']._serialized_end=399
-  _globals['_ADAPTERCOMMONEVENTINFO_EXTRAENTRY']._serialized_start=355
-  _globals['_ADAPTERCOMMONEVENTINFO_EXTRAENTRY']._serialized_end=399
-  _globals['_ADAPTERNODERELATION']._serialized_start=401
-  _globals['_ADAPTERNODERELATION']._serialized_end=494
-  _globals['_ADAPTERNODEINFO']._serialized_start=497
-  _globals['_ADAPTERNODEINFO']._serialized_end=807
-  _globals['_REFERENCEKEYMSG']._serialized_start=809
-  _globals['_REFERENCEKEYMSG']._serialized_end=880
-  _globals['_ADAPTERDEPRECATIONWARNING']._serialized_start=882
-  _globals['_ADAPTERDEPRECATIONWARNING']._serialized_end=945
-  _globals['_ADAPTERDEPRECATIONWARNINGMSG']._serialized_start=948
-  _globals['_ADAPTERDEPRECATIONWARNINGMSG']._serialized_end=1083
-  _globals['_COLLECTFRESHNESSRETURNSIGNATURE']._serialized_start=1085
-  _globals['_COLLECTFRESHNESSRETURNSIGNATURE']._serialized_end=1118
-  _globals['_COLLECTFRESHNESSRETURNSIGNATUREMSG']._serialized_start=1121
-  _globals['_COLLECTFRESHNESSRETURNSIGNATUREMSG']._serialized_end=1268
-  _globals['_ADAPTEREVENTDEBUG']._serialized_start=1271
-  _globals['_ADAPTEREVENTDEBUG']._serialized_end=1413
-  _globals['_ADAPTEREVENTDEBUGMSG']._serialized_start=1415
-  _globals['_ADAPTEREVENTDEBUGMSG']._serialized_end=1534
-  _globals['_ADAPTEREVENTINFO']._serialized_start=1537
-  _globals['_ADAPTEREVENTINFO']._serialized_end=1678
-  _globals['_ADAPTEREVENTINFOMSG']._serialized_start=1680
-  _globals['_ADAPTEREVENTINFOMSG']._serialized_end=1797
-  _globals['_ADAPTEREVENTWARNING']._serialized_start=1800
-  _globals['_ADAPTEREVENTWARNING']._serialized_end=1944
-  _globals['_ADAPTEREVENTWARNINGMSG']._serialized_start=1946
-  _globals['_ADAPTEREVENTWARNINGMSG']._serialized_end=2069
-  _globals['_ADAPTEREVENTERROR']._serialized_start=2072
-  _globals['_ADAPTEREVENTERROR']._serialized_end=2232
-  _globals['_ADAPTEREVENTERRORMSG']._serialized_start=2234
-  _globals['_ADAPTEREVENTERRORMSG']._serialized_end=2353
-  _globals['_NEWCONNECTION']._serialized_start=2355
-  _globals['_NEWCONNECTION']._serialized_end=2457
-  _globals['_NEWCONNECTIONMSG']._serialized_start=2459
-  _globals['_NEWCONNECTIONMSG']._serialized_end=2570
-  _globals['_CONNECTIONREUSED']._serialized_start=2572
-  _globals['_CONNECTIONREUSED']._serialized_end=2633
-  _globals['_CONNECTIONREUSEDMSG']._serialized_start=2635
-  _globals['_CONNECTIONREUSEDMSG']._serialized_end=2752
-  _globals['_CONNECTIONLEFTOPENINCLEANUP']._serialized_start=2754
-  _globals['_CONNECTIONLEFTOPENINCLEANUP']._serialized_end=2802
-  _globals['_CONNECTIONLEFTOPENINCLEANUPMSG']._serialized_start=2805
-  _globals['_CONNECTIONLEFTOPENINCLEANUPMSG']._serialized_end=2944
-  _globals['_CONNECTIONCLOSEDINCLEANUP']._serialized_start=2946
-  _globals['_CONNECTIONCLOSEDINCLEANUP']._serialized_end=2992
-  _globals['_CONNECTIONCLOSEDINCLEANUPMSG']._serialized_start=2995
-  _globals['_CONNECTIONCLOSEDINCLEANUPMSG']._serialized_end=3130
-  _globals['_ROLLBACKFAILED']._serialized_start=3132
-  _globals['_ROLLBACKFAILED']._serialized_end=3234
-  _globals['_ROLLBACKFAILEDMSG']._serialized_start=3236
-  _globals['_ROLLBACKFAILEDMSG']._serialized_end=3349
-  _globals['_CONNECTIONCLOSED']._serialized_start=3351
-  _globals['_CONNECTIONCLOSED']._serialized_end=3437
-  _globals['_CONNECTIONCLOSEDMSG']._serialized_start=3439
-  _globals['_CONNECTIONCLOSEDMSG']._serialized_end=3556
-  _globals['_CONNECTIONLEFTOPEN']._serialized_start=3558
-  _globals['_CONNECTIONLEFTOPEN']._serialized_end=3646
-  _globals['_CONNECTIONLEFTOPENMSG']._serialized_start=3648
-  _globals['_CONNECTIONLEFTOPENMSG']._serialized_end=3769
-  _globals['_ROLLBACK']._serialized_start=3771
-  _globals['_ROLLBACK']._serialized_end=3849
-  _globals['_ROLLBACKMSG']._serialized_start=3851
-  _globals['_ROLLBACKMSG']._serialized_end=3952
-  _globals['_CACHEMISS']._serialized_start=3954
-  _globals['_CACHEMISS']._serialized_end=4018
-  _globals['_CACHEMISSMSG']._serialized_start=4020
-  _globals['_CACHEMISSMSG']._serialized_end=4123
-  _globals['_LISTRELATIONS']._serialized_start=4125
-  _globals['_LISTRELATIONS']._serialized_end=4223
-  _globals['_LISTRELATIONSMSG']._serialized_start=4225
-  _globals['_LISTRELATIONSMSG']._serialized_end=4336
-  _globals['_CONNECTIONUSED']._serialized_start=4338
-  _globals['_CONNECTIONUSED']._serialized_end=4441
-  _globals['_CONNECTIONUSEDMSG']._serialized_start=4443
-  _globals['_CONNECTIONUSEDMSG']._serialized_end=4556
-  _globals['_SQLQUERY']._serialized_start=4558
-  _globals['_SQLQUERY']._serialized_end=4649
-  _globals['_SQLQUERYMSG']._serialized_start=4651
-  _globals['_SQLQUERYMSG']._serialized_end=4752
-  _globals['_SQLQUERYSTATUS']._serialized_start=4754
-  _globals['_SQLQUERYSTATUS']._serialized_end=4870
-  _globals['_SQLQUERYSTATUSMSG']._serialized_start=4872
-  _globals['_SQLQUERYSTATUSMSG']._serialized_end=4985
-  _globals['_SQLCOMMIT']._serialized_start=4987
-  _globals['_SQLCOMMIT']._serialized_end=5066
-  _globals['_SQLCOMMITMSG']._serialized_start=5068
-  _globals['_SQLCOMMITMSG']._serialized_end=5171
-  _globals['_COLTYPECHANGE']._serialized_start=5173
-  _globals['_COLTYPECHANGE']._serialized_end=5270
-  _globals['_COLTYPECHANGEMSG']._serialized_start=5272
-  _globals['_COLTYPECHANGEMSG']._serialized_end=5383
-  _globals['_SCHEMACREATION']._serialized_start=5385
-  _globals['_SCHEMACREATION']._serialized_end=5449
-  _globals['_SCHEMACREATIONMSG']._serialized_start=5451
-  _globals['_SCHEMACREATIONMSG']._serialized_end=5564
-  _globals['_SCHEMADROP']._serialized_start=5566
-  _globals['_SCHEMADROP']._serialized_end=5626
-  _globals['_SCHEMADROPMSG']._serialized_start=5628
-  _globals['_SCHEMADROPMSG']._serialized_end=5733
-  _globals['_CACHEACTION']._serialized_start=5736
-  _globals['_CACHEACTION']._serialized_end=5958
-  _globals['_CACHEACTIONMSG']._serialized_start=5960
-  _globals['_CACHEACTIONMSG']._serialized_end=6067
-  _globals['_CACHEDUMPGRAPH']._serialized_start=6070
-  _globals['_CACHEDUMPGRAPH']._serialized_end=6222
-  _globals['_CACHEDUMPGRAPH_DUMPENTRY']._serialized_start=6179
-  _globals['_CACHEDUMPGRAPH_DUMPENTRY']._serialized_end=6222
-  _globals['_CACHEDUMPGRAPHMSG']._serialized_start=6224
-  _globals['_CACHEDUMPGRAPHMSG']._serialized_end=6337
-  _globals['_ADAPTERREGISTERED']._serialized_start=6339
-  _globals['_ADAPTERREGISTERED']._serialized_end=6405
-  _globals['_ADAPTERREGISTEREDMSG']._serialized_start=6407
-  _globals['_ADAPTERREGISTEREDMSG']._serialized_end=6526
-  _globals['_ADAPTERIMPORTERROR']._serialized_start=6528
-  _globals['_ADAPTERIMPORTERROR']._serialized_end=6561
-  _globals['_ADAPTERIMPORTERRORMSG']._serialized_start=6563
-  _globals['_ADAPTERIMPORTERRORMSG']._serialized_end=6684
-  _globals['_PLUGINLOADERROR']._serialized_start=6686
-  _globals['_PLUGINLOADERROR']._serialized_end=6721
-  _globals['_PLUGINLOADERRORMSG']._serialized_start=6723
-  _globals['_PLUGINLOADERRORMSG']._serialized_end=6838
-  _globals['_NEWCONNECTIONOPENING']._serialized_start=6840
-  _globals['_NEWCONNECTIONOPENING']._serialized_end=6937
-  _globals['_NEWCONNECTIONOPENINGMSG']._serialized_start=6939
-  _globals['_NEWCONNECTIONOPENINGMSG']._serialized_end=7064
-  _globals['_CODEEXECUTION']._serialized_start=7066
-  _globals['_CODEEXECUTION']._serialized_end=7122
-  _globals['_CODEEXECUTIONMSG']._serialized_start=7124
-  _globals['_CODEEXECUTIONMSG']._serialized_end=7235
-  _globals['_CODEEXECUTIONSTATUS']._serialized_start=7237
-  _globals['_CODEEXECUTIONSTATUS']._serialized_end=7291
-  _globals['_CODEEXECUTIONSTATUSMSG']._serialized_start=7293
-  _globals['_CODEEXECUTIONSTATUSMSG']._serialized_end=7416
-  _globals['_CATALOGGENERATIONERROR']._serialized_start=7418
-  _globals['_CATALOGGENERATIONERROR']._serialized_end=7455
-  _globals['_CATALOGGENERATIONERRORMSG']._serialized_start=7458
-  _globals['_CATALOGGENERATIONERRORMSG']._serialized_end=7587
-  _globals['_WRITECATALOGFAILURE']._serialized_start=7589
-  _globals['_WRITECATALOGFAILURE']._serialized_end=7634
-  _globals['_WRITECATALOGFAILUREMSG']._serialized_start=7636
-  _globals['_WRITECATALOGFAILUREMSG']._serialized_end=7759
-  _globals['_CATALOGWRITTEN']._serialized_start=7761
-  _globals['_CATALOGWRITTEN']._serialized_end=7791
-  _globals['_CATALOGWRITTENMSG']._serialized_start=7793
-  _globals['_CATALOGWRITTENMSG']._serialized_end=7906
-  _globals['_CANNOTGENERATEDOCS']._serialized_start=7908
-  _globals['_CANNOTGENERATEDOCS']._serialized_end=7928
-  _globals['_CANNOTGENERATEDOCSMSG']._serialized_start=7930
-  _globals['_CANNOTGENERATEDOCSMSG']._serialized_end=8051
-  _globals['_BUILDINGCATALOG']._serialized_start=8053
-  _globals['_BUILDINGCATALOG']._serialized_end=8070
-  _globals['_BUILDINGCATALOGMSG']._serialized_start=8072
-  _globals['_BUILDINGCATALOGMSG']._serialized_end=8187
-  _globals['_DATABASEERRORRUNNINGHOOK']._serialized_start=8189
-  _globals['_DATABASEERRORRUNNINGHOOK']._serialized_end=8234
-  _globals['_DATABASEERRORRUNNINGHOOKMSG']._serialized_start=8237
-  _globals['_DATABASEERRORRUNNINGHOOKMSG']._serialized_end=8370
-  _globals['_HOOKSRUNNING']._serialized_start=8372
-  _globals['_HOOKSRUNNING']._serialized_end=8424
-  _globals['_HOOKSRUNNINGMSG']._serialized_start=8426
-  _globals['_HOOKSRUNNINGMSG']._serialized_end=8535
-  _globals['_FINISHEDRUNNINGSTATS']._serialized_start=8537
-  _globals['_FINISHEDRUNNINGSTATS']._serialized_end=8621
-  _globals['_FINISHEDRUNNINGSTATSMSG']._serialized_start=8623
-  _globals['_FINISHEDRUNNINGSTATSMSG']._serialized_end=8748
-  _globals['_CONSTRAINTNOTENFORCED']._serialized_start=8750
-  _globals['_CONSTRAINTNOTENFORCED']._serialized_end=8810
-  _globals['_CONSTRAINTNOTENFORCEDMSG']._serialized_start=8812
-  _globals['_CONSTRAINTNOTENFORCEDMSG']._serialized_end=8939
-  _globals['_CONSTRAINTNOTSUPPORTED']._serialized_start=8941
-  _globals['_CONSTRAINTNOTSUPPORTED']._serialized_end=9002
-  _globals['_CONSTRAINTNOTSUPPORTEDMSG']._serialized_start=9005
-  _globals['_CONSTRAINTNOTSUPPORTEDMSG']._serialized_end=9134
-  _globals['_TYPECODENOTFOUND']._serialized_start=9136
-  _globals['_TYPECODENOTFOUND']._serialized_end=9173
-  _globals['_TYPECODENOTFOUNDMSG']._serialized_start=9175
-  _globals['_TYPECODENOTFOUNDMSG']._serialized_end=9292
-# @@protoc_insertion_point(module_scope)
+# preserving import path during dbtlabs.proto refactor
+from dbtlabs.proto.public.v1.fields.adapter_types_pb2 import *  # noqa

dbt/adapters/events/base_types.py

@@ -1,14 +1,10 @@
-# Aliasing common Level classes in order to make custom, but not overly-verbose versions that have PROTO_TYPES_MODULE set to the adapter-specific generated types_pb2 module
-from dbt_common.events.base_types import (
-    BaseEvent,
-    DebugLevel as CommonDebugLevel,
-    DynamicLevel as CommonDynamicLevel,
-    ErrorLevel as CommonErrorLevel,
-    InfoLevel as CommonInfoLevel,
-    TestLevel as CommonTestLevel,
-    WarnLevel as CommonWarnLevel,
-)
-
+from dbt_common.events.base_types import BaseEvent
+from dbt_common.events.base_types import DebugLevel as CommonDebugLevel
+from dbt_common.events.base_types import DynamicLevel as CommonDynamicLevel
+from dbt_common.events.base_types import ErrorLevel as CommonErrorLevel
+from dbt_common.events.base_types import InfoLevel as CommonInfoLevel
+from dbt_common.events.base_types import TestLevel as CommonTestLevel
+from dbt_common.events.base_types import WarnLevel as CommonWarnLevel
 from dbt.adapters.events import adapter_types_pb2
 
 

dbt/adapters/events/types.py

@@ -1,5 +1,3 @@
-from dbt_common.ui import line_wrap_message, warning_tag
-
 from dbt.adapters.events.base_types import (
     DebugLevel,
     DynamicLevel,
@@ -7,6 +5,7 @@ from dbt.adapters.events.base_types import (
     InfoLevel,
     WarnLevel,
 )
+from dbt_common.ui import line_wrap_message, warning_tag
 
 
 def format_adapter_message(name, base_msg, args) -> str:

dbt/adapters/sql/connections.py

@@ -102,7 +102,8 @@ class SQLConnectionManager(BaseConnectionManager):
 
                 fire_event(
                     AdapterEventDebug(
-                        message=f"Got a retryable error {type(e)}. {retry_limit - attempt} retries left. Retrying in 1 second.\nError:\n{e}"
+                        base_msg=f"Got a retryable error {type(e)}. {retry_limit - attempt} retries left. "
+                        f"Retrying in 1 second.\nError:\n{e}"
                     )
                 )
                 time.sleep(1)

dbt/include/global_project/macros/materializations/snapshots/helpers.sql

@@ -109,7 +109,9 @@
         left outer join snapshotted_data
             on {{ unique_key_join_on(strategy.unique_key, "snapshotted_data", "source_data") }}
             where {{ unique_key_is_null(strategy.unique_key, "snapshotted_data") }}
-            or ({{ unique_key_is_not_null(strategy.unique_key, "snapshotted_data") }} and ({{ strategy.row_changed }})
+            or ({{ unique_key_is_not_null(strategy.unique_key, "snapshotted_data") }} and (
+               {{ strategy.row_changed }} {%- if strategy.hard_deletes == 'new_record' -%} or snapshotted_data.{{ columns.dbt_is_deleted }} = 'True' {% endif %}
+            )
 
         )
 
@@ -129,7 +131,7 @@
         join snapshotted_data
             on {{ unique_key_join_on(strategy.unique_key, "snapshotted_data", "source_data") }}
         where (
-            {{ strategy.row_changed }}
+            {{ strategy.row_changed }}  {%- if strategy.hard_deletes == 'new_record' -%} or snapshotted_data.{{ columns.dbt_is_deleted }} = 'True' {% endif %}
         )
     )
 

dbt/include/global_project/macros/materializations/tests/test.sql

@@ -1,6 +1,11 @@
 {%- materialization test, default -%}
 
   {% set relations = [] %}
+  {% set limit = config.get('limit') %}
+
+  {% set sql_with_limit %}
+    {{ get_limit_subquery_sql(sql, limit) }}
+  {% endset %}
 
   {% if should_store_failures() %}
 
@@ -26,11 +31,12 @@
     {% endif %}
 
     {% call statement(auto_begin=True) %}
-        {{ get_create_sql(target_relation, sql) }}
+        {{ get_create_sql(target_relation, sql_with_limit) }}
     {% endcall %}
 
     {% do relations.append(target_relation) %}
 
+    {# Since the test failures have already been saved to the database, reuse that result rather than querying again #}
     {% set main_sql %}
         select *
         from {{ target_relation }}
@@ -40,18 +46,18 @@
 
   {% else %}
 
-      {% set main_sql = sql %}
+      {% set main_sql = sql_with_limit %}
 
   {% endif %}
 
-  {% set limit = config.get('limit') %}
   {% set fail_calc = config.get('fail_calc') %}
   {% set warn_if = config.get('warn_if') %}
   {% set error_if = config.get('error_if') %}
 
   {% call statement('main', fetch_result=True) -%}
 
-    {{ get_test_sql(main_sql, fail_calc, warn_if, error_if, limit)}}
+    {# The limit has already been included above, and we do not want to duplicate it again. We also want to be safe for macro overrides treating `limit` as a required parameter. #}
+    {{ get_test_sql(main_sql, fail_calc, warn_if, error_if, limit=none)}}
 
   {%- endcall %}
 

{dbt_adapters-1.14.7.dist-info → dbt_adapters-1.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dbt-adapters
-Version: 1.14.7
+Version: 1.15
 Summary: The set of adapter protocols and base functionality that supports integration with dbt-core
 Project-URL: Homepage, https://github.com/dbt-labs/dbt-adapters/tree/main/dbt-adapters
 Project-URL: Documentation, https://docs.getdbt.com
@@ -23,6 +23,7 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.9.0
 Requires-Dist: agate<2.0,>=1.0
 Requires-Dist: dbt-common<2.0,>=1.13
+Requires-Dist: dbt-protos<2.0,>=1.0.291
 Requires-Dist: mashumaro[msgpack]<3.15,>=3.9
 Requires-Dist: protobuf<6.0,>=5.0
 Requires-Dist: pytz>=2015.7

{dbt_adapters-1.14.7.dist-info → dbt_adapters-1.15.dist-info}/RECORD

@@ -1,4 +1,4 @@
-dbt/adapters/__about__.py,sha256=ImXWGcZYwOAKH7comqn46VSW6WO_pNwUt48KrIYwrRM,19
+dbt/adapters/__about__.py,sha256=a7-yLKdJdSNaIyXogGlRz0SVt8tPofyTzgbfML6zYyE,17
 dbt/adapters/__init__.py,sha256=3noHsg-64qI0_Pw6OR9F7l1vU2_qrJvinq8POTtuaZM,252
 dbt/adapters/cache.py,sha256=WGy4ewnz-J13LverTACBW2iFhGswrWLgm-wiBrQnMzo,20084
 dbt/adapters/capability.py,sha256=M3FkC9veKnNB7a7uQyl7EHX_AGNXPChbHAkcY4cgXCY,2534
@@ -11,28 +11,27 @@ dbt/adapters/base/README.md,sha256=muHQntC07Lh6L1XfVgwKhV5RltOPBLYPdQqd8_7l34c,5
 dbt/adapters/base/__init__.py,sha256=Nc8lQVkOzAqdcxk4cw4E_raxN9CAWMwhQx4STdiicxg,456
 dbt/adapters/base/column.py,sha256=Uj20UixoxCn2rlv4QDNONyys6CDkDFyG3anCXKf0T2c,5350
 dbt/adapters/base/connections.py,sha256=-C5dOwGgMKH8n_v6wjwOxV7chBdS0GjOGwNQCUbhhWc,16951
-dbt/adapters/base/impl.py,sha256=lXDMcU0FJgNgsJUyFjqLqFzdV1IYBUtSOI7p28Wd5jM,78214
+dbt/adapters/base/impl.py,sha256=cte4Feh_bSmLCIbmtQJderuWHLblNZF55uTfG0K66qg,78467
 dbt/adapters/base/meta.py,sha256=c5j0qeGec1cAi-IlVV_JkhMk01p5XqbtGj02uxGP1S4,5686
 dbt/adapters/base/plugin.py,sha256=rm0GjNHnWM2mn0GJOjciZLwn-02xlzWCoMT9u-epwP0,1076
-dbt/adapters/base/query_headers.py,sha256=UluGd9IYCYkoMiDi5Yx_lnrCOSjWppjwRro4SIGgx8I,3496
+dbt/adapters/base/query_headers.py,sha256=rHgux9b_vPp_xRsg8QU3NE202Hho4i4zO9u9Gx_BCF4,3651
 dbt/adapters/base/relation.py,sha256=eePneHZQ-bb0ZFaEpC_1xzsxJF38e6k7b3FUxD8PK0I,19383
 dbt/adapters/catalogs/__init__.py,sha256=Pm0EseleLEZRK3ML1FlID1aoVKeqOPqZvJ_TYYnURfY,372
-dbt/adapters/catalogs/_client.py,sha256=XEKjpEg-C0OeQD_TzKKkmW5H_KyYyp2UAeiVBFnf_Ok,2236
-dbt/adapters/catalogs/_exceptions.py,sha256=tPYk1-4n73GnY-a42wer0CJ9eyV4XEc28LrjvRp_r50,1129
+dbt/adapters/catalogs/_client.py,sha256=bIXZxEL1-4kSXHFPnMw3egIOx1fKZmjxKiO1Wv-KuHg,2258
+dbt/adapters/catalogs/_exceptions.py,sha256=5zkSmjUG5y_Dzv0AAUptsJpNDHnmb8D0mUb_HIQCj_I,1133
 dbt/adapters/catalogs/_integration.py,sha256=3tV2n4_zMIS9jqaPfA6Lhzn_REHBka7BHdsc7YJwC5c,6434
 dbt/adapters/clients/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dbt/adapters/clients/jinja.py,sha256=NsZOiBpOLunS46hRL5OcX1MpY3Ih6_87Vgz4qd_PNbc,768
 dbt/adapters/contracts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dbt/adapters/contracts/connection.py,sha256=35mErirojY6Au63wjFgQokk_x7JWHjPUa6hiXjDEs0k,6917
+dbt/adapters/contracts/connection.py,sha256=azipef6NBjkh88OcuF90cNUdcYBPXFMl9K99OAwdl_0,6926
 dbt/adapters/contracts/macros.py,sha256=NYVDi5ww7v4ksKBwF836TXE-2xU4IBaUINqvxMY-ieU,366
 dbt/adapters/contracts/relation.py,sha256=DIWjEeEY1QQWBAUjVNLP5WDu2HcMdBPLDwJnh8Xb4wk,4793
-dbt/adapters/events/README.md,sha256=kVUFIsDQrHTUmk9Mmu-yXYkWh4pA5MJK_H6739rQr5I,3521
+dbt/adapters/events/README.md,sha256=3rMVP1XO1Lw7Dv6g7-SkDsAcN4VVjIF0fHKopEcCzXk,2689
 dbt/adapters/events/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dbt/adapters/events/adapter_types.proto,sha256=syAfh0JK3j7h4dCL7ygf7ManzAI0hbjMT0a3C2iyWg4,9810
-dbt/adapters/events/adapter_types_pb2.py,sha256=uEf5Pl6Dp_s9W-ja8clwEQg9iLloLu0EqsbambYVIes,26849
-dbt/adapters/events/base_types.py,sha256=sTlNRl15GaRIrIDVxalf7sK08dfo3Ol1Ua2jbFO7-7c,966
+dbt/adapters/events/adapter_types_pb2.py,sha256=Mov1yYR_v9JG6n7MHvzEbFtLN4gMQ1Uv5die8u2eJag,126
+dbt/adapters/events/base_types.py,sha256=UQKTjv4cOA76bI8lwYpwr1X0w5BPfE6YpcIt16cFjMU,999
 dbt/adapters/events/logging.py,sha256=1nRFswQubgUrVHL5DB9ewBtbEv1-OcIXC7mMmu3NOaM,2350
-dbt/adapters/events/types.py,sha256=nW7_FgrEmWlM-HWPHrYcJ5K5QLZtfspLizyqlXrJaoE,12189
+dbt/adapters/events/types.py,sha256=cxGUlR2WceSOis81FwHS7rwfFpxCmy31ur5Yp8Pz4o0,12188
 dbt/adapters/exceptions/__init__.py,sha256=LxRkxHARMzrPegrjha5tQ8vQi1PnL_ooq1SVqm9aiZs,1268
 dbt/adapters/exceptions/alias.py,sha256=QlCd2jvatfndec1DQLMMBJ-C_7w8yAySuAFHK2ga1g8,798
 dbt/adapters/exceptions/cache.py,sha256=u720DQQKm8pyf_9loD9HGA9WgaeZAlg0sBn0sGc-rhA,2492
@@ -56,7 +55,7 @@ dbt/adapters/relation_configs/config_base.py,sha256=CAsnpbNSlwMgy47oQ_Iv-hRu6mOb
 dbt/adapters/relation_configs/config_change.py,sha256=hf6fDWbZpKvZdM6z-OtY-GveipzfLRR_dsUZmYmXkdk,713
 dbt/adapters/relation_configs/config_validation.py,sha256=wlJUMwOEPhYFch-LRtEWfLNJMq8jL1tRhOUHmNX8nFw,1978
 dbt/adapters/sql/__init__.py,sha256=WLWZJfqc8pr1N1BMVe9gM-KQ4URJIeKfLqTuJBD1VN0,107
-dbt/adapters/sql/connections.py,sha256=JEMvgOW167je6J33Xj_Q605cB-9gDNOmCo3zdAnWiI8,8424
+dbt/adapters/sql/connections.py,sha256=N7Mmg9ZS5ztKQCbJgbb1jwVhaBeMBqnR_3SWxEytxzY,8453
 dbt/adapters/sql/impl.py,sha256=dhpvlxc3mZWdcP42xMzW8_nM2zJGMMt1_hLUUfXx3Dw,10944
 dbt/include/__init__.py,sha256=qEFeq3yuf3lQKVseALmL8aPM8fpCS54B_5pry00M3hk,76
 dbt/include/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -99,12 +98,12 @@ dbt/include/global_project/macros/materializations/models/incremental/on_schema_
 dbt/include/global_project/macros/materializations/models/incremental/strategies.sql,sha256=ORGWiYfj-b3_VIps9FDlyx-Q4A2hZzX2aYLocW8b6pU,2613
 dbt/include/global_project/macros/materializations/seeds/helpers.sql,sha256=Y15ej-D3gm1ExIOMNT208q43gRk8d985WQBuGSooNL0,3920
 dbt/include/global_project/macros/materializations/seeds/seed.sql,sha256=YSoGzVO3iIUiOKIUM9G7yApGLFH4O9bv_d4KjHo3p4Q,2155
-dbt/include/global_project/macros/materializations/snapshots/helpers.sql,sha256=9Oj_60XhwEByrryf16YQN9J853dCHnXChSyjI_t8kX4,11110
+dbt/include/global_project/macros/materializations/snapshots/helpers.sql,sha256=Ox-7PZ9NHleqRdzTv7MWP0pgOByQujNCS0xQaBXtndU,11378
 dbt/include/global_project/macros/materializations/snapshots/snapshot.sql,sha256=clIZtCE7vvOXxzz1t2KlmPZM7AuSGsK7MInspo0N5Qg,4043
 dbt/include/global_project/macros/materializations/snapshots/snapshot_merge.sql,sha256=WaGQCuv4o_qxBw7b2KQvUnSg0UkPklwAQHK1-QngN_M,1369
 dbt/include/global_project/macros/materializations/snapshots/strategies.sql,sha256=AfIsRiw0YnQym5wUiWR2JpiEEky4_WBTpTtE0HJvpZw,6928
 dbt/include/global_project/macros/materializations/tests/helpers.sql,sha256=rxUxDZm4EvrDbi0H_ePghE34_QLmxGEY2o_LTMc9CU0,1731
-dbt/include/global_project/macros/materializations/tests/test.sql,sha256=Rz3O_3dWHlIofG3d2CwsP2bXFimRZUIwOevyB0iz1J4,1831
+dbt/include/global_project/macros/materializations/tests/test.sql,sha256=LP4ya-X5n499ccab7n1jqvGbZWZsG6hqJmWlx60BvHQ,2247
 dbt/include/global_project/macros/materializations/tests/unit.sql,sha256=KonePuFfwcz5uJ-JW0CrEy8_q-Gl45fonngGmFvQcNU,1252
 dbt/include/global_project/macros/materializations/tests/where_subquery.sql,sha256=xjuYd18tXo99OReJGQsfgEPYljUUyF00XzK4h0SJjdM,497
 dbt/include/global_project/macros/python_model/python.sql,sha256=qWoouNOP4Qdune_2Vitzmrzb0soHRzu0S4K22amVZK8,4056
@@ -163,7 +162,7 @@ dbt/include/global_project/macros/utils/right.sql,sha256=EwNG98CAFIwNDmarwopf7Rk
 dbt/include/global_project/macros/utils/safe_cast.sql,sha256=1mswwkDACmIi1I99JKb_-vq3kjMe4HhMRV70mW8Bt4Y,298
 dbt/include/global_project/macros/utils/split_part.sql,sha256=fXEIS0oIiYR7-4lYbb0QbZdG-q2TpV63AFd1ky4I5UM,714
 dbt/include/global_project/tests/generic/builtin.sql,sha256=p94xdyPwb2TlxgLBqCfrcRfJ1QNgsjPvBm8f0Q5eqZM,1022
-dbt_adapters-1.14.7.dist-info/METADATA,sha256=aNqZ4iD8o3i6JvBAaGygebN5LnkmMEQurrqcG54GxrI,4494
-dbt_adapters-1.14.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dbt_adapters-1.14.7.dist-info/licenses/LICENSE,sha256=9yjigiJhWcCZvQjdagGKDwrRph58QWc5P2bVSQwXo6s,11344
-dbt_adapters-1.14.7.dist-info/RECORD,,
+dbt_adapters-1.15.dist-info/METADATA,sha256=3nYDhBDHxc-GvZxlbe1nQJ01pJaC2fi24sYu9aZrea8,4532
+dbt_adapters-1.15.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dbt_adapters-1.15.dist-info/licenses/LICENSE,sha256=9yjigiJhWcCZvQjdagGKDwrRph58QWc5P2bVSQwXo6s,11344
+dbt_adapters-1.15.dist-info/RECORD,,

dbt/adapters/events/adapter_types.proto

@@ -1,530 +0,0 @@
-syntax = "proto3";
-
-package v1.public.fields.adapter_types;
-option go_package = "github.com/dbt-labs/proto-golang/v1/public/fields/adapter_types";
-
-import "google/protobuf/timestamp.proto";
-import "google/protobuf/struct.proto";
-
-// Common event info
-message AdapterCommonEventInfo {
-    string name = 1;
-    string code = 2;
-    string msg = 3;
-    string level = 4;
-    string invocation_id = 5;
-    int32 pid = 6;
-    string thread = 7;
-    google.protobuf.Timestamp ts = 8;
-    map<string, string> extra = 9;
-    string category = 10;
-}
-
-// AdapterNodeRelation
-message AdapterNodeRelation {
-    string database = 10;
-    string schema = 11;
-    string alias = 12;
-    string relation_name = 13;
-}
-
-// NodeInfo
-message AdapterNodeInfo {
-    string node_path = 1;
-    string node_name = 2;
-    string unique_id = 3;
-    string resource_type = 4;
-    string materialized = 5;
-    string node_status = 6;
-    string node_started_at = 7;
-    string node_finished_at = 8;
-    google.protobuf.Struct meta = 9;
-    AdapterNodeRelation node_relation = 10;
-    string node_checksum = 11;
-}
-
-// ReferenceKey
-message ReferenceKeyMsg {
-    string database = 1;
-    string schema = 2;
-    string identifier = 3;
-}
-
-// D - Deprecations
-
-// D005
-message AdapterDeprecationWarning {
-    string old_name = 1;
-    string new_name = 2;
-}
-
-message AdapterDeprecationWarningMsg {
-    AdapterCommonEventInfo info = 1;
-    AdapterDeprecationWarning data = 2;
-}
-
-// D012
-message CollectFreshnessReturnSignature {
-}
-
-message CollectFreshnessReturnSignatureMsg {
-    AdapterCommonEventInfo info = 1;
-    CollectFreshnessReturnSignature data = 2;
-}
-
-// E - DB Adapter
-
-// E001
-message AdapterEventDebug {
-    AdapterNodeInfo node_info = 1;
-    string name = 2;
-    string base_msg = 3;
-    google.protobuf.ListValue args = 4;
-}
-
-message AdapterEventDebugMsg {
-    AdapterCommonEventInfo info = 1;
-    AdapterEventDebug data = 2;
-}
-
-// E002
-message AdapterEventInfo {
-    AdapterNodeInfo node_info = 1;
-    string name = 2;
-    string base_msg = 3;
-    google.protobuf.ListValue args = 4;
-}
-
-message AdapterEventInfoMsg {
-    AdapterCommonEventInfo info = 1;
-    AdapterEventInfo data = 2;
-}
-
-// E003
-message AdapterEventWarning {
-    AdapterNodeInfo node_info = 1;
-    string name = 2;
-    string base_msg = 3;
-    google.protobuf.ListValue args = 4;
-}
-
-message AdapterEventWarningMsg {
-    AdapterCommonEventInfo info = 1;
-    AdapterEventWarning data = 2;
-}
-
-// E004
-message AdapterEventError {
-    AdapterNodeInfo node_info = 1;
-    string name = 2;
-    string base_msg = 3;
-    google.protobuf.ListValue args = 4;
-    string exc_info = 5;
-}
-
-message AdapterEventErrorMsg {
-    AdapterCommonEventInfo info = 1;
-    AdapterEventError data = 2;
-}
-
-// E005
-message NewConnection {
-    AdapterNodeInfo node_info = 1;
-    string conn_type = 2;
-    string conn_name = 3;
-}
-
-message NewConnectionMsg {
-    AdapterCommonEventInfo info = 1;
-    NewConnection data = 2;
-}
-
-// E006
-message ConnectionReused {
-    string conn_name = 1;
-    string orig_conn_name = 2;
-}
-
-message ConnectionReusedMsg {
-    AdapterCommonEventInfo info = 1;
-    ConnectionReused data = 2;
-}
-
-// E007
-message ConnectionLeftOpenInCleanup {
-    string conn_name = 1;
-}
-
-message ConnectionLeftOpenInCleanupMsg {
-    AdapterCommonEventInfo info = 1;
-    ConnectionLeftOpenInCleanup data = 2;
-}
-
-// E008
-message ConnectionClosedInCleanup {
-    string conn_name = 1;
-}
-
-message ConnectionClosedInCleanupMsg {
-    AdapterCommonEventInfo info = 1;
-    ConnectionClosedInCleanup data = 2;
-}
-
-// E009
-message RollbackFailed {
-    AdapterNodeInfo node_info = 1;
-    string conn_name = 2;
-    string exc_info = 3;
-}
-
-message RollbackFailedMsg {
-    AdapterCommonEventInfo info = 1;
-    RollbackFailed data = 2;
-}
-
-// E010
-message ConnectionClosed {
-    AdapterNodeInfo node_info = 1;
-    string conn_name = 2;
-}
-
-message ConnectionClosedMsg {
-    AdapterCommonEventInfo info = 1;
-    ConnectionClosed data = 2;
-}
-
-// E011
-message ConnectionLeftOpen {
-    AdapterNodeInfo node_info = 1;
-    string conn_name = 2;
-}
-
-message ConnectionLeftOpenMsg {
-    AdapterCommonEventInfo info = 1;
-    ConnectionLeftOpen data = 2;
-}
-
-// E012
-message Rollback {
-    AdapterNodeInfo node_info = 1;
-    string conn_name = 2;
-}
-
-message RollbackMsg {
-    AdapterCommonEventInfo info = 1;
-    Rollback data = 2;
-}
-
-// E013
-message CacheMiss {
-    string conn_name = 1;
-    string database = 2;
-    string schema = 3;
-}
-
-message CacheMissMsg {
-    AdapterCommonEventInfo info = 1;
-    CacheMiss data = 2;
-}
-
-// E014
-message ListRelations {
-    string database = 1;
-    string schema = 2;
-    repeated ReferenceKeyMsg relations = 3;
-}
-
-message ListRelationsMsg {
-    AdapterCommonEventInfo info = 1;
-    ListRelations data = 2;
-}
-
-// E015
-message ConnectionUsed {
-    AdapterNodeInfo node_info = 1;
-    string conn_type = 2;
-    string conn_name = 3;
-}
-
-message ConnectionUsedMsg {
-    AdapterCommonEventInfo info = 1;
-    ConnectionUsed data = 2;
-}
-
-// E016
-message SQLQuery {
-    AdapterNodeInfo node_info = 1;
-    string conn_name = 2;
-    string sql = 3;
-}
-
-message SQLQueryMsg {
-    AdapterCommonEventInfo info = 1;
-    SQLQuery data = 2;
-}
-
-// E017
-message SQLQueryStatus {
-    AdapterNodeInfo node_info = 1;
-    string status = 2;
-    float elapsed = 3;
-    string query_id = 4;
-}
-
-message SQLQueryStatusMsg {
-    AdapterCommonEventInfo info = 1;
-    SQLQueryStatus data = 2;
-}
-
-// E018
-message SQLCommit {
-    AdapterNodeInfo node_info = 1;
-    string conn_name = 2;
-}
-
-message SQLCommitMsg {
-    AdapterCommonEventInfo info = 1;
-    SQLCommit data = 2;
-}
-
-// E019
-message ColTypeChange {
-    string orig_type = 1;
-    string new_type = 2;
-    ReferenceKeyMsg table = 3;
-}
-
-message ColTypeChangeMsg {
-    AdapterCommonEventInfo info = 1;
-    ColTypeChange data = 2;
-}
-
-// E020
-message SchemaCreation {
-    ReferenceKeyMsg relation = 1;
-}
-
-message SchemaCreationMsg {
-    AdapterCommonEventInfo info = 1;
-    SchemaCreation data = 2;
-}
-
-// E021
-message SchemaDrop {
-    ReferenceKeyMsg relation = 1;
-}
-
-message SchemaDropMsg {
-    AdapterCommonEventInfo info = 1;
-    SchemaDrop data = 2;
-}
-
-// E022
-message CacheAction {
-    string action = 1;
-    ReferenceKeyMsg ref_key = 2;
-    ReferenceKeyMsg ref_key_2 = 3;
-    ReferenceKeyMsg ref_key_3 = 4;
-    repeated ReferenceKeyMsg ref_list = 5;
-}
-
-message CacheActionMsg {
-    AdapterCommonEventInfo info = 1;
-    CacheAction data = 2;
-}
-
-// Skipping E023, E024, E025, E026, E027, E028, E029, E0230
-
-// E031
-message CacheDumpGraph {
-    map<string, string> dump = 1;
-    string before_after = 2;
-    string action = 3;
-}
-
-message CacheDumpGraphMsg {
-    AdapterCommonEventInfo info = 1;
-    CacheDumpGraph data = 2;
-}
-
-
-// Skipping E032, E033, E034
-
-
-
-// E034
-message AdapterRegistered {
-    string adapter_name = 1;
-    string adapter_version = 2;
-}
-
-message AdapterRegisteredMsg {
-    AdapterCommonEventInfo info = 1;
-    AdapterRegistered data = 2;
-}
-
-// E035
-message AdapterImportError {
-    string exc = 1;
-}
-
-message AdapterImportErrorMsg {
-    AdapterCommonEventInfo info = 1;
-    AdapterImportError data = 2;
-}
-
-// E036
-message PluginLoadError {
-    string exc_info = 1;
-}
-
-message PluginLoadErrorMsg {
-    AdapterCommonEventInfo info = 1;
-    PluginLoadError data = 2;
-}
-
-// E037
-message NewConnectionOpening {
-    AdapterNodeInfo node_info = 1;
-    string connection_state = 2;
-}
-
-message NewConnectionOpeningMsg {
-    AdapterCommonEventInfo info = 1;
-    NewConnectionOpening data = 2;
-}
-
-// E038
-message CodeExecution {
-    string conn_name = 1;
-    string code_content = 2;
-}
-
-message CodeExecutionMsg {
-    AdapterCommonEventInfo info = 1;
-    CodeExecution data = 2;
-}
-
-// E039
-message CodeExecutionStatus {
-    string status = 1;
-    float elapsed = 2;
-}
-
-message CodeExecutionStatusMsg {
-    AdapterCommonEventInfo info = 1;
-    CodeExecutionStatus data = 2;
-}
-
-// E040
-message CatalogGenerationError {
-    string exc = 1;
-}
-
-message CatalogGenerationErrorMsg {
-    AdapterCommonEventInfo info = 1;
-    CatalogGenerationError data = 2;
-}
-
-// E041
-message WriteCatalogFailure {
-    int32 num_exceptions = 1;
-}
-
-message WriteCatalogFailureMsg {
-    AdapterCommonEventInfo info = 1;
-    WriteCatalogFailure data = 2;
-}
-
-// E042
-message CatalogWritten {
-    string path = 1;
-}
-
-message CatalogWrittenMsg {
-    AdapterCommonEventInfo info = 1;
-    CatalogWritten data = 2;
-}
-
-// E043
-message CannotGenerateDocs {
-}
-
-message CannotGenerateDocsMsg {
-    AdapterCommonEventInfo info = 1;
-    CannotGenerateDocs data = 2;
-}
-
-// E044
-message BuildingCatalog {
-}
-
-message BuildingCatalogMsg {
-    AdapterCommonEventInfo info = 1;
-    BuildingCatalog data = 2;
-}
-
-// E045
-message DatabaseErrorRunningHook {
-    string hook_type = 1;
-}
-
-message DatabaseErrorRunningHookMsg {
-    AdapterCommonEventInfo info = 1;
-    DatabaseErrorRunningHook data = 2;
-}
-
-// E046
-message HooksRunning {
-    int32 num_hooks = 1;
-    string hook_type = 2;
-}
-
-message HooksRunningMsg {
-    AdapterCommonEventInfo info = 1;
-    HooksRunning data = 2;
-}
-
-// E047
-message FinishedRunningStats {
-    string stat_line = 1;
-    string execution = 2;
-    float execution_time = 3;
-}
-
-message FinishedRunningStatsMsg {
-    AdapterCommonEventInfo info = 1;
-    FinishedRunningStats data = 2;
-}
-
-// E048
-message ConstraintNotEnforced {
-    string constraint = 1;
-    string adapter = 2;
-}
-
-message ConstraintNotEnforcedMsg {
-    AdapterCommonEventInfo info = 1;
-    ConstraintNotEnforced data = 2;
-}
-
-// E049
-message ConstraintNotSupported {
-    string constraint = 1;
-    string adapter = 2;
-}
-
-message ConstraintNotSupportedMsg {
-    AdapterCommonEventInfo info = 1;
-    ConstraintNotSupported data = 2;
-}
-
-// E050
-message TypeCodeNotFound {
-    int32 type_code = 1;
-}
-
-message TypeCodeNotFoundMsg {
-    AdapterCommonEventInfo info = 1;
-    TypeCodeNotFound data = 2;
-}