UnQL

Check-in [7797f759da]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:minor fixups to compile with windows compilers
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 7797f759dab2f98f79aa1733ef65be2e02395a79
User & Date: pnr 2011-08-02 11:18:41
Context
2011-08-09
21:44
Added initial support for array-style lhs in the UPDATE command. Assignments that would grow an array are still unimplemented, as is accessing characters of a string using the array syntax. check-in: d5e5efe19b user: pnr tags: trunk
2011-08-02
11:18
minor fixups to compile with windows compilers check-in: 7797f759da user: pnr tags: trunk
2011-07-29
17:06
Add missing file error01.test. check-in: e634279337 user: dan tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/query.c.

294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
      ** GROUP BY, so no need to worry about that either. 
      */
      assert( p->u.simple.pHaving==0 );

      if( p->u.simple.grouped.pPool==0 ){
        JsonNode **apSrc;
        int nSrc;
        int saved = 0;;
        Pool *pPool;

        pPool = p->u.simple.grouped.pPool = xjd1PoolNew();
        if( !pPool ) return XJD1_NOMEM;

        p->u.simple.grouped.nKey = nSrc = xjd1DataSrcCount(p->u.simple.pFrom);
        apSrc = (JsonNode **)xjd1PoolMallocZero(pPool, nSrc*sizeof(JsonNode *));







|







294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
      ** GROUP BY, so no need to worry about that either. 
      */
      assert( p->u.simple.pHaving==0 );

      if( p->u.simple.grouped.pPool==0 ){
        JsonNode **apSrc;
        int nSrc;
        int saved = 0;
        Pool *pPool;

        pPool = p->u.simple.grouped.pPool = xjd1PoolNew();
        if( !pPool ) return XJD1_NOMEM;

        p->u.simple.grouped.nKey = nSrc = xjd1DataSrcCount(p->u.simple.pFrom);
        apSrc = (JsonNode **)xjd1PoolMallocZero(pPool, nSrc*sizeof(JsonNode *));

Changes to src/shell.c.

17
18
19
20
21
22
23
24
25
26



27
28
29
30
31
32
33
** This file contains C code that implements a simple command-line
** wrapper shell around xjd1.
*/
#include "xjd1Int.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <assert.h>





/*
** Remove n elements from argv beginning with the i-th element.
*/
void remove_from_argv(char **argv, int *pArgc, int i, int n){
  int j;
  int argc = *pArgc;







<


>
>
>







17
18
19
20
21
22
23

24
25
26
27
28
29
30
31
32
33
34
35
** This file contains C code that implements a simple command-line
** wrapper shell around xjd1.
*/
#include "xjd1Int.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

#include <assert.h>

#ifndef _WIN32
#include <unistd.h>
#endif

/*
** Remove n elements from argv beginning with the i-th element.
*/
void remove_from_argv(char **argv, int *pArgc, int i, int n){
  int j;
  int argc = *pArgc;