Skip to content

Commit 371f36e

Browse files
aibaarsaibaars
committed
C++: sync file and folders dbscheme
1 parent 8d7ca9e commit 371f36e

2 files changed

Lines changed: 47 additions & 48 deletions

File tree

‎cpp/ql/lib/semmlecode.cpp.dbscheme‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -172,37 +172,36 @@ svnchurn(
172172
/*- Files and folders -*/
173173

174174
/**
175-
* The location of an element that is not an expression or a statement.
175+
* The location of an element.
176176
* The location spans column `startcolumn` of line `startline` to
177177
* column `endcolumn` of line `endline` in file `file`.
178178
* For more information, see
179179
* [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
180180
*/
181181
locations_default(
182-
/** The location of an element that is not an expression or a statement. */
183-
unique int id: @location_default,
184-
int container: @container ref,
185-
int startLine: int ref,
186-
int startColumn: int ref,
187-
int endLine: int ref,
188-
int endColumn: int ref
182+
unique int id: @location_default,
183+
int file: @file ref,
184+
int beginLine: int ref,
185+
int beginColumn: int ref,
186+
int endLine: int ref,
187+
int endColumn: int ref
189188
);
190189

191190
files(
192-
unique int id: @file,
193-
string name: string ref
191+
unique int id: @file,
192+
string name: string ref
194193
);
195194

196195
folders(
197-
unique int id: @folder,
198-
string name: string ref
196+
unique int id: @folder,
197+
string name: string ref
199198
);
200199

201-
@container = @folder | @file
200+
@container = @file | @folder
202201

203202
containerparent(
204-
int parent: @container ref,
205-
unique int child: @container ref
203+
int parent: @container ref,
204+
unique int child: @container ref
206205
);
207206

208207
/*- Lines of code -*/

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

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -4706,15 +4706,15 @@
47064706
<v>29769315</v>
47074707
</e>
47084708
<e>
4709-
<k>container</k>
4709+
<k>file</k>
47104710
<v>138490</v>
47114711
</e>
47124712
<e>
4713-
<k>startLine</k>
4713+
<k>beginLine</k>
47144714
<v>2092739</v>
47154715
</e>
47164716
<e>
4717-
<k>startColumn</k>
4717+
<k>beginColumn</k>
47184718
<v>36837</v>
47194719
</e>
47204720
<e>
@@ -4729,7 +4729,7 @@
47294729
<dependencies>
47304730
<dep>
47314731
<src>id</src>
4732-
<trg>container</trg>
4732+
<trg>file</trg>
47334733
<val>
47344734
<hist>
47354735
<budget>12</budget>
@@ -4745,7 +4745,7 @@
47454745
</dep>
47464746
<dep>
47474747
<src>id</src>
4748-
<trg>startLine</trg>
4748+
<trg>beginLine</trg>
47494749
<val>
47504750
<hist>
47514751
<budget>12</budget>
@@ -4761,7 +4761,7 @@
47614761
</dep>
47624762
<dep>
47634763
<src>id</src>
4764-
<trg>startColumn</trg>
4764+
<trg>beginColumn</trg>
47654765
<val>
47664766
<hist>
47674767
<budget>12</budget>
@@ -4808,7 +4808,7 @@
48084808
</val>
48094809
</dep>
48104810
<dep>
4811-
<src>container</src>
4811+
<src>file</src>
48124812
<trg>id</trg>
48134813
<val>
48144814
<hist>
@@ -4884,8 +4884,8 @@
48844884
</val>
48854885
</dep>
48864886
<dep>
4887-
<src>container</src>
4888-
<trg>startLine</trg>
4887+
<src>file</src>
4888+
<trg>beginLine</trg>
48894889
<val>
48904890
<hist>
48914891
<budget>12</budget>
@@ -4960,8 +4960,8 @@
49604960
</val>
49614961
</dep>
49624962
<dep>
4963-
<src>container</src>
4964-
<trg>startColumn</trg>
4963+
<src>file</src>
4964+
<trg>beginColumn</trg>
49654965
<val>
49664966
<hist>
49674967
<budget>12</budget>
@@ -5036,7 +5036,7 @@
50365036
</val>
50375037
</dep>
50385038
<dep>
5039-
<src>container</src>
5039+
<src>file</src>
50405040
<trg>endLine</trg>
50415041
<val>
50425042
<hist>
@@ -5112,7 +5112,7 @@
51125112
</val>
51135113
</dep>
51145114
<dep>
5115-
<src>container</src>
5115+
<src>file</src>
51165116
<trg>endColumn</trg>
51175117
<val>
51185118
<hist>
@@ -5183,7 +5183,7 @@
51835183
</val>
51845184
</dep>
51855185
<dep>
5186-
<src>startLine</src>
5186+
<src>beginLine</src>
51875187
<trg>id</trg>
51885188
<val>
51895189
<hist>
@@ -5244,8 +5244,8 @@
52445244
</val>
52455245
</dep>
52465246
<dep>
5247-
<src>startLine</src>
5248-
<trg>container</trg>
5247+
<src>beginLine</src>
5248+
<trg>file</trg>
52495249
<val>
52505250
<hist>
52515251
<budget>12</budget>
@@ -5295,8 +5295,8 @@
52955295
</val>
52965296
</dep>
52975297
<dep>
5298-
<src>startLine</src>
5299-
<trg>startColumn</trg>
5298+
<src>beginLine</src>
5299+
<trg>beginColumn</trg>
53005300
<val>
53015301
<hist>
53025302
<budget>12</budget>
@@ -5351,7 +5351,7 @@
53515351
</val>
53525352
</dep>
53535353
<dep>
5354-
<src>startLine</src>
5354+
<src>beginLine</src>
53555355
<trg>endLine</trg>
53565356
<val>
53575357
<hist>
@@ -5382,7 +5382,7 @@
53825382
</val>
53835383
</dep>
53845384
<dep>
5385-
<src>startLine</src>
5385+
<src>beginLine</src>
53865386
<trg>endColumn</trg>
53875387
<val>
53885388
<hist>
@@ -5443,7 +5443,7 @@
54435443
</val>
54445444
</dep>
54455445
<dep>
5446-
<src>startColumn</src>
5446+
<src>beginColumn</src>
54475447
<trg>id</trg>
54485448
<val>
54495449
<hist>
@@ -5524,8 +5524,8 @@
55245524
</val>
55255525
</dep>
55265526
<dep>
5527-
<src>startColumn</src>
5528-
<trg>container</trg>
5527+
<src>beginColumn</src>
5528+
<trg>file</trg>
55295529
<val>
55305530
<hist>
55315531
<budget>12</budget>
@@ -5600,8 +5600,8 @@
56005600
</val>
56015601
</dep>
56025602
<dep>
5603-
<src>startColumn</src>
5604-
<trg>startLine</trg>
5603+
<src>beginColumn</src>
5604+
<trg>beginLine</trg>
56055605
<val>
56065606
<hist>
56075607
<budget>12</budget>
@@ -5681,7 +5681,7 @@
56815681
</val>
56825682
</dep>
56835683
<dep>
5684-
<src>startColumn</src>
5684+
<src>beginColumn</src>
56855685
<trg>endLine</trg>
56865686
<val>
56875687
<hist>
@@ -5762,7 +5762,7 @@
57625762
</val>
57635763
</dep>
57645764
<dep>
5765-
<src>startColumn</src>
5765+
<src>beginColumn</src>
57665766
<trg>endColumn</trg>
57675767
<val>
57685768
<hist>
@@ -5900,7 +5900,7 @@
59005900
</dep>
59015901
<dep>
59025902
<src>endLine</src>
5903-
<trg>container</trg>
5903+
<trg>file</trg>
59045904
<val>
59055905
<hist>
59065906
<budget>12</budget>
@@ -5956,7 +5956,7 @@
59565956
</dep>
59575957
<dep>
59585958
<src>endLine</src>
5959-
<trg>startLine</trg>
5959+
<trg>beginLine</trg>
59605960
<val>
59615961
<hist>
59625962
<budget>12</budget>
@@ -5987,7 +5987,7 @@
59875987
</dep>
59885988
<dep>
59895989
<src>endLine</src>
5990-
<trg>startColumn</trg>
5990+
<trg>beginColumn</trg>
59915991
<val>
59925992
<hist>
59935993
<budget>12</budget>
@@ -6180,7 +6180,7 @@
61806180
</dep>
61816181
<dep>
61826182
<src>endColumn</src>
6183-
<trg>container</trg>
6183+
<trg>file</trg>
61846184
<val>
61856185
<hist>
61866186
<budget>12</budget>
@@ -6256,7 +6256,7 @@
62566256
</dep>
62576257
<dep>
62586258
<src>endColumn</src>
6259-
<trg>startLine</trg>
6259+
<trg>beginLine</trg>
62606260
<val>
62616261
<hist>
62626262
<budget>12</budget>
@@ -6332,7 +6332,7 @@
63326332
</dep>
63336333
<dep>
63346334
<src>endColumn</src>
6335-
<trg>startColumn</trg>
6335+
<trg>beginColumn</trg>
63366336
<val>
63376337
<hist>
63386338
<budget>12</budget>

0 commit comments

Comments
 (0)