DaJet Metadata 5.0.4

Длина номера строки табличной части

Author: zhichkin

src/dajet-metadata/dajet-metadata.csproj

@@ -6,7 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>disable</Nullable>
     <AssemblyName>DaJet.Metadata</AssemblyName>
-    <Version>5.0.3</Version>
+    <Version>5.0.4</Version>
     <Authors>Zhichkin</Authors>
     <Description>Library to read 1C:Enterprise 8 metadata from Microsoft SQL Server or PostgreSQL databases.</Description>
     <Copyright>Zhichkin © 2020</Copyright>

src/dajet-metadata/loader/MetadataLoader.cs

@@ -91,7 +91,7 @@ internal EntityDefinition Load(in string type, in MetadataObject entry, in Metad
 
             using (ConfigFileBuffer file = Load(in tableName, in fileName))
             {
-                entity = parser.Load(entry.Uuid, file.AsReadOnlySpan(), in registry, false);
+                entity = parser.Load(entry.Uuid, file.AsReadOnlySpan(), in registry);
             }
 
             if (entry.IsExtension) // Собственный объект расширения
@@ -133,7 +133,7 @@ internal EntityDefinition Load(in string type, in MetadataObject entry, in Metad
 
                         using (ConfigFileBuffer file = Load(in tableName, in fileName))
                         {
-                            extension = parser.Load(uuid, file.AsReadOnlySpan(), in registry, false);
+                            extension = parser.Load(uuid, file.AsReadOnlySpan(), in registry);
                         }
 
                         extended = Configurator.TryApplyBorrowedObject(in entity, in extension);
@@ -179,7 +179,7 @@ internal MetadataRegistry CreateMetadataRegistry()
 
             using (ConfigFileBuffer file = Load(ConfigTables.Config, rootFile))
             {
-                configuration = Configuration.Parse(root, file.AsReadOnlySpan(), in registry);
+                configuration = Configuration.Parse(root, file.AsReadOnlySpan());
             }
 
             registry.Version = configuration.CompatibilityVersion;
@@ -660,7 +660,7 @@ private Configuration LoadExtensionMetadata(in ExtensionInfo extension, byte cfi
 
             using (ConfigFileBuffer file = Load(ConfigTables.ConfigCAS, rootFile))
             {
-                configuration = Configuration.Parse(extension.Uuid, file.AsReadOnlySpan(), in registry);
+                configuration = Configuration.Parse(extension.Uuid, file.AsReadOnlySpan(), cfid);
             }
 
             // Заполняем общий реестр метаданных объектами расширения

src/dajet-metadata/model/Account.cs

@@ -99,7 +99,7 @@ internal override void Initialize(ReadOnlySpan<byte> file, in MetadataRegistry r
                 // Маска кода (строка)
                 //string CodeMask = reader[2][22].SeekString();
             }
-            internal override EntityDefinition Load(Guid uuid, ReadOnlySpan<byte> file, in MetadataRegistry registry, bool relations)
+            internal override EntityDefinition Load(Guid uuid, ReadOnlySpan<byte> file, in MetadataRegistry registry)
             {
                 if (!registry.TryGetEntry(uuid, out Account entry))
                 {

src/dajet-metadata/model/AccountingRegister.cs

@@ -90,7 +90,7 @@ internal override void Initialize(ReadOnlySpan<byte> file, in MetadataRegistry r
                 // Разрешить разделение итогов
                 metadata.UseSplitter = (reader[2][24].SeekNumber() != 0);
             }
-            internal override EntityDefinition Load(Guid uuid, ReadOnlySpan<byte> file, in MetadataRegistry registry, bool relations)
+            internal override EntityDefinition Load(Guid uuid, ReadOnlySpan<byte> file, in MetadataRegistry registry)
             {
                 if (!registry.TryGetEntry(uuid, out AccountingRegister entry))
                 {

src/dajet-metadata/model/AccumulationRegister.cs

@@ -104,7 +104,7 @@ internal override void Initialize(ReadOnlySpan<byte> file, in MetadataRegistry r
                 //    _converter[1][13][1][11] += Parent;
                 //}
             }
-            internal override EntityDefinition Load(Guid uuid, ReadOnlySpan<byte> file, in MetadataRegistry registry, bool relations = false)
+            internal override EntityDefinition Load(Guid uuid, ReadOnlySpan<byte> file, in MetadataRegistry registry)
             {
                 if (!registry.TryGetEntry(uuid, out AccumulationRegister entry))
                 {

src/dajet-metadata/model/BusinessProcess.cs

@@ -102,7 +102,7 @@ internal override void Initialize(ReadOnlySpan<byte> file, in MetadataRegistry r
                     registry.AddBusinessProcessToTask(task, uuid);
                 }
             }
-            internal override EntityDefinition Load(Guid uuid, ReadOnlySpan<byte> file, in MetadataRegistry registry, bool relations)
+            internal override EntityDefinition Load(Guid uuid, ReadOnlySpan<byte> file, in MetadataRegistry registry)
             {
                 if (!registry.TryGetEntry(uuid, out BusinessProcess entry))
                 {

src/dajet-metadata/model/BusinessTask.cs

@@ -86,7 +86,7 @@ internal override void Initialize(ReadOnlySpan<byte> file, in MetadataRegistry r
                     registry.AddReference(uuid, reference);
                 }
             }
-            internal override EntityDefinition Load(Guid uuid, ReadOnlySpan<byte> file, in MetadataRegistry registry, bool relations)
+            internal override EntityDefinition Load(Guid uuid, ReadOnlySpan<byte> file, in MetadataRegistry registry)
             {
                 if (!registry.TryGetEntry(uuid, out BusinessTask entry))
                 {

src/dajet-metadata/model/Catalog.cs

@@ -128,7 +128,7 @@ internal override void Initialize(ReadOnlySpan<byte> file, in MetadataRegistry r
                     //}
                 }
             }
-            internal override EntityDefinition Load(Guid uuid, ReadOnlySpan<byte> file, in MetadataRegistry registry, bool relations)
+            internal override EntityDefinition Load(Guid uuid, ReadOnlySpan<byte> file, in MetadataRegistry registry)
             {
                 if (!registry.TryGetEntry(uuid, out Catalog entry))
                 {

src/dajet-metadata/model/Characteristic.cs

@@ -119,7 +119,7 @@ internal override void Initialize(ReadOnlySpan<byte> file, in MetadataRegistry r
                 //    _converter[1][13][1][15][2] += ExtensionDataTypeDescriptor;
                 //}
             }
-            internal override EntityDefinition Load(Guid uuid, ReadOnlySpan<byte> file, in MetadataRegistry registry, bool relations)
+            internal override EntityDefinition Load(Guid uuid, ReadOnlySpan<byte> file, in MetadataRegistry registry)
             {
                 if (!registry.TryGetEntry(uuid, out Characteristic entry))
                 {

src/dajet-metadata/model/Constant.cs

@@ -83,7 +83,7 @@ internal override void Initialize(ReadOnlySpan<byte> file, in MetadataRegistry r
                 //    _converter[1][1][1][1][11] += Parent; // uuid расширяемого объекта метаданных
                 //}
             }
-            internal override EntityDefinition Load(Guid uuid, ReadOnlySpan<byte> file, in MetadataRegistry registry, bool relations)
+            internal override EntityDefinition Load(Guid uuid, ReadOnlySpan<byte> file, in MetadataRegistry registry)
             {
                 if (!registry.TryGetEntry(uuid, out Constant entry))
                 {
@@ -100,9 +100,9 @@ internal override EntityDefinition Load(Guid uuid, ReadOnlySpan<byte> file, in M
 
                 uint[] root = [2, 2, 2, 3]; // Описание типа значения константы
 
-                DataType constantType = DataTypeParser.Parse(ref reader, root, in registry, out _);
+                DataType constantType = DataTypeParser.Parse(ref reader, root, in registry, out List<Guid> references);
 
-                Configurator.ConfigurePropertyЗначение(in table, constantType, in columnName);
+                Configurator.ConfigurePropertyЗначение(in table, constantType, in columnName, in references);
 
                 Configurator.ConfigurePropertyRecordKey(in table);