#At file:///C:/work/connector-net/trunk/ based on revid:fer.gonzalez@stripped
1093 Reggie Burnett 2011-12-16
small reorganization of new parser code
removed:
Parser/
renamed:
Parser/Antlr/ => Source/MySqlParser/Antlr/
Parser/GrammarDriver/ => Source/MySqlParser/GrammarDriver/
Parser/MySqlParser/ => Source/MySqlParser/
Parser/MySqlParser.Tests/ => Tests/MySqlParser.Tests/
modified:
MySQLClient.sln
Source/MySql.Data/Connection.cs
Source/MySql.Data/Properties/Resources.Designer.cs
Source/MySql.Data/command.cs
Source/MySql.VisualStudio/MySql.VisualStudio.csproj
Source/MySqlParser/MySql.Parser.csproj
=== modified file 'MySQLClient.sln'
=== modified file 'MySQLClient.sln'
--- a/MySQLClient.sln 2011-12-16 17:11:22 +0000
+++ b/MySQLClient.sln 2011-12-16 17:14:16 +0000
@@ -25,7 +25,7 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.Entity.ModelFirst.Tests", "Tests\MySql.Data.Entity.ModelFirst.Tests\MySql.Data.Entity.ModelFirst.Tests.csproj", "{EF3B193C-EFAE-458C-8077-CB8602365E10}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Parser", "Parser\MySqlParser\MySql.Parser.csproj", "{06163AD1-3F06-43AE-A4F9-967F7F6432C3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Parser", "Source\MySqlParser\MySql.Parser.csproj", "{06163AD1-3F06-43AE-A4F9-967F7F6432C3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
=== removed directory 'Parser'
=== modified file 'Source/MySql.Data/Connection.cs'
--- a/Source/MySql.Data/Connection.cs 2011-12-15 22:44:01 +0000
+++ b/Source/MySql.Data/Connection.cs 2011-12-16 17:14:16 +0000
@@ -54,12 +54,12 @@
private bool isInUse;
#if !CF
private PerformanceMonitor perfMonitor;
+ private ExceptionInterceptor exceptionInterceptor;
+ internal CommandInterceptor commandInterceptor;
#endif
private bool isKillQueryConnection;
private string database;
private int commandTimeout;
- private ExceptionInterceptor exceptionInterceptor;
- internal CommandInterceptor commandInterceptor;
/// <include file='docs/MySqlConnection.xml' path='docs/InfoMessage/*'/>
public event MySqlInfoMessageEventHandler InfoMessage;
@@ -454,9 +454,11 @@
if (State == ConnectionState.Open)
Throw(new InvalidOperationException(Resources.ConnectionAlreadyOpen));
+#if !CF
// start up our interceptors
exceptionInterceptor = new ExceptionInterceptor(this);
commandInterceptor = new CommandInterceptor(this);
+#endif
SetState(ConnectionState.Connecting, true);
@@ -843,9 +845,13 @@
internal void Throw(Exception ex)
{
+#if !CF
if (exceptionInterceptor == null)
throw ex;
exceptionInterceptor.Throw(ex);
+#else
+ throw ex;
+#endif
}
}
=== modified file 'Source/MySql.Data/Properties/Resources.Designer.cs'
--- a/Source/MySql.Data/Properties/Resources.Designer.cs 2011-12-15 22:44:01 +0000
+++ b/Source/MySql.Data/Properties/Resources.Designer.cs 2011-12-16 17:14:16 +0000
@@ -21,7 +21,9 @@
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+#if !CF
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+#endif
public class Resources {
private static global::System.Resources.ResourceManager resourceMan;
@@ -457,71 +459,71 @@
}
/// <summary>
- /// Looks up a localized string similar to ACCESSIBLE
- ///ADD
- ///ALL
- ///ALTER
- ///ANALYZE
- ///AND
- ///AS
- ///ASC
- ///ASENSITIVE
- ///BEFORE
- ///BETWEEN
- ///BIGINT
- ///BINARY
- ///BLOB
- ///BOTH
- ///BY
- ///CALL
- ///CASCADE
- ///CASE
- ///CHANGE
- ///CHAR
- ///CHARACTER
- ///CHECK
- ///COLLATE
- ///COLUMN
- ///CONDITION
- ///CONNECTION
- ///CONSTRAINT
- ///CONTINUE
- ///CONVERT
- ///CREATE
- ///CROSS
- ///CURRENT_DATE
- ///CURRENT_TIME
- ///CURRENT_TIMESTAMP
- ///CURRENT_USER
- ///CURSOR
- ///DATABASE
- ///DATABASES
- ///DAY_HOUR
- ///DAY_MICROSECOND
- ///DAY_MINUTE
- ///DAY_SECOND
- ///DEC
- ///DECIMAL
- ///DECLARE
- ///DEFAULT
- ///DELAYED
- ///DELETE
- ///DESC
- ///DESCRIBE
- ///DETERMINISTIC
- ///DISTINCT
- ///DISTINCTROW
- ///DIV
- ///DOUBLE
- ///DROP
- ///DUAL
- ///EACH
- ///ELSE
- ///ELSEIF
- ///ENCLOSED
- ///ESCAPED
- ///EXISTS
- ///EXIT
+ /// Looks up a localized string similar to ACCESSIBLE
+ ///ADD
+ ///ALL
+ ///ALTER
+ ///ANALYZE
+ ///AND
+ ///AS
+ ///ASC
+ ///ASENSITIVE
+ ///BEFORE
+ ///BETWEEN
+ ///BIGINT
+ ///BINARY
+ ///BLOB
+ ///BOTH
+ ///BY
+ ///CALL
+ ///CASCADE
+ ///CASE
+ ///CHANGE
+ ///CHAR
+ ///CHARACTER
+ ///CHECK
+ ///COLLATE
+ ///COLUMN
+ ///CONDITION
+ ///CONNECTION
+ ///CONSTRAINT
+ ///CONTINUE
+ ///CONVERT
+ ///CREATE
+ ///CROSS
+ ///CURRENT_DATE
+ ///CURRENT_TIME
+ ///CURRENT_TIMESTAMP
+ ///CURRENT_USER
+ ///CURSOR
+ ///DATABASE
+ ///DATABASES
+ ///DAY_HOUR
+ ///DAY_MICROSECOND
+ ///DAY_MINUTE
+ ///DAY_SECOND
+ ///DEC
+ ///DECIMAL
+ ///DECLARE
+ ///DEFAULT
+ ///DELAYED
+ ///DELETE
+ ///DESC
+ ///DESCRIBE
+ ///DETERMINISTIC
+ ///DISTINCT
+ ///DISTINCTROW
+ ///DIV
+ ///DOUBLE
+ ///DROP
+ ///DUAL
+ ///EACH
+ ///ELSE
+ ///ELSEIF
+ ///ENCLOSED
+ ///ESCAPED
+ ///EXISTS
+ ///EXIT
///EXP [rest of string was truncated]";.
/// </summary>
public static string keywords {
=== modified file 'Source/MySql.Data/command.cs'
--- a/Source/MySql.Data/command.cs 2011-12-15 22:44:01 +0000
+++ b/Source/MySql.Data/command.cs 2011-12-16 17:14:16 +0000
@@ -341,9 +341,11 @@
{
int records = -1;
+#if !CF
// give our interceptors a shot at it first
if (connection.commandInterceptor.ExecuteNonQuery(CommandText, ref records))
return records;
+#endif
// ok, none of our interceptors handled this so we default
using (MySqlDataReader reader = ExecuteReader())
@@ -410,10 +412,12 @@
/// <include file='docs/mysqlcommand.xml' path='docs/ExecuteReader1/*'/>
public new MySqlDataReader ExecuteReader(CommandBehavior behavior)
{
+#if !CF
// give our interceptors a shot at it first
MySqlDataReader interceptedReader = null;
if (connection.commandInterceptor.ExecuteReader(CommandText, behavior, ref interceptedReader))
return interceptedReader;
+#endif
// interceptors didn't handle this so we fall through
bool success = false;
@@ -577,9 +581,11 @@
lastInsertedId = -1;
object val = null;
+#if !CF
// give our interceptors a shot at it first
if (connection.commandInterceptor.ExecuteScalar(CommandText, ref val))
return val;
+#endif
using (MySqlDataReader reader = ExecuteReader())
{
=== modified file 'Source/MySql.VisualStudio/MySql.VisualStudio.csproj'
--- a/Source/MySql.VisualStudio/MySql.VisualStudio.csproj 2011-12-16 16:19:22 +0000
+++ b/Source/MySql.VisualStudio/MySql.VisualStudio.csproj 2011-12-16 17:14:16 +0000
@@ -61,7 +61,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Antlr3.Runtime">
- <HintPath>..\..\Parser\Antlr\Antlr3.Runtime.dll</HintPath>
+ <HintPath>..\MySqlParser\Antlr\Antlr3.Runtime.dll</HintPath>
</Reference>
<Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="EnvDTE80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
@@ -414,14 +414,14 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\Parser\MySqlParser\MySql.Parser.csproj">
- <Project>{06163AD1-3F06-43AE-A4F9-967F7F6432C3}</Project>
- <Name>MySql.Parser</Name>
- </ProjectReference>
<ProjectReference Include="..\MySql.Data\MySql.Data.csproj">
<Project>{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}</Project>
<Name>MySql.Data</Name>
</ProjectReference>
+ <ProjectReference Include="..\MySqlParser\MySql.Parser.csproj">
+ <Project>{06163AD1-3F06-43AE-A4F9-967F7F6432C3}</Project>
+ <Name>MySql.Parser</Name>
+ </ProjectReference>
</ItemGroup>
<PropertyGroup>
<GeneratePkgDefFile>false</GeneratePkgDefFile>
=== renamed directory 'Parser/MySqlParser' => 'Source/MySqlParser'
=== renamed directory 'Parser/Antlr' => 'Source/MySqlParser/Antlr'
=== renamed directory 'Parser/GrammarDriver' => 'Source/MySqlParser/GrammarDriver'
=== modified file 'Source/MySqlParser/MySql.Parser.csproj'
--- a/Parser/MySqlParser/MySql.Parser.csproj 2011-12-16 16:19:22 +0000
+++ b/Source/MySqlParser/MySql.Parser.csproj 2011-12-16 17:14:16 +0000
@@ -33,7 +33,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Antlr3.Runtime">
- <HintPath>..\Antlr\Antlr3.Runtime.dll</HintPath>
+ <HintPath>Antlr\Antlr3.Runtime.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
@@ -75,11 +75,11 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<!-- Folder containing AntlrBuildTask.dll -->
- <AntlrBuildTaskPath>$(ProjectDir)..\Antlr</AntlrBuildTaskPath>
+ <AntlrBuildTaskPath>$(ProjectDir)Antlr</AntlrBuildTaskPath>
<!-- Path to the ANTLR Tool itself. -->
- <AntlrToolPath>$(ProjectDir)..\Antlr\Antlr3.exe</AntlrToolPath>
+ <AntlrToolPath>$(ProjectDir)Antlr\Antlr3.exe</AntlrToolPath>
</PropertyGroup>
- <Import Project="$(ProjectDir)..\Antlr\Antlr3.targets" />
+ <Import Project="$(ProjectDir)Antlr\Antlr3.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
=== renamed directory 'Parser/MySqlParser.Tests' => 'Tests/MySqlParser.Tests'
Attachment: [text/bzr-bundle] bzr/reggie.burnett@oracle.com-20111216171416-tywdut5tukzwtmmj.bundle
| Thread |
|---|
| • bzr commit into connector-net-trunk branch (reggie.burnett:1093) | Reggie Burnett | 16 Dec |
