npgsql · jjchiw · Dec 6, 2013 · Dec 6, 2013 · Dec 12, 2013 · Dec 12, 2013
diff --git a/Npgsql.EntityFramework/NpgsqlProviderManifest.cs b/Npgsql.EntityFramework/NpgsqlProviderManifest.cs
@@ -16,7 +16,7 @@ namespace Npgsql
     internal class NpgsqlProviderManifest : DbXmlEnabledProviderManifest
     {
         public NpgsqlProviderManifest(string serverVersion)
-            : base(CreateXmlReaderForResource("NpgsqlProviderManifest.Manifest.xml"))
+            : base(CreateXmlReaderForResource("Npgsql.NpgsqlProviderManifest.Manifest.xml"))
         {
         }
 
@@ -26,11 +26,11 @@ protected override XmlReader GetDbInformation(string informationType)
 
             if (informationType == StoreSchemaDefinition)
             {
-                xmlReader = CreateXmlReaderForResource("NpgsqlSchema.ssdl");
+                xmlReader = CreateXmlReaderForResource("Npgsql.NpgsqlSchema.ssdl");
             }
             else if (informationType == StoreSchemaMapping)
             {
-                xmlReader = CreateXmlReaderForResource("NpgsqlSchema.msl");
+                xmlReader = CreateXmlReaderForResource("Npgsql.NpgsqlSchema.msl");
             }
 
             if (xmlReader == null)

diff --git a/Npgsql/Npgsql/NpgsqlCommand.Rewrite.cs b/Npgsql/Npgsql/NpgsqlCommand.Rewrite.cs
@@ -558,7 +558,8 @@ private enum TokenType
             None,
             Quoted,
             Param,
-            Colon
+            Colon,
+            FullTextMatchOp
         }
 
         /// <summary>
@@ -579,6 +580,7 @@ private void AppendCommandReplacingParameterValues(Stream dest, string src, int
             int currTokenBeg = begin;
             int currTokenLen = 0;
             Dictionary<NpgsqlParameter, int> paramOrdinalMap = null;
+            int end = begin + length;
 
             if (prepare)
             {
@@ -590,7 +592,7 @@ private void AppendCommandReplacingParameterValues(Stream dest, string src, int
                 }
             }
 
-            for (int currCharOfs = begin ; currCharOfs < begin + length ; currCharOfs++)
+            for (int currCharOfs = begin ; currCharOfs < end ; currCharOfs++)
             {
                 char ch = src[currCharOfs];
 
@@ -602,7 +604,7 @@ private void AppendCommandReplacingParameterValues(Stream dest, string src, int
                     case TokenType.None :
                         switch (ch)
                         {
-                            case '\'':
+                            case '\'' :
                                 if (currTokenLen > 0)
                                 {
                                     dest.WriteString(src.Substring(currTokenBeg, currTokenLen));
@@ -615,7 +617,8 @@ private void AppendCommandReplacingParameterValues(Stream dest, string src, int
 
                                 break;
 
-                            case ':':
+                            case ':' :
+                                if (currTokenLen > 0)
                                 {
                                     dest.WriteString(src.Substring(currTokenBeg, currTokenLen));
                                 }
@@ -627,20 +630,21 @@ private void AppendCommandReplacingParameterValues(Stream dest, string src, int
 
                                 break;
 
-                            case '@':
+                            case '<' :
+                            case '@' :
+                                if (currTokenLen > 0)
                                 {
                                     dest.WriteString(src.Substring(currTokenBeg, currTokenLen));
                                 }
 
-                                currTokenType = TokenType.Param;
+                                currTokenType = TokenType.FullTextMatchOp;
 
-                                currTokenBeg = currCharOfs + 1;
-                                currTokenLen = 0;
-                                paramMarker = '@';
+                                currTokenBeg = currCharOfs;
+                                currTokenLen = 1;
 
                                 break;
 
-                            default:
+                            default :
                                 currTokenLen++;
 
                                 break;
@@ -705,12 +709,12 @@ private void AppendCommandReplacingParameterValues(Stream dest, string src, int
                     case TokenType.Quoted :
                         switch (ch)
                         {
-                            case '\'':
+                            case '\'' :
                                 currTokenLen++;
 
                                 break;
 
-                            default:
+                            default :
                                 if (currTokenLen > 1 && lastChar == '\'')
                                 {
                                     dest.WriteString(src.Substring(currTokenBeg, currTokenLen));
@@ -734,40 +738,47 @@ private void AppendCommandReplacingParameterValues(Stream dest, string src, int
                         break;
 
                     case TokenType.Colon :
-                        switch (ch)
+                        if (IsParamNameChar(ch))
                         {
-                            case ':':
-                                currTokenLen++;
-
-                                break;
+                            currTokenType = TokenType.Param;
 
-                            default:
-                                if (currTokenLen == 1)
-                                {
-                                    currTokenType = TokenType.Param;
+                            currTokenBeg = currCharOfs;
+                            currTokenLen = 0;
+                            paramMarker = ':';
 
-                                    currTokenBeg = currCharOfs;
-                                    currTokenLen = 0;
-                                    paramMarker = ':';
-                                }
-                                else
-                                {
-                                    dest.WriteString(src.Substring(currTokenBeg, currTokenLen));
+                            // Re-evaluate this character
+                            goto ProcessCharacter;
+                        }
+                        else
+                        {
+                            // Demote to the unknown token type and continue.
+                            currTokenType = TokenType.None;
+                            currTokenLen++;
+                        }
 
-                                    currTokenType = TokenType.None;
+                        break;
 
-                                    currTokenBeg = currCharOfs;
-                                    currTokenLen = 0;
-                                }
+                    case TokenType.FullTextMatchOp :
+                        if (lastChar == '@' && IsParamNameChar(ch))
+                        {
+                            currTokenType = TokenType.Param;
 
-                                // Re-evaluate this character
-                                goto ProcessCharacter;
+                            currTokenBeg = currCharOfs;
+                            currTokenLen = 0;
+                            paramMarker = '@';
 
+                            // Re-evaluate this character
+                            goto ProcessCharacter;
+                        }
+                        else
+                        {
+                            // Demote to the unknown token type and continue.
+                            currTokenType = TokenType.None;
+                            currTokenLen++;
                         }
 
                         break;
 
-
                 }
 
                 lastChar = ch;

diff --git a/Npgsql/Npgsql/NpgsqlRowDescription.cs b/Npgsql/Npgsql/NpgsqlRowDescription.cs
@@ -32,6 +32,7 @@
 using System.IO;
 using System.Text;
 using NpgsqlTypes;
+using System.Text.RegularExpressions;
 
 namespace Npgsql
 {
@@ -196,12 +197,15 @@ public int TryFieldIndex(string fieldName)
         public int FieldIndex(String fieldName)
         {
             int ret = -1;
-            if(field_name_index_table.TryGetValue(fieldName, out ret) || caseInsensitiveNameIndexTable.TryGetValue(fieldName, out ret))
+
+            if (field_name_index_table.TryGetValue(fieldName, out ret)
+                || caseInsensitiveNameIndexTable.TryGetValue(fieldName, out ret))
                 return ret;
-            else if(_compatVersion < GET_ORDINAL_THROW_EXCEPTION)
+            else if (_compatVersion < GET_ORDINAL_THROW_EXCEPTION)
                 return -1;
             else
                 throw new IndexOutOfRangeException("Field not found");
+
         }
     }
 

diff --git a/tests/App.config b/tests/App.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <configSections>
+    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+  </configSections>
+  <entityFramework>
+    <providers>
+      <provider invariantName="Npgsql" type="Npgsql.NpgsqlServices, Npgsql.EntityFramework" />
+    </providers>
+  </entityFramework>
+  <system.data>
+    <DbProviderFactories>
+      <remove invariant="Npgsql" />
+      <add name="Npgsql Data Provider" invariant="Npgsql" description="Data Provider for PostgreSQL" type="Npgsql.NpgsqlFactory, Npgsql" />
+    </DbProviderFactories>
+  </system.data>
+</configuration>
diff --git a/tests/CommandTests.cs b/tests/CommandTests.cs
@@ -3481,5 +3481,32 @@ public void DataTypeTests()
             Assert.AreEqual(typeof(NpgsqlTimeTZ), result.GetType());
             */
         }
+
+        [Test]
+        // Target NpgsqlCommand.AppendCommandReplacingParameterValues()'s handling of operator @@.
+        public void Operator_At_At_RewriteTest()
+        {
+            NpgsqlCommand cmd = new NpgsqlCommand("SELECT to_tsvector('fat cats ate rats') @@ to_tsquery('cat & rat')", Conn);
+
+            Assert.IsTrue((bool)cmd.ExecuteScalar());
+        }
+
+        [Test]
+        // Target NpgsqlCommand.AppendCommandReplacingParameterValues()'s handling of operator @>.
+        public void Operator_At_GT_RewriteTest()
+        {
+            NpgsqlCommand cmd = new NpgsqlCommand("SELECT 'cat'::tsquery @> 'cat & rat'::tsquery", Conn);
+
+            Assert.IsFalse((bool)cmd.ExecuteScalar());
+        }
+
+        [Test]
+        // Target NpgsqlCommand.AppendCommandReplacingParameterValues()'s handling of operator <@.
+        public void Operator_LT_At_RewriteTest()
+        {
+            NpgsqlCommand cmd = new NpgsqlCommand("SELECT 'cat'::tsquery <@ 'cat & rat'::tsquery", Conn);
+
+            Assert.IsTrue((bool)cmd.ExecuteScalar());
+        }
     }
 }