Skip to content

Commit 9c79a17

Browse files
nickrolfenickrolfe
authored
Merge pull request github#8017 from github/nickrolfe/csharp_externalData
C#: add externalData back to dbscheme
2 parents 9b8d859 + 2633f9d commit 9c79a17

File tree

8 files changed

+8408
-2
lines changed

8 files changed

+8408
-2
lines changed

‎csharp/downgrades/a696c8bae067f69ab3208e98ce35f4fdf7efb68b/old.dbscheme

Lines changed: 2065 additions & 0 deletions
Large diffs are not rendered by default.

‎csharp/downgrades/a696c8bae067f69ab3208e98ce35f4fdf7efb68b/semmlecode.csharp.dbscheme

Lines changed: 2058 additions & 0 deletions
Large diffs are not rendered by default.

‎csharp/downgrades/a696c8bae067f69ab3208e98ce35f4fdf7efb68b/upgrade.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
description: Add externalData relation
2+
compatibility: full
3+
externalData.rel: delete

‎csharp/ql/lib/semmlecode.csharp.dbscheme

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,13 @@ compilation_assembly(
166166
int assembly: @assembly ref
167167
)
168168

169+
// Populated by the CSV extractor
170+
externalData(
171+
int id: @externalDataElement,
172+
string path: string ref,
173+
int column: int ref,
174+
string value: string ref);
175+
169176
sourceLocationPrefix(
170177
string prefix: string ref);
171178

@@ -176,7 +183,7 @@ sourceLocationPrefix(
176183
/** ELEMENTS **/
177184

178185
@element = @declaration | @stmt | @expr | @modifier | @attribute | @namespace_declaration
179-
| @using_directive | @type_parameter_constraints
186+
| @using_directive | @type_parameter_constraints | @externalDataElement
180187
| @xmllocatable | @asp_element | @namespace | @preprocessor_directive;
181188

182189
@declaration = @callable | @generic | @assignable | @namespace;

‎csharp/ql/lib/semmlecode.csharp.dbscheme.stats

Lines changed: 149 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
<k>@extractor_message</k>
1313
<v>41551</v>
1414
</e>
15+
<e>
16+
<k>@externalDataElement</k>
17+
<v>0</v>
18+
</e>
1519
<e>
1620
<k>@assembly</k>
1721
<v>27546</v>
@@ -5579,6 +5583,150 @@
55795583
</dep>
55805584
</dependencies>
55815585
</relation>
5586+
<relation>
5587+
<name>externalData</name>
5588+
<cardinality>0</cardinality>
5589+
<columnsizes>
5590+
<e>
5591+
<k>id</k>
5592+
<v>0</v>
5593+
</e>
5594+
<e>
5595+
<k>path</k>
5596+
<v>0</v>
5597+
</e>
5598+
<e>
5599+
<k>column</k>
5600+
<v>0</v>
5601+
</e>
5602+
<e>
5603+
<k>value</k>
5604+
<v>0</v>
5605+
</e>
5606+
</columnsizes>
5607+
<dependencies>
5608+
<dep>
5609+
<src>id</src>
5610+
<trg>path</trg>
5611+
<val>
5612+
<hist>
5613+
<budget>12</budget>
5614+
<bs/>
5615+
</hist>
5616+
</val>
5617+
</dep>
5618+
<dep>
5619+
<src>id</src>
5620+
<trg>column</trg>
5621+
<val>
5622+
<hist>
5623+
<budget>12</budget>
5624+
<bs/>
5625+
</hist>
5626+
</val>
5627+
</dep>
5628+
<dep>
5629+
<src>id</src>
5630+
<trg>value</trg>
5631+
<val>
5632+
<hist>
5633+
<budget>12</budget>
5634+
<bs/>
5635+
</hist>
5636+
</val>
5637+
</dep>
5638+
<dep>
5639+
<src>path</src>
5640+
<trg>id</trg>
5641+
<val>
5642+
<hist>
5643+
<budget>12</budget>
5644+
<bs/>
5645+
</hist>
5646+
</val>
5647+
</dep>
5648+
<dep>
5649+
<src>path</src>
5650+
<trg>column</trg>
5651+
<val>
5652+
<hist>
5653+
<budget>12</budget>
5654+
<bs/>
5655+
</hist>
5656+
</val>
5657+
</dep>
5658+
<dep>
5659+
<src>path</src>
5660+
<trg>value</trg>
5661+
<val>
5662+
<hist>
5663+
<budget>12</budget>
5664+
<bs/>
5665+
</hist>
5666+
</val>
5667+
</dep>
5668+
<dep>
5669+
<src>column</src>
5670+
<trg>id</trg>
5671+
<val>
5672+
<hist>
5673+
<budget>12</budget>
5674+
<bs/>
5675+
</hist>
5676+
</val>
5677+
</dep>
5678+
<dep>
5679+
<src>column</src>
5680+
<trg>path</trg>
5681+
<val>
5682+
<hist>
5683+
<budget>12</budget>
5684+
<bs/>
5685+
</hist>
5686+
</val>
5687+
</dep>
5688+
<dep>
5689+
<src>column</src>
5690+
<trg>value</trg>
5691+
<val>
5692+
<hist>
5693+
<budget>12</budget>
5694+
<bs/>
5695+
</hist>
5696+
</val>
5697+
</dep>
5698+
<dep>
5699+
<src>value</src>
5700+
<trg>id</trg>
5701+
<val>
5702+
<hist>
5703+
<budget>12</budget>
5704+
<bs/>
5705+
</hist>
5706+
</val>
5707+
</dep>
5708+
<dep>
5709+
<src>value</src>
5710+
<trg>path</trg>
5711+
<val>
5712+
<hist>
5713+
<budget>12</budget>
5714+
<bs/>
5715+
</hist>
5716+
</val>
5717+
</dep>
5718+
<dep>
5719+
<src>value</src>
5720+
<trg>column</trg>
5721+
<val>
5722+
<hist>
5723+
<budget>12</budget>
5724+
<bs/>
5725+
</hist>
5726+
</val>
5727+
</dep>
5728+
</dependencies>
5729+
</relation>
55825730
<relation>
55835731
<name>sourceLocationPrefix</name>
55845732
<cardinality>154</cardinality>
@@ -45198,4 +45346,4 @@
4519845346
</dependencies>
4519945347
</relation>
4520045348
</stats>
45201-
</dbstats>
45349+
</dbstats>

0 commit comments

Comments
 (0)