Change OpetreeRebalanceCommand StopAfter to Int

cheziyi · cheziyi · commit 77889daaa851 · 2020-06-08T02:29:08.000+08:00
diff --git a/src/PrismaDB.QueryParser.MSSQL/AntlrGrammer/MsSqlParser.g4 b/src/PrismaDB.QueryParser.MSSQL/AntlrGrammer/MsSqlParser.g4
@@ -295,7 +295,7 @@ opetreeRebalanceCommand
         (
           STOP
           (
-            AFTER stopAfter=decimalLiteral (ITERATIONS | HOURS | MINUTES)
+            AFTER stopAfter=intLiteral (ITERATIONS | HOURS | MINUTES)
           )?
         )
       )?
diff --git a/src/PrismaDB.QueryParser.MSSQL/PrismaDB.QueryParser.MSSQL.csproj b/src/PrismaDB.QueryParser.MSSQL/PrismaDB.QueryParser.MSSQL.csproj
@@ -13,11 +13,11 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Antlr4.Runtime" Version="4.6.6" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="PrismaDB.QueryAST" Version="0.3.6" />
+    <PackageReference Include="PrismaDB.QueryAST" Version="0.3.7" />
   </ItemGroup>
   <ItemGroup>
     <None Update="AntlrMySqlLexer.g4">
diff --git a/src/PrismaDB.QueryParser.MSSQL/Visitors/CommandVisitors.cs b/src/PrismaDB.QueryParser.MSSQL/Visitors/CommandVisitors.cs
@@ -64,7 +64,7 @@ public override object VisitOpetreeRebalanceCommand([NotNull] MsSqlParser.Opetre
                 return res;
             }
 
-            res.StopAfter = (DecimalConstant)Visit(context.stopAfter);
+            res.StopAfter = (IntConstant)Visit(context.stopAfter);
 
             if (context.ITERATIONS() != null)
                 res.StopType = RebalanceStopType.ITERATIONS;
diff --git a/src/PrismaDB.QueryParser.MySQL/AntlrGrammer/MySqlParser.g4 b/src/PrismaDB.QueryParser.MySQL/AntlrGrammer/MySqlParser.g4
@@ -294,7 +294,7 @@ opetreeRebalanceCommand
         (
           STOP
           (
-            AFTER stopAfter=decimalLiteral (ITERATIONS | HOURS | MINUTES)
+            AFTER stopAfter=intLiteral (ITERATIONS | HOURS | MINUTES)
           )?
         )
       )?
diff --git a/src/PrismaDB.QueryParser.MySQL/PrismaDB.QueryParser.MySQL.csproj b/src/PrismaDB.QueryParser.MySQL/PrismaDB.QueryParser.MySQL.csproj
@@ -13,11 +13,11 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Antlr4.Runtime" Version="4.6.6" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="PrismaDB.QueryAST" Version="0.3.6" />
+    <PackageReference Include="PrismaDB.QueryAST" Version="0.3.7" />
   </ItemGroup>
   <ItemGroup>
     <None Update="AntlrMySqlLexer.g4">
diff --git a/src/PrismaDB.QueryParser.MySQL/Visitors/CommandVisitors.cs b/src/PrismaDB.QueryParser.MySQL/Visitors/CommandVisitors.cs
@@ -72,7 +72,7 @@ public override object VisitOpetreeRebalanceCommand([NotNull] MySqlParser.Opetre
                 return res;
             }
 
-            res.StopAfter = (DecimalConstant)Visit(context.stopAfter);
+            res.StopAfter = (IntConstant)Visit(context.stopAfter);
 
             if (context.ITERATIONS() != null)
                 res.StopType = RebalanceStopType.ITERATIONS;
diff --git a/src/PrismaDB.QueryParser.Postgres/AntlrGrammer/PostgresParser.g4 b/src/PrismaDB.QueryParser.Postgres/AntlrGrammer/PostgresParser.g4
@@ -288,7 +288,7 @@ opetreeRebalanceCommand
         (
           STOP
           (
-            AFTER stopAfter=decimalLiteral (ITERATIONS | HOURS | MINUTES)
+            AFTER stopAfter=intLiteral (ITERATIONS | HOURS | MINUTES)
           )?
         )
       )?
diff --git a/src/PrismaDB.QueryParser.Postgres/PrismaDB.QueryParser.Postgres.csproj b/src/PrismaDB.QueryParser.Postgres/PrismaDB.QueryParser.Postgres.csproj
@@ -13,11 +13,11 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Antlr4.Runtime" Version="4.6.6" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="PrismaDB.QueryAST" Version="0.3.6" />
+    <PackageReference Include="PrismaDB.QueryAST" Version="0.3.7" />
   </ItemGroup>
   <ItemGroup>
     <None Update="AntlrPostgresLexer.g4">
diff --git a/src/PrismaDB.QueryParser.Postgres/Visitors/CommandVisitors.cs b/src/PrismaDB.QueryParser.Postgres/Visitors/CommandVisitors.cs
@@ -64,7 +64,7 @@ public override object VisitOpetreeRebalanceCommand([NotNull] PostgresParser.Ope
                 return res;
             }
 
-            res.StopAfter = (DecimalConstant)Visit(context.stopAfter);
+            res.StopAfter = (IntConstant)Visit(context.stopAfter);
 
             if (context.ITERATIONS() != null)
                 res.StopType = RebalanceStopType.ITERATIONS;
diff --git a/test/ParserTests-MSSQL/ParserTests-MSSQL.csproj b/test/ParserTests-MSSQL/ParserTests-MSSQL.csproj
@@ -6,7 +6,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/test/ParserTests-MSSQL/QueryTest.cs b/test/ParserTests-MSSQL/QueryTest.cs
@@ -203,7 +203,7 @@ public void Parse_Commands()
                        "PRISMADB OPETREE INSERT VALUES (1,2,3,4.5);" +
                        "PRISMADB OPETREE REBALANCE STATUS;" +
                        "PRISMADB OPETREE REBALANCE STOP;" +
-                       "PRISMADB OPETREE REBALANCE STOP AFTER 1.5 HOURS;";
+                       "PRISMADB OPETREE REBALANCE STOP AFTER 2 HOURS;";
 
             // Act 
             var result = MsSqlQueryParser.ParseToAst(test);
@@ -234,7 +234,7 @@ public void Parse_Commands()
             Assert.True(((OpetreeRebalanceCommand)result[16]).StatusCheck);
             Assert.Equal(RebalanceStopType.IMMEDIATE, ((OpetreeRebalanceCommand)result[17]).StopType);
             Assert.Equal(RebalanceStopType.HOURS, ((OpetreeRebalanceCommand)result[18]).StopType);
-            Assert.Equal(1.5m, ((OpetreeRebalanceCommand)result[18]).StopAfter.decimalvalue);
+            Assert.Equal(2, ((OpetreeRebalanceCommand)result[18]).StopAfter.intvalue);
         }
 
         [Fact(DisplayName = "Parse functions in SELECT")]
diff --git a/test/ParserTests-MySQL/ParserTests-MySQL.csproj b/test/ParserTests-MySQL/ParserTests-MySQL.csproj
@@ -6,7 +6,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/test/ParserTests-MySQL/QueryTest.cs b/test/ParserTests-MySQL/QueryTest.cs
@@ -241,7 +241,7 @@ public void Parse_Commands()
                        "PRISMADB OPETREE INSERT VALUES (1,2,3,4.5);" +
                        "PRISMADB OPETREE REBALANCE STATUS;" +
                        "PRISMADB OPETREE REBALANCE STOP;" +
-                       "PRISMADB OPETREE REBALANCE STOP AFTER 1.5 HOURS;";
+                       "PRISMADB OPETREE REBALANCE STOP AFTER 2 HOURS;";
 
             // Act 
             var result = MySqlQueryParser.ParseToAst(test);
@@ -274,7 +274,7 @@ public void Parse_Commands()
             Assert.True(((OpetreeRebalanceCommand)result[17]).StatusCheck);
             Assert.Equal(RebalanceStopType.IMMEDIATE, ((OpetreeRebalanceCommand)result[18]).StopType);
             Assert.Equal(RebalanceStopType.HOURS, ((OpetreeRebalanceCommand)result[19]).StopType);
-            Assert.Equal(1.5m, ((OpetreeRebalanceCommand)result[19]).StopAfter.decimalvalue);
+            Assert.Equal(2, ((OpetreeRebalanceCommand)result[19]).StopAfter.intvalue);
         }
 
         [Fact(DisplayName = "Parse SELECT w\\functions")]
diff --git a/test/ParserTests-Postgres/ParserTests-Postgres.csproj b/test/ParserTests-Postgres/ParserTests-Postgres.csproj
@@ -8,7 +8,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/test/ParserTests-Postgres/QueryTest.cs b/test/ParserTests-Postgres/QueryTest.cs
@@ -230,7 +230,7 @@ public void Parse_Commands()
                        "PRISMADB OPETREE INSERT VALUES (1,2,3,4.5);" +
                        "PRISMADB OPETREE REBALANCE STATUS;" +
                        "PRISMADB OPETREE REBALANCE STOP;" +
-                       "PRISMADB OPETREE REBALANCE STOP AFTER 1.5 HOURS;";
+                       "PRISMADB OPETREE REBALANCE STOP AFTER 2 HOURS;";
 
             // Act 
             var result = PostgresQueryParser.ParseToAst(test);
@@ -261,7 +261,7 @@ public void Parse_Commands()
             Assert.True(((OpetreeRebalanceCommand)result[16]).StatusCheck);
             Assert.Equal(RebalanceStopType.IMMEDIATE, ((OpetreeRebalanceCommand)result[17]).StopType);
             Assert.Equal(RebalanceStopType.HOURS, ((OpetreeRebalanceCommand)result[18]).StopType);
-            Assert.Equal(1.5m, ((OpetreeRebalanceCommand)result[18]).StopAfter.decimalvalue);
+            Assert.Equal(2, ((OpetreeRebalanceCommand)result[18]).StopAfter.intvalue);
         }
 
         [Fact(DisplayName = "Parse SELECT w\\functions")]

Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ opetreeRebalanceCommand`
`295`	`295`	`(`
`296`	`296`	`STOP`
`297`	`297`	`(`
`298`		`- AFTER stopAfter=decimalLiteral (ITERATIONS \| HOURS \| MINUTES)`
	`298`	`+ AFTER stopAfter=intLiteral (ITERATIONS \| HOURS \| MINUTES)`
`299`	`299`	`)?`
`300`	`300`	`)`
`301`	`301`	`)?`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public override object VisitOpetreeRebalanceCommand([NotNull] MsSqlParser.Opetre`
`64`	`64`	`return res;`
`65`	`65`	`}`
`66`	`66`
`67`		`- res.StopAfter = (DecimalConstant)Visit(context.stopAfter);`
	`67`	`+ res.StopAfter = (IntConstant)Visit(context.stopAfter);`
`68`	`68`
`69`	`69`	`if (context.ITERATIONS() != null)`
`70`	`70`	`res.StopType = RebalanceStopType.ITERATIONS;`
Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ opetreeRebalanceCommand`
`294`	`294`	`(`
`295`	`295`	`STOP`
`296`	`296`	`(`
`297`		`- AFTER stopAfter=decimalLiteral (ITERATIONS \| HOURS \| MINUTES)`
	`297`	`+ AFTER stopAfter=intLiteral (ITERATIONS \| HOURS \| MINUTES)`
`298`	`298`	`)?`
`299`	`299`	`)`
`300`	`300`	`)?`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public override object VisitOpetreeRebalanceCommand([NotNull] MySqlParser.Opetre`
`72`	`72`	`return res;`
`73`	`73`	`}`
`74`	`74`
`75`		`- res.StopAfter = (DecimalConstant)Visit(context.stopAfter);`
	`75`	`+ res.StopAfter = (IntConstant)Visit(context.stopAfter);`
`76`	`76`
`77`	`77`	`if (context.ITERATIONS() != null)`
`78`	`78`	`res.StopType = RebalanceStopType.ITERATIONS;`
Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,7 @@ opetreeRebalanceCommand`
`288`	`288`	`(`
`289`	`289`	`STOP`
`290`	`290`	`(`
`291`		`- AFTER stopAfter=decimalLiteral (ITERATIONS \| HOURS \| MINUTES)`
	`291`	`+ AFTER stopAfter=intLiteral (ITERATIONS \| HOURS \| MINUTES)`
`292`	`292`	`)?`
`293`	`293`	`)`
`294`	`294`	`)?`