From: adam <adamansky@gmail.com>
Date: Tue, 25 Jun 2013 06:21:59 +0000 (+0700)
Subject: nejdb bugfix
X-Git-Tag: v1.2.12~276^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=48f53c36cdb0306889ede168daca23fec002dc53;p=platform%2Fupstream%2Fejdb.git

nejdb bugfix
---

diff --git a/nejdb/Ejdb.BSON/BSONIterator.cs b/nejdb/Ejdb.BSON/BSONIterator.cs
index 68c69f8..ac5ee26 100644
--- a/nejdb/Ejdb.BSON/BSONIterator.cs
+++ b/nejdb/Ejdb.BSON/BSONIterator.cs
@@ -255,7 +255,8 @@ namespace Ejdb.BSON {
 						Debug.Assert(_entryLen - 1 >= 0);						
 						string sv = Encoding.UTF8.GetString(_input.ReadBytes(_entryLen - 1)); 
 						_entryDataValue = new BSONValue(_ctype, _entryKey, sv);
-						Debug.Assert(_input.ReadByte() == 0x00); //trailing zero byte
+						var rb = _input.ReadByte();
+						Debug.Assert(rb == 0x00); //trailing zero byte
 						break;
 					}
 				case BSONType.BOOL:
diff --git a/nejdb/nejdb.csproj b/nejdb/nejdb.csproj
index 07bb306..01b6cb0 100644
--- a/nejdb/nejdb.csproj
+++ b/nejdb/nejdb.csproj
@@ -24,13 +24,11 @@
     <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseUnix|AnyCPU' ">
-    <DebugType>none</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
-    <DefineConstants>DEBUG;</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWindows|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -49,7 +47,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
-    <DefineConstants>DEBUG;EJDBDLL;</DefineConstants>
+    <DefineConstants>EJDBDLL;</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/nejdb/nejdb.userprefs b/nejdb/nejdb.userprefs
index 8634846..9da185b 100644
--- a/nejdb/nejdb.userprefs
+++ b/nejdb/nejdb.userprefs
@@ -1,11 +1,13 @@
 <Properties>
   <MonoDevelop.Ide.Workspace ActiveConfiguration="ReleaseUnix" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="Ejdb.Tests/TestEJDB.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="Ejdb.BSON/BSONIterator.cs">
     <Files>
-      <File FileName="Ejdb.Tests/TestEJDB.cs" Line="153" Column="36" />
-      <File FileName="Ejdb.Tests/TestBSON.cs" Line="279" Column="31" />
-      <File FileName="Ejdb.DB/EJDB.cs" Line="5" Column="10" />
-      <File FileName="Ejdb.BSON/BSONDocument.cs" Line="279" Column="68" />
+      <File FileName="Ejdb.Tests/TestEJDB.cs" Line="155" Column="30" />
+      <File FileName="Ejdb.Tests/TestBSON.cs" Line="1" Column="1" />
+      <File FileName="Ejdb.BSON/BSONDocument.cs" Line="129" Column="1" />
+      <File FileName="Ejdb.DB/EJDB.cs" Line="133" Column="16" />
+      <File FileName="Ejdb.BSON/BSONIterator.cs" Line="230" Column="18" />
+      <File FileName="Ejdb.DB/EJDBQuery.cs" Line="158" Column="3" />
     </Files>
     <Pads>
       <Pad Id="ProjectPad">
@@ -23,12 +25,7 @@
         <State expanded="True" selected="True" />
       </Pad>
       <Pad Id="MonoDevelop.Debugger.WatchPad">
-        <State>
-          <Value>it.CurrentKey</Value>
-          <Value>fields</Value>
-          <Value>fields[i]</Value>
-          <Value>nfc</Value>
-        </State>
+        <State />
       </Pad>
       <Pad Id="ConnectionManagerPad">
         <State selected="True" />
@@ -38,7 +35,6 @@
           <Node name="nejdb" expanded="True">
             <Node name="Ejdb" expanded="True">
               <Node name="Tests" expanded="True">
-                <Node name="TestBSON" expanded="True" />
                 <Node name="TestEJDB" expanded="True" />
               </Node>
             </Node>
@@ -50,6 +46,8 @@
   <MonoDevelop.Ide.DebuggingService.Breakpoints>
     <BreakpointStore>
       <Breakpoint file="/home/adam/Projects/softmotions/ejdb/nejdb/Ejdb.Tests/TestBSON.cs" line="279" column="1" />
+      <Breakpoint file="/home/adam/Projects/softmotions/ejdb/nejdb/Ejdb.Tests/TestEJDB.cs" line="155" column="34" />
+      <Breakpoint file="/home/adam/Projects/softmotions/ejdb/nejdb/Ejdb.BSON/BSONIterator.cs" line="154" column="1" />
     </BreakpointStore>
   </MonoDevelop.Ide.DebuggingService.Breakpoints>
   <MonoDevelop.Ide.DebuggingService.PinnedWatches />
diff --git a/tcejdb/ejdb.c b/tcejdb/ejdb.c
index 71a88bd..b53c9e8 100644
--- a/tcejdb/ejdb.c
+++ b/tcejdb/ejdb.c
@@ -147,7 +147,7 @@ const char* ejdberrmsg(int ecode) {
         case JBEINVALIDCOLNAME: return "invalid collection name";
         case JBEINVALIDBSON: return "invalid bson object";
         case JBEQINVALIDQCONTROL: return "invalid query control field starting with '$'";
-        case JBEQINOPNOTARRAY: return "$strand, $stror, $in, $nin, $bt keys requires not empty array value";
+        case JBEQINOPNOTARRAY: return "$strand, $stror, $in, $nin, $bt keys require not empty array value";
         case JBEMETANVALID: return "inconsistent database metadata";
         case JBEFPATHINVALID: return "invalid JSEJDB_EXPORT const char *ejdbversion();ON field path value";
         case JBEQINVALIDQRX: return "invalid query regexp value";