Skip to content

Commit 9e92290

Browse files
alex-kulakovalex-kulakov
committed
Make default visitors and certain parts visitors protected
They suppose to be protected, they are not used ouside of compilers and extend basic API of SqlVisitor, no need for them to be public
1 parent 9853552 commit 9e92290

7 files changed

Lines changed: 35 additions & 35 deletions

File tree

‎Orm/Xtensive.Orm.Firebird/Sql.Drivers.Firebird/v2_5/Compiler.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public override void Visit(SqlSelect node)
4444
}
4545

4646
/// <inheritdoc/>
47-
public override void VisitSelectFrom(SqlSelect node)
47+
protected override void VisitSelectFrom(SqlSelect node)
4848
{
4949
if (node.From != null) {
5050
base.VisitSelectFrom(node);

‎Orm/Xtensive.Orm.MySql/Sql.Drivers.MySql/v5_0/Compiler.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ public override void Visit(SqlFunctionCall node)
188188
}
189189

190190
/// <inheritdoc/>
191-
public override void VisitSelectLimitOffset(SqlSelect node)
191+
protected override void VisitSelectLimitOffset(SqlSelect node)
192192
{
193193
if (!node.Limit.IsNullReference()) {
194194
AppendTranslated(node, SelectSection.Limit);

‎Orm/Xtensive.Orm.Oracle/Sql.Drivers.Oracle/v09/Compiler.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ public override void Visit(SqlExtract node)
164164
}
165165
}
166166

167-
public override void VisitSelectFrom(SqlSelect node)
167+
protected override void VisitSelectFrom(SqlSelect node)
168168
{
169169
if (node.From != null) {
170170
base.VisitSelectFrom(node);

‎Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/v09/Compiler.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public override void Visit(SqlUpdate node)
7070
}
7171
}
7272

73-
public override void VisitUpdateLimit(SqlUpdate node)
73+
protected override void VisitUpdateLimit(SqlUpdate node)
7474
{
7575
if (!node.Limit.IsNullReference()) {
7676
if (!Driver.ServerInfo.Query.Features.Supports(QueryFeatures.UpdateLimit))
@@ -95,7 +95,7 @@ public override void Visit(SqlDelete node)
9595
}
9696
}
9797

98-
public override void VisitDeleteLimit(SqlDelete node)
98+
protected override void VisitDeleteLimit(SqlDelete node)
9999
{
100100
if (!node.Limit.IsNullReference()) {
101101
if (!Driver.ServerInfo.Query.Features.Supports(QueryFeatures.DeleteLimit))
@@ -107,7 +107,7 @@ public override void VisitDeleteLimit(SqlDelete node)
107107
}
108108
}
109109

110-
public override void VisitSelectLock(SqlSelect node)
110+
protected override void VisitSelectLock(SqlSelect node)
111111
{
112112
return;
113113
}

‎Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/v11/Compiler.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public override void Visit(SqlSelect node)
1616
VisitSelectDefault(node);
1717
}
1818

19-
public override void VisitSelectLimitOffset(SqlSelect node)
19+
protected override void VisitSelectLimitOffset(SqlSelect node)
2020
{
2121
// FETCH NEXT n ROWS ONLY does not work without OFFSET n ROWS
2222
// Provide zero offset if no offset was specified by user.

‎Orm/Xtensive.Orm.Sqlite/Sql.Drivers.Sqlite/v3/Compiler.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ public override void Visit(SqlTrim node)
256256
}
257257

258258
/// <inheritdoc/>
259-
public override void VisitSelectLimitOffset(SqlSelect node)
259+
protected override void VisitSelectLimitOffset(SqlSelect node)
260260
{
261261
// SQLite requires limit to be present if offset it used,
262262
// luckily negatives value does the job.

‎Orm/Xtensive.Orm/Sql/Compiler/SqlCompiler.cs‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,7 @@ public virtual void Visit(SqlDeclareCursor node)
939939
/// Default visitor for <see cref="SqlDelete"/> statement parts.
940940
/// </summary>
941941
/// <param name="node">Statement to visit.</param>
942-
public void VisitDeleteDefault(SqlDelete node)
942+
protected void VisitDeleteDefault(SqlDelete node)
943943
{
944944
using (context.EnterScope(node)) {
945945
VisitDeleteEntry(node);
@@ -955,13 +955,13 @@ public void VisitDeleteDefault(SqlDelete node)
955955
/// Visits entry part of <see cref="SqlDelete"/> statement.
956956
/// </summary>
957957
/// <param name="node">Statement to visit.</param>
958-
public virtual void VisitDeleteEntry(SqlDelete node) => AppendTranslatedEntry(node);
958+
protected virtual void VisitDeleteEntry(SqlDelete node) => AppendTranslatedEntry(node);
959959

960960
/// <summary>
961961
/// Visits DELETE part of <see cref="SqlDelete"/> statement.
962962
/// </summary>
963963
/// <param name="node">Stetement to visit.</param>
964-
public virtual void VisitDeleteDelete(SqlDelete node)
964+
protected virtual void VisitDeleteDelete(SqlDelete node)
965965
{
966966
if (node.Delete == null) {
967967
throw new SqlCompilerException(Strings.ExTablePropertyIsNotSet);
@@ -976,7 +976,7 @@ public virtual void VisitDeleteDelete(SqlDelete node)
976976
/// Visits FROM part of <see cref="SqlDelete"/> statement.
977977
/// </summary>
978978
/// <param name="node">Statement to visit.</param>
979-
public virtual void VisitDeleteFrom(SqlDelete node)
979+
protected virtual void VisitDeleteFrom(SqlDelete node)
980980
{
981981
if (CheckFeature(QueryFeatures.DeleteFrom) && node.From != null) {
982982
AppendTranslated(node, DeleteSection.From);
@@ -988,7 +988,7 @@ public virtual void VisitDeleteFrom(SqlDelete node)
988988
/// Visits WHERE part of <see cref="SqlDelete"/> statement.
989989
/// </summary>
990990
/// <param name="node">Statement to visit.</param>
991-
public virtual void VisitDeleteWhere(SqlDelete node)
991+
protected virtual void VisitDeleteWhere(SqlDelete node)
992992
{
993993
if (!node.Where.IsNullReference()) {
994994
AppendTranslated(node, DeleteSection.Where);
@@ -1000,7 +1000,7 @@ public virtual void VisitDeleteWhere(SqlDelete node)
10001000
/// Visits LIMIT part of <see cref="SqlDelete"/> statement.
10011001
/// </summary>
10021002
/// <param name="node">Statement to visit.</param>
1003-
public virtual void VisitDeleteLimit(SqlDelete node)
1003+
protected virtual void VisitDeleteLimit(SqlDelete node)
10041004
{
10051005
if (!node.Limit.IsNullReference()) {
10061006
if (!CheckFeature(QueryFeatures.DeleteLimit)) {
@@ -1016,7 +1016,7 @@ public virtual void VisitDeleteLimit(SqlDelete node)
10161016
/// Visits exit part of <see cref="SqlDelete"/> statement.
10171017
/// </summary>
10181018
/// <param name="node">Statement to visit.</param>
1019-
public virtual void VisitDeleteExit(SqlDelete node) => AppendTranslatedExit(node);
1019+
protected virtual void VisitDeleteExit(SqlDelete node) => AppendTranslatedExit(node);
10201020

10211021
/// <summary>
10221022
/// Visits <see cref="SqlDropAssertion"/> statement and translates its parts.
@@ -1519,7 +1519,7 @@ public virtual void Visit(SqlRound node)
15191519
/// Default visitor for <see cref="SqlSelect"/>.
15201520
/// </summary>
15211521
/// <param name="node">Statement to visit.</param>
1522-
public void VisitSelectDefault(SqlSelect node)
1522+
protected void VisitSelectDefault(SqlSelect node)
15231523
{
15241524
using (context.EnterScope(node)) {
15251525
var comment = node.Comment;
@@ -1543,7 +1543,7 @@ public void VisitSelectDefault(SqlSelect node)
15431543
/// Visits HINTS part of <see cref="SqlSelect"/> statement.
15441544
/// </summary>
15451545
/// <param name="node">Statement to visit.</param>
1546-
public virtual void VisitSelectHints(SqlSelect node)
1546+
protected virtual void VisitSelectHints(SqlSelect node)
15471547
{
15481548
var hints = node.Hints;
15491549
if (hints.Count == 0) {
@@ -1565,7 +1565,7 @@ public virtual void VisitSelectHints(SqlSelect node)
15651565
/// Visits COLUMNS part of <see cref="SqlSelect"/> statement and translates its parts.
15661566
/// </summary>
15671567
/// <param name="node">Statement to visit.</param>
1568-
public virtual void VisitSelectColumns(SqlSelect node)
1568+
protected virtual void VisitSelectColumns(SqlSelect node)
15691569
{
15701570
if (node.Columns.Count == 0) {
15711571
AppendSpaceIfNecessary();
@@ -1603,7 +1603,7 @@ public virtual void VisitSelectColumns(SqlSelect node)
16031603
/// Visits FROM part of <see cref="SqlSelect"/> statement and translates its parts.
16041604
/// </summary>
16051605
/// <param name="node">Statement to visit.</param>
1606-
public virtual void VisitSelectFrom(SqlSelect node)
1606+
protected virtual void VisitSelectFrom(SqlSelect node)
16071607
{
16081608
if (node.From == null) {
16091609
return;
@@ -1644,7 +1644,7 @@ public virtual void VisitSelectFrom(SqlSelect node)
16441644
/// Visits WHERE part of <see cref="SqlSelect"/> statement and translates its parts.
16451645
/// </summary>
16461646
/// <param name="node">Statement to visit.</param>
1647-
public virtual void VisitSelectWhere(SqlSelect node)
1647+
protected virtual void VisitSelectWhere(SqlSelect node)
16481648
{
16491649
if (node.Where.IsNullReference()) {
16501650
return;
@@ -1658,7 +1658,7 @@ public virtual void VisitSelectWhere(SqlSelect node)
16581658
/// Visits GROUP BY part of <see cref="SqlSelect"/> statement and translates its parts.
16591659
/// </summary>
16601660
/// <param name="node">Statement to visit.</param>
1661-
public virtual void VisitSelectGroupBy(SqlSelect node)
1661+
protected virtual void VisitSelectGroupBy(SqlSelect node)
16621662
{
16631663
if (node.GroupBy.Count <= 0) {
16641664
return;
@@ -1689,7 +1689,7 @@ public virtual void VisitSelectGroupBy(SqlSelect node)
16891689
/// Visits ORDER BY part of <see cref="SqlSelect"/> statement and translates its parts.
16901690
/// </summary>
16911691
/// <param name="node">Statement to visit.</param>
1692-
public virtual void VisitSelectOrderBy(SqlSelect node)
1692+
protected virtual void VisitSelectOrderBy(SqlSelect node)
16931693
{
16941694
if (node.OrderBy.Count <= 0) {
16951695
return;
@@ -1708,7 +1708,7 @@ public virtual void VisitSelectOrderBy(SqlSelect node)
17081708
/// Visits limits part of <see cref="SqlSelect"/> statement and translates its parts.
17091709
/// </summary>
17101710
/// <param name="node">Statement to visit.</param>
1711-
public virtual void VisitSelectLimitOffset(SqlSelect node)
1711+
protected virtual void VisitSelectLimitOffset(SqlSelect node)
17121712
{
17131713
if (!node.Limit.IsNullReference()) {
17141714
AppendTranslated(node, SelectSection.Limit);
@@ -1726,7 +1726,7 @@ public virtual void VisitSelectLimitOffset(SqlSelect node)
17261726
/// Visits LOCK part of <see cref="SqlSelect"/> statement and translates its parts.
17271727
/// </summary>
17281728
/// <param name="node">Statement to visit.</param>
1729-
public virtual void VisitSelectLock(SqlSelect node)
1729+
protected virtual void VisitSelectLock(SqlSelect node)
17301730
{
17311731
if (node.Lock != SqlLockType.Empty) {
17321732
_ = context.Output.Append(translator.Translate(node.Lock));
@@ -1832,7 +1832,7 @@ public virtual void Visit(SqlMetadata node)
18321832
/// Default visitor for <see cref="SqlUpdate"/> statement.
18331833
/// </summary>
18341834
/// <param name="node">Statement to visit.</param>
1835-
public void VisitUpdateDefault(SqlUpdate node)
1835+
protected void VisitUpdateDefault(SqlUpdate node)
18361836
{
18371837
using (context.EnterScope(node)) {
18381838
VisitUpdateEntry(node);
@@ -1849,7 +1849,7 @@ public void VisitUpdateDefault(SqlUpdate node)
18491849
/// Visits entry part of <see cref="SqlUpdate"/> statement.
18501850
/// </summary>
18511851
/// <param name="node">Statement to visit.</param>
1852-
public virtual void VisitUpdateEntry(SqlUpdate node)
1852+
protected virtual void VisitUpdateEntry(SqlUpdate node)
18531853
{
18541854
translator.Translate(context, node, UpdateSection.Entry);
18551855
AppendSpaceIfNecessary();
@@ -1859,7 +1859,7 @@ public virtual void VisitUpdateEntry(SqlUpdate node)
18591859
/// Visits UPDATE part of <see cref="SqlUpdate"/> statement.
18601860
/// </summary>
18611861
/// <param name="node">Statement to visit.</param>
1862-
public virtual void VisitUpdateUpdate(SqlUpdate node)
1862+
protected virtual void VisitUpdateUpdate(SqlUpdate node)
18631863
{
18641864
if (node.Update == null) {
18651865
throw new SqlCompilerException(Strings.ExTablePropertyIsNotSet);
@@ -1874,7 +1874,7 @@ public virtual void VisitUpdateUpdate(SqlUpdate node)
18741874
/// Visits SET part of <see cref="SqlUpdate"/> statement.
18751875
/// </summary>
18761876
/// <param name="node">Statement to visit.</param>
1877-
public virtual void VisitUpdateSet(SqlUpdate node)
1877+
protected virtual void VisitUpdateSet(SqlUpdate node)
18781878
{
18791879
AppendTranslated(node, UpdateSection.Set);
18801880

@@ -1896,7 +1896,7 @@ public virtual void VisitUpdateSet(SqlUpdate node)
18961896
/// Visits FROM part of <see cref="SqlUpdate"/> statement.
18971897
/// </summary>
18981898
/// <param name="node">Statement to visit.</param>
1899-
public virtual void VisitUpdateFrom(SqlUpdate node)
1899+
protected virtual void VisitUpdateFrom(SqlUpdate node)
19001900
{
19011901
if (Driver.ServerInfo.Query.Features.Supports(QueryFeatures.UpdateFrom) && node.From != null) {
19021902
AppendTranslated(node, UpdateSection.From);
@@ -1908,7 +1908,7 @@ public virtual void VisitUpdateFrom(SqlUpdate node)
19081908
/// Visits WHERE part of <see cref="SqlUpdate"/> statement.
19091909
/// </summary>
19101910
/// <param name="node">Statement to visit.</param>
1911-
public virtual void VisitUpdateWhere(SqlUpdate node)
1911+
protected virtual void VisitUpdateWhere(SqlUpdate node)
19121912
{
19131913
if (!node.Where.IsNullReference()) {
19141914
AppendTranslated(node, UpdateSection.Where);
@@ -1920,7 +1920,7 @@ public virtual void VisitUpdateWhere(SqlUpdate node)
19201920
/// Visits LIMIT part of <see cref="SqlUpdate"/> statement.
19211921
/// </summary>
19221922
/// <param name="node">Statement to visit.</param>
1923-
public virtual void VisitUpdateLimit(SqlUpdate node)
1923+
protected virtual void VisitUpdateLimit(SqlUpdate node)
19241924
{
19251925
if (!node.Limit.IsNullReference()) {
19261926
if (!Driver.ServerInfo.Query.Features.Supports(QueryFeatures.UpdateLimit)) {
@@ -1936,7 +1936,7 @@ public virtual void VisitUpdateLimit(SqlUpdate node)
19361936
/// Visits end part of <see cref="SqlUpdate"/> statement.
19371937
/// </summary>
19381938
/// <param name="node">Statement to visit.</param>
1939-
public virtual void VisitUpdateExit(SqlUpdate node)
1939+
protected virtual void VisitUpdateExit(SqlUpdate node)
19401940
{
19411941
AppendSpaceIfNecessary();
19421942
translator.Translate(context, node, UpdateSection.Exit);
@@ -2096,7 +2096,7 @@ public virtual void Visit(SqlExtract node)
20962096
/// Visits <see cref="SqlComment"/> expression and translates it if setting is set it to be before statement.
20972097
/// </summary>
20982098
/// <param name="node">Expression to visit.</param>
2099-
public virtual void VisitCommentIfBefore(SqlComment node)
2099+
protected virtual void VisitCommentIfBefore(SqlComment node)
21002100
{
21012101
if (node.IsNullReference() || configuration.CommentLocation != SqlCommentLocation.BeforeStatement)
21022102
return;
@@ -2108,7 +2108,7 @@ public virtual void VisitCommentIfBefore(SqlComment node)
21082108
/// Visits <see cref="SqlComment"/> expression and translates it if setting is set it to be within statement.
21092109
/// </summary>
21102110
/// <param name="node">Expression to visit.</param>
2111-
public virtual void VisitCommentIfWithin(SqlComment node)
2111+
protected virtual void VisitCommentIfWithin(SqlComment node)
21122112
{
21132113
if (node.IsNullReference() || configuration.CommentLocation != SqlCommentLocation.WithinStatement)
21142114
return;
@@ -2121,7 +2121,7 @@ public virtual void VisitCommentIfWithin(SqlComment node)
21212121
/// Visits <see cref="SqlComment"/> expression and translates it if setting is set it to be after statement.
21222122
/// </summary>
21232123
/// <param name="node">Expression to visit.</param>
2124-
public virtual void VisitCommentIfAfter(SqlComment node)
2124+
protected virtual void VisitCommentIfAfter(SqlComment node)
21252125
{
21262126
if (node.IsNullReference() || configuration.CommentLocation != SqlCommentLocation.AfterStatement)
21272127
return;

0 commit comments

Comments
 (0)