Browse Source

Update docs, changelog, and readme

Timothy J. Warren 2 years ago
parent
commit
b6d9faf008
4 changed files with 74 additions and 141 deletions
  1. 8
    19
      API.md
  2. 5
    1
      CHANGELOG.md
  3. 2
    11
      README.md
  4. 59
    110
      docs/index.html

+ 8
- 19
API.md View File

@@ -61,10 +61,9 @@ Run an arbitrary sql query. Run as a prepared statement.
61 61
 **Parameters**
62 62
 
63 63
 -   `sql` **[string](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** The sql to execute
64
--   `params` **\[[array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)]** The query parameters
65
--   `callback` **\[[function](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/function)]** Optional callback
64
+-   `params` **\[[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)]** The query parameters
66 65
 
67
-Returns **(void | [Promise](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise))** Returns a promise if no callback is supplied
66
+Returns **[Promise](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise)** Promise with result of query
68 67
 
69 68
 ## resetQuery
70 69
 
@@ -79,7 +78,6 @@ Empties the selected database table
79 78
 **Parameters**
80 79
 
81 80
 -   `table` **[string](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** the name of the table to truncate
82
--   `callback` **\[[function](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/function)]** Optional callback
83 81
 
84 82
 Returns **(void | [Promise](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise))** Returns a promise if no callback is supplied
85 83
 
@@ -405,7 +403,6 @@ Get the results of the compiled query
405 403
 -   `table` **\[[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)]** The table to select from
406 404
 -   `limit` **\[[Number](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)]** A limit for the query
407 405
 -   `offset` **\[[Number](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)]** An offset for the query
408
--   `callback` **\[[Function](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/function)]** A callback for receiving the result
409 406
 
410 407
 **Examples**
411 408
 
@@ -414,11 +411,11 @@ query.get('table_name').then(promiseCallback); // Get all the rows in the table
414 411
 ```
415 412
 
416 413
 ```javascript
417
-query.get('table_name', 5, callback); // Get 5 rows from the table
414
+query.get('table_name', 5); // Get 5 rows from the table
418 415
 ```
419 416
 
420 417
 ```javascript
421
-query.get(callback); // Get the results of a query generated with other methods
418
+query.get(); // Get the results of a query generated with other methods
422 419
 ```
423 420
 
424 421
 Returns **(void | [Promise](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise))** If no callback is passed, a promise is returned
@@ -431,9 +428,8 @@ Run the generated insert query
431 428
 
432 429
 -   `table` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** The table to insert into
433 430
 -   `data` **\[[Object](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object)]** Data to insert, if not already added with the 'set' method
434
--   `callback` **\[[Function](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/function)]** Callback for handling response from the database
435 431
 
436
-Returns **(void | [Promise](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise))** If no callback is passed, a promise is returned
432
+Returns **[Promise](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise)** If no callback is passed, a promise is returned
437 433
 
438 434
 ## insertBatch
439 435
 
@@ -443,20 +439,15 @@ Insert multiple sets of rows at a time
443 439
 
444 440
 -   `table` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** The table to insert into
445 441
 -   `data` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)** The array of objects containing data rows to insert
446
--   `callback` **\[[Function](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/function)]** Callback for handling database response
447 442
 
448 443
 **Examples**
449 444
 
450
-```javascript
451
-query.insertBatch('foo',[{id:1,val:'bar'},{id:2,val:'baz'}], callbackFunction);
452
-```
453
-
454 445
 ```javascript
455 446
 query.insertBatch('foo',[{id:1,val:'bar'},{id:2,val:'baz'}])
456 447
 .then(promiseCallback);
457 448
 ```
458 449
 
459
-Returns **(void | [Promise](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise))** If no callback is passed, a promise is returned
450
+Returns **[Promise](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise)** If no callback is passed, a promise is returned
460 451
 
461 452
 ## update
462 453
 
@@ -466,9 +457,8 @@ Run the generated update query
466 457
 
467 458
 -   `table` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** The table to insert into
468 459
 -   `data` **\[[Object](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object)]** Data to insert, if not already added with the 'set' method
469
--   `callback` **\[[Function](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/function)]** Callback for handling response from the database
470 460
 
471
-Returns **(void | [Promise](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise))** If no callback is passed, a promise is returned
461
+Returns **[Promise](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise)** If no callback is passed, a promise is returned
472 462
 
473 463
 ## delete
474 464
 
@@ -478,9 +468,8 @@ Run the generated delete query
478 468
 
479 469
 -   `table` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** The table to insert into
480 470
 -   `where` **\[[Object](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object)]** Where clause for delete statement
481
--   `callback` **\[[Function](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/function)]** Callback for handling response from the database
482 471
 
483
-Returns **(void | [Promise](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise))** If no callback is passed, a promise is returned
472
+Returns **[Promise](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise)** If no callback is passed, a promise is returned
484 473
 
485 474
 ## getCompiledSelect
486 475
 

+ 5
- 1
CHANGELOG.md View File

@@ -1,5 +1,9 @@
1 1
 # Changelog
2 2
 
3
+# 5.0.0
4
+* Re-added firebird as a database
5
+* Replaced all callback interfaces with promises
6
+
3 7
 ## 4.0.0
4 8
 * Changed connection setup to just use a config object - the appropriate adapter object is created by the library.
5 9
 * Removed mysql adapter, as mysql2 is very similar and does proper prepared statements
@@ -11,4 +15,4 @@
11 15
 * Added back tests for `node-firebird` adapter. Using this adapter with promises is not currently supported.
12 16
 
13 17
 ## 3.1.0
14
-* Added support for promises on query execution methods
18
+* Added support for promises on query execution methods

+ 2
- 11
README.md View File

@@ -9,6 +9,7 @@ A node query builder for various SQL databases, based on [CodeIgniter](http://ww
9 9
 
10 10
 ### Supported databases
11 11
 
12
+* Firebird (via `node-firebird`)
12 13
 * Mysql (via `mysql2`)
13 14
 * PostgreSQL (via `pg`)
14 15
 * Sqlite (via `dblite`)
@@ -38,18 +39,8 @@ const nodeQuery = require('ci-node-query')({
38 39
 // Get the query builder
39 40
 const query = nodeQuery.getQuery();
40 41
 
41
-query.select('foo')
42
-	.from('bar')
43
-	.where('x', 3)
44
-	.orWhere({y: 2})
45
-	.join('baz', 'baz.boo = bar.foo', 'left')
46
-	.orderBy('x', 'DESC')
47
-	.limit(2, 3)
48
-	.get(function(err, result) {
49
-		// Handle Results Here
50
-	});
51
-
52 42
 // As of version 3.1.0, you can also get promises
43
+// Version 5.0.0 removes all callback interfaces
53 44
 const queryPromise = query.select('foo')
54 45
 	.from('bar')
55 46
 	.where('x', 3)

+ 59
- 110
docs/index.html View File

@@ -364,10 +364,12 @@
364 364
 
365 365
   
366 366
   <div class='clearfix'>
367
+    
367 368
     <h3 class='fl m0' id='nodequery'>
368 369
       NodeQuery
369 370
     </h3>
370 371
     
372
+    
371 373
   </div>
372 374
   
373 375
 
@@ -464,19 +466,19 @@
464 466
     
465 467
       
466 468
       <pre class='p1 overflow-auto round fill-light'><span class="hljs-keyword">let</span> nodeQuery = <span class="hljs-built_in">require</span>(<span class="hljs-string">'ci-node-query'</span>)({
467
-	driver: <span class="hljs-string">'mysql'</span>,
468
-	connection: {
469
-		host: <span class="hljs-string">'localhost'</span>,
470
-		user: <span class="hljs-string">'root'</span>,
471
-		password: <span class="hljs-string">''</span>,
472
-		database: <span class="hljs-string">'mysql'</span>
469
+	<span class="hljs-attr">driver</span>: <span class="hljs-string">'mysql'</span>,
470
+	<span class="hljs-attr">connection</span>: {
471
+		<span class="hljs-attr">host</span>: <span class="hljs-string">'localhost'</span>,
472
+		<span class="hljs-attr">user</span>: <span class="hljs-string">'root'</span>,
473
+		<span class="hljs-attr">password</span>: <span class="hljs-string">''</span>,
474
+		<span class="hljs-attr">database</span>: <span class="hljs-string">'mysql'</span>
473 475
 	}
474 476
 });</pre>
475 477
     
476 478
       
477 479
       <pre class='p1 overflow-auto round fill-light'><span class="hljs-keyword">let</span> nodeQuery = <span class="hljs-built_in">require</span>(<span class="hljs-string">'ci-node-query'</span>)({
478
-	driver: <span class="hljs-string">'sqlite'</span>,
479
-	connection: <span class="hljs-string">':memory:'</span>
480
+	<span class="hljs-attr">driver</span>: <span class="hljs-string">'sqlite'</span>,
481
+	<span class="hljs-attr">connection</span>: <span class="hljs-string">':memory:'</span>
480 482
 });</pre>
481 483
     
482 484
   
@@ -558,10 +560,12 @@
558 560
 
559 561
   
560 562
   <div class='clearfix'>
563
+    
561 564
     <h3 class='fl m0' id='querybuilder'>
562 565
       QueryBuilder
563 566
     </h3>
564 567
     
568
+    
565 569
   </div>
566 570
   
567 571
 
@@ -626,7 +630,7 @@
626 630
       <div class="clearfix small pointer toggle-sibling">
627 631
         <div class="py1 contain">
628 632
             <a class='icon pin-right py1 dark-link caret-right'>▸</a>
629
-            <span class='code strong strong truncate'>query(sql, [params], [callback])</span>
633
+            <span class='code strong strong truncate'>query(sql, [params])</span>
630 634
         </div>
631 635
       </div>
632 636
       <div class="clearfix display-none toggle-target">
@@ -637,7 +641,7 @@
637 641
   <p>Run an arbitrary sql query. Run as a prepared statement.</p>
638 642
 
639 643
 
640
-  <div class='pre p1 fill-light mt0'>query(sql: <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">string</a>, params: [<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array">array</a>], callback: [<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/function">function</a>]): (void | <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise">Promise</a>)</div>
644
+  <div class='pre p1 fill-light mt0'>query(sql: <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">string</a>, params: [<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array">Array</a>]): <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise">Promise</a></div>
641 645
 
642 646
   
643 647
 
@@ -661,15 +665,7 @@
661 665
       
662 666
         <div class='space-bottom0'>
663 667
           <div>
664
-            <span class='code bold'>params</span> <code class='quiet'>([<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array">array</a>])</code> The query parameters
665
-
666
-          </div>
667
-          
668
-        </div>
669
-      
670
-        <div class='space-bottom0'>
671
-          <div>
672
-            <span class='code bold'>callback</span> <code class='quiet'>([<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/function">function</a>])</code> Optional callback
668
+            <span class='code bold'>params</span> <code class='quiet'>([<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array">Array</a>])</code> The query parameters
673 669
 
674 670
           </div>
675 671
           
@@ -683,8 +679,8 @@
683 679
   
684 680
     
685 681
       <div class='py1 quiet mt1 prose-big'>Returns</div>
686
-      <code>(void | <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise">Promise</a>)</code>:
687
-        Returns a promise if no callback is supplied
682
+      <code><a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise">Promise</a></code>:
683
+        Promise with result of query
688 684
 
689 685
       
690 686
     
@@ -738,6 +734,7 @@
738 734
       <div class='py1 quiet mt1 prose-big'>Returns</div>
739 735
       <code>void</code>:
740 736
         
737
+
741 738
       
742 739
     
743 740
   
@@ -760,7 +757,7 @@
760 757
       <div class="clearfix small pointer toggle-sibling">
761 758
         <div class="py1 contain">
762 759
             <a class='icon pin-right py1 dark-link caret-right'>▸</a>
763
-            <span class='code strong strong truncate'>truncate(table, [callback])</span>
760
+            <span class='code strong strong truncate'>truncate(table)</span>
764 761
         </div>
765 762
       </div>
766 763
       <div class="clearfix display-none toggle-target">
@@ -771,7 +768,7 @@
771 768
   <p>Empties the selected database table</p>
772 769
 
773 770
 
774
-  <div class='pre p1 fill-light mt0'>truncate(table: <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">string</a>, callback: [<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/function">function</a>]): (void | <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise">Promise</a>)</div>
771
+  <div class='pre p1 fill-light mt0'>truncate(table: <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">string</a>): (void | <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise">Promise</a>)</div>
775 772
 
776 773
   
777 774
 
@@ -793,14 +790,6 @@
793 790
           
794 791
         </div>
795 792
       
796
-        <div class='space-bottom0'>
797
-          <div>
798
-            <span class='code bold'>callback</span> <code class='quiet'>([<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/function">function</a>])</code> Optional callback
799
-
800
-          </div>
801
-          
802
-        </div>
803
-      
804 793
     </div>
805 794
   
806 795
 
@@ -864,6 +853,7 @@
864 853
       <div class='py1 quiet mt1 prose-big'>Returns</div>
865 854
       <code>void</code>:
866 855
         
856
+
867 857
       
868 858
     
869 859
   
@@ -1044,7 +1034,7 @@
1044 1034
 
1045 1035
   
1046 1036
 
1047
-  <p>Add a &#x27;like/ and like&#x27; clause to the query</p>
1037
+  <p>Add a 'like/ and like' clause to the query</p>
1048 1038
 
1049 1039
 
1050 1040
   <div class='pre p1 fill-light mt0'>like(field: <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">String</a>, val: <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">String</a>, pos: [<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">String</a>]): <a href="#querybuilder">QueryBuilder</a></div>
@@ -1128,7 +1118,7 @@
1128 1118
 
1129 1119
   
1130 1120
 
1131
-  <p>Add a &#x27;not like/ and not like&#x27; clause to the query</p>
1121
+  <p>Add a 'not like/ and not like' clause to the query</p>
1132 1122
 
1133 1123
 
1134 1124
   <div class='pre p1 fill-light mt0'>notLike(field: <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">String</a>, val: <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">String</a>, pos: [<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">String</a>]): <a href="#querybuilder">QueryBuilder</a></div>
@@ -1212,7 +1202,7 @@
1212 1202
 
1213 1203
   
1214 1204
 
1215
-  <p>Add an &#x27;or like&#x27; clause to the query</p>
1205
+  <p>Add an 'or like' clause to the query</p>
1216 1206
 
1217 1207
 
1218 1208
   <div class='pre p1 fill-light mt0'>orLike(field: <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">String</a>, val: <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">String</a>, pos: [<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">String</a>]): <a href="#querybuilder">QueryBuilder</a></div>
@@ -1296,7 +1286,7 @@
1296 1286
 
1297 1287
   
1298 1288
 
1299
-  <p>Add an &#x27;or not like&#x27; clause to the query</p>
1289
+  <p>Add an 'or not like' clause to the query</p>
1300 1290
 
1301 1291
 
1302 1292
   <div class='pre p1 fill-light mt0'>orNotLike(field: <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">String</a>, val: <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">String</a>, pos: [<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">String</a>]): <a href="#querybuilder">QueryBuilder</a></div>
@@ -1380,7 +1370,7 @@
1380 1370
 
1381 1371
   
1382 1372
 
1383
-  <p>Add a &#x27;having&#x27; clause</p>
1373
+  <p>Add a 'having' clause</p>
1384 1374
 
1385 1375
 
1386 1376
   <div class='pre p1 fill-light mt0'>having(key: (<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">String</a> | <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object">Object</a>), val: [(<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">String</a> | <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number">Number</a>)]): <a href="#querybuilder">QueryBuilder</a></div>
@@ -1454,7 +1444,7 @@
1454 1444
 
1455 1445
   
1456 1446
 
1457
-  <p>Add an &#x27;or having&#x27; clause</p>
1447
+  <p>Add an 'or having' clause</p>
1458 1448
 
1459 1449
 
1460 1450
   <div class='pre p1 fill-light mt0'>orHaving(key: (<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">String</a> | <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object">Object</a>), val: [(<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">String</a> | <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number">Number</a>)]): <a href="#querybuilder">QueryBuilder</a></div>
@@ -1528,7 +1518,7 @@
1528 1518
 
1529 1519
   
1530 1520
 
1531
-  <p>Set a &#x27;where&#x27; clause</p>
1521
+  <p>Set a 'where' clause</p>
1532 1522
 
1533 1523
 
1534 1524
   <div class='pre p1 fill-light mt0'>where(key: (<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">String</a> | <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object">Object</a>), val: [(<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">String</a> | <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number">Number</a>)]): <a href="#querybuilder">QueryBuilder</a></div>
@@ -1602,7 +1592,7 @@
1602 1592
 
1603 1593
   
1604 1594
 
1605
-  <p>Set a &#x27;or where&#x27; clause</p>
1595
+  <p>Set a 'or where' clause</p>
1606 1596
 
1607 1597
 
1608 1598
   <div class='pre p1 fill-light mt0'>orWhere(key: (<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">String</a> | <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object">Object</a>), val: [(<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">String</a> | <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number">Number</a>)]): <a href="#querybuilder">QueryBuilder</a></div>
@@ -1808,7 +1798,7 @@
1808 1798
 
1809 1799
   
1810 1800
 
1811
-  <p>Field is null prefixed with &#x27;OR&#x27;</p>
1801
+  <p>Field is null prefixed with 'OR'</p>
1812 1802
 
1813 1803
 
1814 1804
   <div class='pre p1 fill-light mt0'>orWhereIsNull(field: <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">String</a>): <a href="#querybuilder">QueryBuilder</a></div>
@@ -1874,7 +1864,7 @@
1874 1864
 
1875 1865
   
1876 1866
 
1877
-  <p>Field is not null prefixed with &#x27;OR&#x27;</p>
1867
+  <p>Field is not null prefixed with 'OR'</p>
1878 1868
 
1879 1869
 
1880 1870
   <div class='pre p1 fill-light mt0'>orWhereIsNotNull(field: <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">String</a>): <a href="#querybuilder">QueryBuilder</a></div>
@@ -1940,7 +1930,7 @@
1940 1930
 
1941 1931
   
1942 1932
 
1943
-  <p>Set a &#x27;where in&#x27; clause</p>
1933
+  <p>Set a 'where in' clause</p>
1944 1934
 
1945 1935
 
1946 1936
   <div class='pre p1 fill-light mt0'>whereIn(key: <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">String</a>, values: <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array">Array</a>): <a href="#querybuilder">QueryBuilder</a></div>
@@ -2014,7 +2004,7 @@
2014 2004
 
2015 2005
   
2016 2006
 
2017
-  <p>Set a &#x27;or where in&#x27; clause</p>
2007
+  <p>Set a 'or where in' clause</p>
2018 2008
 
2019 2009
 
2020 2010
   <div class='pre p1 fill-light mt0'>orWhereIn(key: <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">String</a>, values: <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array">Array</a>): <a href="#querybuilder">QueryBuilder</a></div>
@@ -2088,7 +2078,7 @@
2088 2078
 
2089 2079
   
2090 2080
 
2091
-  <p>Set a &#x27;where not in&#x27; clause</p>
2081
+  <p>Set a 'where not in' clause</p>
2092 2082
 
2093 2083
 
2094 2084
   <div class='pre p1 fill-light mt0'>whereNotIn(key: <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">String</a>, values: <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array">Array</a>): <a href="#querybuilder">QueryBuilder</a></div>
@@ -2162,7 +2152,7 @@
2162 2152
 
2163 2153
   
2164 2154
 
2165
-  <p>Set a &#x27;or where not in&#x27; clause</p>
2155
+  <p>Set a 'or where not in' clause</p>
2166 2156
 
2167 2157
 
2168 2158
   <div class='pre p1 fill-light mt0'>orWhereNotIn(key: <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">String</a>, values: <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array">Array</a>): <a href="#querybuilder">QueryBuilder</a></div>
@@ -2293,7 +2283,7 @@
2293 2283
       <pre class='p1 overflow-auto round fill-light'>query.set(<span class="hljs-string">'foo'</span>, <span class="hljs-string">'bar'</span>); <span class="hljs-comment">// Set a key, value pair</span></pre>
2294 2284
     
2295 2285
       
2296
-      <pre class='p1 overflow-auto round fill-light'>query.set({foo:<span class="hljs-string">'bar'</span>}); <span class="hljs-comment">// Set with an object</span></pre>
2286
+      <pre class='p1 overflow-auto round fill-light'>query.set({<span class="hljs-attr">foo</span>:<span class="hljs-string">'bar'</span>}); <span class="hljs-comment">// Set with an object</span></pre>
2297 2287
     
2298 2288
   
2299 2289
 
@@ -2673,7 +2663,7 @@
2673 2663
   
2674 2664
 
2675 2665
   <p>Adds an open paren to the current query for logical grouping,
2676
-prefixed with &#x27;OR&#x27;</p>
2666
+prefixed with 'OR'</p>
2677 2667
 
2678 2668
 
2679 2669
   <div class='pre p1 fill-light mt0'>orGroupStart(): <a href="#querybuilder">QueryBuilder</a></div>
@@ -2727,7 +2717,7 @@ prefixed with &#x27;OR&#x27;</p>
2727 2717
   
2728 2718
 
2729 2719
   <p>Adds an open paren to the current query for logical grouping,
2730
-prefixed with &#x27;OR NOT&#x27;</p>
2720
+prefixed with 'OR NOT'</p>
2731 2721
 
2732 2722
 
2733 2723
   <div class='pre p1 fill-light mt0'>orNotGroupStart(): <a href="#querybuilder">QueryBuilder</a></div>
@@ -2825,7 +2815,7 @@ prefixed with &#x27;OR NOT&#x27;</p>
2825 2815
       <div class="clearfix small pointer toggle-sibling">
2826 2816
         <div class="py1 contain">
2827 2817
             <a class='icon pin-right py1 dark-link caret-right'>▸</a>
2828
-            <span class='code strong strong truncate'>get([table], [limit], [offset], [callback])</span>
2818
+            <span class='code strong strong truncate'>get([table], [limit], [offset])</span>
2829 2819
         </div>
2830 2820
       </div>
2831 2821
       <div class="clearfix display-none toggle-target">
@@ -2836,7 +2826,7 @@ prefixed with &#x27;OR NOT&#x27;</p>
2836 2826
   <p>Get the results of the compiled query</p>
2837 2827
 
2838 2828
 
2839
-  <div class='pre p1 fill-light mt0'>get(table: [<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">String</a>], limit: [<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number">Number</a>], offset: [<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number">Number</a>], callback: [<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/function">Function</a>]): (void | <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise">Promise</a>)</div>
2829
+  <div class='pre p1 fill-light mt0'>get(table: [<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">String</a>], limit: [<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number">Number</a>], offset: [<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number">Number</a>]): (void | <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise">Promise</a>)</div>
2840 2830
 
2841 2831
   
2842 2832
 
@@ -2874,14 +2864,6 @@ prefixed with &#x27;OR NOT&#x27;</p>
2874 2864
           
2875 2865
         </div>
2876 2866
       
2877
-        <div class='space-bottom0'>
2878
-          <div>
2879
-            <span class='code bold'>callback</span> <code class='quiet'>([<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/function">Function</a>])</code> A callback for receiving the result
2880
-
2881
-          </div>
2882
-          
2883
-        </div>
2884
-      
2885 2867
     </div>
2886 2868
   
2887 2869
 
@@ -2906,10 +2888,10 @@ prefixed with &#x27;OR NOT&#x27;</p>
2906 2888
       <pre class='p1 overflow-auto round fill-light'>query.get(<span class="hljs-string">'table_name'</span>).then(promiseCallback); <span class="hljs-comment">// Get all the rows in the table</span></pre>
2907 2889
     
2908 2890
       
2909
-      <pre class='p1 overflow-auto round fill-light'>query.get(<span class="hljs-string">'table_name'</span>, <span class="hljs-number">5</span>, callback); <span class="hljs-comment">// Get 5 rows from the table</span></pre>
2891
+      <pre class='p1 overflow-auto round fill-light'>query.get(<span class="hljs-string">'table_name'</span>, <span class="hljs-number">5</span>); <span class="hljs-comment">// Get 5 rows from the table</span></pre>
2910 2892
     
2911 2893
       
2912
-      <pre class='p1 overflow-auto round fill-light'>query.get(callback); <span class="hljs-comment">// Get the results of a query generated with other methods</span></pre>
2894
+      <pre class='p1 overflow-auto round fill-light'>query.get(); <span class="hljs-comment">// Get the results of a query generated with other methods</span></pre>
2913 2895
     
2914 2896
   
2915 2897
 
@@ -2927,7 +2909,7 @@ prefixed with &#x27;OR NOT&#x27;</p>
2927 2909
       <div class="clearfix small pointer toggle-sibling">
2928 2910
         <div class="py1 contain">
2929 2911
             <a class='icon pin-right py1 dark-link caret-right'>▸</a>
2930
-            <span class='code strong strong truncate'>insert(table, [data], [callback])</span>
2912
+            <span class='code strong strong truncate'>insert(table, [data])</span>
2931 2913
         </div>
2932 2914
       </div>
2933 2915
       <div class="clearfix display-none toggle-target">
@@ -2938,7 +2920,7 @@ prefixed with &#x27;OR NOT&#x27;</p>
2938 2920
   <p>Run the generated insert query</p>
2939 2921
 
2940 2922
 
2941
-  <div class='pre p1 fill-light mt0'>insert(table: <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">String</a>, data: [<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object">Object</a>], callback: [<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/function">Function</a>]): (void | <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise">Promise</a>)</div>
2923
+  <div class='pre p1 fill-light mt0'>insert(table: <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">String</a>, data: [<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object">Object</a>]): <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise">Promise</a></div>
2942 2924
 
2943 2925
   
2944 2926
 
@@ -2962,15 +2944,7 @@ prefixed with &#x27;OR NOT&#x27;</p>
2962 2944
       
2963 2945
         <div class='space-bottom0'>
2964 2946
           <div>
2965
-            <span class='code bold'>data</span> <code class='quiet'>([<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object">Object</a>])</code> Data to insert, if not already added with the &#x27;set&#x27; method
2966
-
2967
-          </div>
2968
-          
2969
-        </div>
2970
-      
2971
-        <div class='space-bottom0'>
2972
-          <div>
2973
-            <span class='code bold'>callback</span> <code class='quiet'>([<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/function">Function</a>])</code> Callback for handling response from the database
2947
+            <span class='code bold'>data</span> <code class='quiet'>([<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object">Object</a>])</code> Data to insert, if not already added with the 'set' method
2974 2948
 
2975 2949
           </div>
2976 2950
           
@@ -2984,7 +2958,7 @@ prefixed with &#x27;OR NOT&#x27;</p>
2984 2958
   
2985 2959
     
2986 2960
       <div class='py1 quiet mt1 prose-big'>Returns</div>
2987
-      <code>(void | <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise">Promise</a>)</code>:
2961
+      <code><a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise">Promise</a></code>:
2988 2962
         If no callback is passed, a promise is returned
2989 2963
 
2990 2964
       
@@ -3009,7 +2983,7 @@ prefixed with &#x27;OR NOT&#x27;</p>
3009 2983
       <div class="clearfix small pointer toggle-sibling">
3010 2984
         <div class="py1 contain">
3011 2985
             <a class='icon pin-right py1 dark-link caret-right'>▸</a>
3012
-            <span class='code strong strong truncate'>insertBatch(table, data, [callback])</span>
2986
+            <span class='code strong strong truncate'>insertBatch(table, data)</span>
3013 2987
         </div>
3014 2988
       </div>
3015 2989
       <div class="clearfix display-none toggle-target">
@@ -3020,7 +2994,7 @@ prefixed with &#x27;OR NOT&#x27;</p>
3020 2994
   <p>Insert multiple sets of rows at a time</p>
3021 2995
 
3022 2996
 
3023
-  <div class='pre p1 fill-light mt0'>insertBatch(table: <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">String</a>, data: <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array">Array</a>, callback: [<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/function">Function</a>]): (void | <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise">Promise</a>)</div>
2997
+  <div class='pre p1 fill-light mt0'>insertBatch(table: <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">String</a>, data: <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array">Array</a>): <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise">Promise</a></div>
3024 2998
 
3025 2999
   
3026 3000
 
@@ -3050,14 +3024,6 @@ prefixed with &#x27;OR NOT&#x27;</p>
3050 3024
           
3051 3025
         </div>
3052 3026
       
3053
-        <div class='space-bottom0'>
3054
-          <div>
3055
-            <span class='code bold'>callback</span> <code class='quiet'>([<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/function">Function</a>])</code> Callback for handling database response
3056
-
3057
-          </div>
3058
-          
3059
-        </div>
3060
-      
3061 3027
     </div>
3062 3028
   
3063 3029
 
@@ -3066,7 +3032,7 @@ prefixed with &#x27;OR NOT&#x27;</p>
3066 3032
   
3067 3033
     
3068 3034
       <div class='py1 quiet mt1 prose-big'>Returns</div>
3069
-      <code>(void | <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise">Promise</a>)</code>:
3035
+      <code><a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise">Promise</a></code>:
3070 3036
         If no callback is passed, a promise is returned
3071 3037
 
3072 3038
       
@@ -3079,10 +3045,7 @@ prefixed with &#x27;OR NOT&#x27;</p>
3079 3045
     <div class='py1 quiet mt1 prose-big'>Example</div>
3080 3046
     
3081 3047
       
3082
-      <pre class='p1 overflow-auto round fill-light'>query.insertBatch(<span class="hljs-string">'foo'</span>,[{id:<span class="hljs-number">1</span>,val:<span class="hljs-string">'bar'</span>},{id:<span class="hljs-number">2</span>,val:<span class="hljs-string">'baz'</span>}], callbackFunction);</pre>
3083
-    
3084
-      
3085
-      <pre class='p1 overflow-auto round fill-light'>query.insertBatch(<span class="hljs-string">'foo'</span>,[{id:<span class="hljs-number">1</span>,val:<span class="hljs-string">'bar'</span>},{id:<span class="hljs-number">2</span>,val:<span class="hljs-string">'baz'</span>}])
3048
+      <pre class='p1 overflow-auto round fill-light'>query.insertBatch(<span class="hljs-string">'foo'</span>,[{<span class="hljs-attr">id</span>:<span class="hljs-number">1</span>,<span class="hljs-attr">val</span>:<span class="hljs-string">'bar'</span>},{<span class="hljs-attr">id</span>:<span class="hljs-number">2</span>,<span class="hljs-attr">val</span>:<span class="hljs-string">'baz'</span>}])
3086 3049
 .then(promiseCallback);</pre>
3087 3050
     
3088 3051
   
@@ -3101,7 +3064,7 @@ prefixed with &#x27;OR NOT&#x27;</p>
3101 3064
       <div class="clearfix small pointer toggle-sibling">
3102 3065
         <div class="py1 contain">
3103 3066
             <a class='icon pin-right py1 dark-link caret-right'>▸</a>
3104
-            <span class='code strong strong truncate'>update(table, [data], [callback])</span>
3067
+            <span class='code strong strong truncate'>update(table, [data])</span>
3105 3068
         </div>
3106 3069
       </div>
3107 3070
       <div class="clearfix display-none toggle-target">
@@ -3112,7 +3075,7 @@ prefixed with &#x27;OR NOT&#x27;</p>
3112 3075
   <p>Run the generated update query</p>
3113 3076
 
3114 3077
 
3115
-  <div class='pre p1 fill-light mt0'>update(table: <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">String</a>, data: [<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object">Object</a>], callback: [<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/function">Function</a>]): (void | <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise">Promise</a>)</div>
3078
+  <div class='pre p1 fill-light mt0'>update(table: <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">String</a>, data: [<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object">Object</a>]): <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise">Promise</a></div>
3116 3079
 
3117 3080
   
3118 3081
 
@@ -3136,15 +3099,7 @@ prefixed with &#x27;OR NOT&#x27;</p>
3136 3099
       
3137 3100
         <div class='space-bottom0'>
3138 3101
           <div>
3139
-            <span class='code bold'>data</span> <code class='quiet'>([<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object">Object</a>])</code> Data to insert, if not already added with the &#x27;set&#x27; method
3140
-
3141
-          </div>
3142
-          
3143
-        </div>
3144
-      
3145
-        <div class='space-bottom0'>
3146
-          <div>
3147
-            <span class='code bold'>callback</span> <code class='quiet'>([<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/function">Function</a>])</code> Callback for handling response from the database
3102
+            <span class='code bold'>data</span> <code class='quiet'>([<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object">Object</a>])</code> Data to insert, if not already added with the 'set' method
3148 3103
 
3149 3104
           </div>
3150 3105
           
@@ -3158,7 +3113,7 @@ prefixed with &#x27;OR NOT&#x27;</p>
3158 3113
   
3159 3114
     
3160 3115
       <div class='py1 quiet mt1 prose-big'>Returns</div>
3161
-      <code>(void | <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise">Promise</a>)</code>:
3116
+      <code><a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise">Promise</a></code>:
3162 3117
         If no callback is passed, a promise is returned
3163 3118
 
3164 3119
       
@@ -3183,7 +3138,7 @@ prefixed with &#x27;OR NOT&#x27;</p>
3183 3138
       <div class="clearfix small pointer toggle-sibling">
3184 3139
         <div class="py1 contain">
3185 3140
             <a class='icon pin-right py1 dark-link caret-right'>▸</a>
3186
-            <span class='code strong strong truncate'>delete(table, [where], [callback])</span>
3141
+            <span class='code strong strong truncate'>delete(table, [where])</span>
3187 3142
         </div>
3188 3143
       </div>
3189 3144
       <div class="clearfix display-none toggle-target">
@@ -3194,7 +3149,7 @@ prefixed with &#x27;OR NOT&#x27;</p>
3194 3149
   <p>Run the generated delete query</p>
3195 3150
 
3196 3151
 
3197
-  <div class='pre p1 fill-light mt0'>delete(table: <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">String</a>, where: [<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object">Object</a>], callback: [<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/function">Function</a>]): (void | <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise">Promise</a>)</div>
3152
+  <div class='pre p1 fill-light mt0'>delete(table: <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String">String</a>, where: [<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object">Object</a>]): <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise">Promise</a></div>
3198 3153
 
3199 3154
   
3200 3155
 
@@ -3224,14 +3179,6 @@ prefixed with &#x27;OR NOT&#x27;</p>
3224 3179
           
3225 3180
         </div>
3226 3181
       
3227
-        <div class='space-bottom0'>
3228
-          <div>
3229
-            <span class='code bold'>callback</span> <code class='quiet'>([<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/function">Function</a>])</code> Callback for handling response from the database
3230
-
3231
-          </div>
3232
-          
3233
-        </div>
3234
-      
3235 3182
     </div>
3236 3183
   
3237 3184
 
@@ -3240,7 +3187,7 @@ prefixed with &#x27;OR NOT&#x27;</p>
3240 3187
   
3241 3188
     
3242 3189
       <div class='py1 quiet mt1 prose-big'>Returns</div>
3243
-      <code>(void | <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise">Promise</a>)</code>:
3190
+      <code><a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise">Promise</a></code>:
3244 3191
         If no callback is passed, a promise is returned
3245 3192
 
3246 3193
       
@@ -3579,10 +3526,12 @@ prefixed with &#x27;OR NOT&#x27;</p>
3579 3526
 
3580 3527
   
3581 3528
   <div class='clearfix'>
3529
+    
3582 3530
     <h3 class='fl m0' id='result'>
3583 3531
       Result
3584 3532
     </h3>
3585 3533
     
3534
+    
3586 3535
   </div>
3587 3536
   
3588 3537