Allow xmlrow prefix

Author: revk

.gitignore

@@ -1,6 +1,7 @@
 *~
 *.o
 sql
+sqlx
 sqlwrite
 sqledit
 sqlexpand

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "AJL"]
 	path = AJL
 	url = https://github.com/revk/AJL
+[submodule "AXL"]
+	path = AXL
+	url = https://github.com/revk/AXL

AXL

@@ -10,7 +10,7 @@ ifneq ($(wildcard /usr/bin/mariadb_config),)
 endif
 OPTS=-D_GNU_SOURCE --std=gnu99 -g -Wall -funsigned-char -lpopt
 
-all: sqllib.o sqllibsd.o sqlexpand.o sql sqlwrite sqledit sqlexpand
+all: sqllib.o sqllibsd.o sqlexpand.o sql sqlwrite sqledit sqlexpand sqlx
 
 update:
 	git pull
@@ -27,6 +27,12 @@ AJL/ajl.c:
 AJL/ajl.o: AJL/ajl.c AJL
 	make -C AJL ajl.o
 
+AXL/axl.c:
+	git submodule update --init AXL
+
+AXL/axl.o: AXL/axl.c AXL
+	make -C AXL axl.o
+
 sqllib.o: sqllib.c sqllib.h Makefile
 	gcc -g -O -c -o $@ $< -fPIC ${OPTS} -DLIB ${SQLINC} -DMYSQL_VERSION=${SQLVER}
 
@@ -36,6 +42,9 @@ sqllibsd.o: sqllib.c sqllib.h Makefile stringdecimal/stringdecimal.o
 sql: sql.c sqllibsd.o sqllib.h sqlexpand.o sqlexpand.h stringdecimal/stringdecimal.o AJL/ajl.o
 	gcc -g -O -o $@ $< -fPIC ${OPTS} -DNOXML ${SQLINC} ${SQLLIB} sqllibsd.o sqlexpand.o stringdecimal/stringdecimal.o AJL/ajl.o -lcrypto -luuid -IAJL
 
+sqlx: sql.c sqllibsd.o sqllib.h sqlexpand.o sqlexpand.h stringdecimal/stringdecimal.o AJL/ajl.o AXL/axl.o
+	gcc -g -O -o $@ $< -fPIC ${OPTS} ${SQLINC} ${SQLLIB} sqllibsd.o sqlexpand.o stringdecimal/stringdecimal.o AJL/ajl.o AXL/axl.o -lcrypto -luuid -IAJL -IAXL -lcurl
+
 sqlwrite: sqlwrite.c sqllibsd.o sqllib.h stringdecimal/stringdecimal.o
 	gcc -g -O -o $@ $< -fPIC ${OPTS} ${SQLINC} ${SQLLIB} sqllibsd.o stringdecimal/stringdecimal.o
 

Makefile

@@ -145,9 +145,14 @@ dosql (const char *origquery)
 #ifndef		NOJSON
          if (json)
          {
+            j_t a = json;
+#ifndef NOXML
+            if (xmlrow && *xmlrow)
+               a = j_store_array (json, xmlrow);
+#endif
             while ((row = sql_fetch_row (res)))
             {
-               j_t j = j_append_object (json);
+               j_t j = j_append_object (a);
                for (f = 0; f < fields; f++)
                {
                   if (!row[f])