Fixed issue with named params + null checks

- Took care of issue #10
- Updated docs with camlsql.lookup
- Added changelog to docs

Author: dlid

dist/camlsql.js

@@ -1386,12 +1386,15 @@ var WhereParser = function(whereString, quiet) {
                 if (cmpMatch.toLowerCase() == 'cxqlisnotnull') comparison = "notnull";
                 if (cmpMatch.toLowerCase() == 'in') comparison = "in";
 
-                if (comparison != "cxqlisnull" && comparison != "cxqlisnotnull") {
+                if (comparison != "null" && comparison != "notnull") {
                     _parameters++; 
                     _numMacros++;
                     if (prevMacro == null) 
                         prevMacro = m[3][0];
                     else if (prevMacro != m[3][0]) {
+
+                        console.log("prevMacro", prevMacro, comparison);
+
                         throw "[camlsql] You can not mix named macros and ?";
                         return null;
                     }

dist/camlsql.min.js

@@ -1430,7 +1430,7 @@ var WhereParser = function(whereString, quiet) {
                 if (cmpMatch.toLowerCase() == 'cxqlisnotnull') comparison = "notnull";
                 if (cmpMatch.toLowerCase() == 'in') comparison = "in";
 
-                if (comparison != "cxqlisnull" && comparison != "cxqlisnotnull") {
+                if (comparison != "null" && comparison != "notnull") {
                     _parameters++; 
                     _numMacros++;
                     if (prevMacro == null) 

dist/public_html/js/camlsql.js

@@ -1386,12 +1386,15 @@ var WhereParser = function(whereString, quiet) {
                 if (cmpMatch.toLowerCase() == 'cxqlisnotnull') comparison = "notnull";
                 if (cmpMatch.toLowerCase() == 'in') comparison = "in";
 
-                if (comparison != "cxqlisnull" && comparison != "cxqlisnotnull") {
+                if (comparison != "null" && comparison != "notnull") {
                     _parameters++; 
                     _numMacros++;
                     if (prevMacro == null) 
                         prevMacro = m[3][0];
                     else if (prevMacro != m[3][0]) {
+
+                        console.log("prevMacro", prevMacro, comparison);
+
                         throw "[camlsql] You can not mix named macros and ?";
                         return null;
                     }

dist/public_html/js/camlsql.min.js

@@ -1,6 +1,7 @@
 - [Home](/)
  - [Introduction](introduction.md)
  - [Getting started](getstarted.md)
+ - [Changelog](changelog.md)
 - **Prepare your query**
   - [SQL Syntax](sql.md#sql-syntax) 
   - [Bind Parameters](bind-parameters.md#bind-parameters)

dist/public_html/js/release/camlsql.js

@@ -134,9 +134,58 @@ camlsql.prepare("SELECT * FROM [Pages] WHERE UniqueId = ?",
    </Eq>
   </Where>
  </Query>
-</View>s
+</View>
+```
+
+### lookup method
+
+?> ***object*** camlsql.**lookup**(***string*** value)<br>
+***object*** camlsql.**lookup**(***int*** value)
+
+- Use a `int` parameter to create a lookup by ID setting the LookupId attribute to `true`
+- Use a `string` parameter to create a lookup by value
+
+
+#### LookupId
+
+```
+<script>
+camlsql.prepare("SELECT * FROM List WHERE [MyLookup] = ?", 
+ [camlsql.lookup(5)]);
+</script>
+<View>
+    <Query>
+        <Where>
+            <Eq>
+                <FieldRef Name="MyLookup" LookupId="True" />
+                <Value Type="Lookup" LookupId="True">5</Value>
+            </Eq>
+        </Where>
+    </Query>
+</View>
+```
+
+#### By value
+
 ```
+<script>
+camlsql.prepare("SELECT * FROM List WHERE [MyLookup] = ?", 
+ [camlsql.lookup("hello")]);
+</script>
+<View>
+    <Query>
+        <Where>
+            <Eq>
+                <FieldRef Name="MyLookup" />
+                <Value Type="Lookup">Hello</Value>
+            </Eq>
+        </Where>
+    </Query>
+</View>
+```
+
 
+camlsql.prepare("SELECT * FROM List WHERE [MyLookup] = ?", [camlsql.lookup(5)])
 
 ### membership method
 

dist/public_html/js/release/camlsql.min.js

@@ -0,0 +1,10 @@
+# Changelog
+
+## 0.5.1 
+
+- Added [camlsql.lookup](camlsql-object.md#lookup-method)
+- Fixed issue [#10 Named parameters and NULL / NOT NULL](https://github.com/dlid/camlsql-js/issues/10)
+
+## 0.5.0
+
+- First release

docs/_sidebar.md

@@ -5,7 +5,7 @@ Just want to get started huh? Here's some copy-pastable material for you!
 ## Include the script
 
 ```
-<script src="https://cdn.rawgit.com/dlid/camlsql-js/0.5.0/dist/camlsql.min.js"></script>
+<script src="https://cdn.rawgit.com/dlid/camlsql-js/0.5.1/dist/camlsql.min.js"></script>
 ```
 
 ## Prepare your query