Fixed 'empty string values' in annotations meta-data, added an option…

… to return the SQL generated from a PHQL query object
phalcon · May 31, 2015 · 629161b · 629161b
1 parent 6dec5d1
commit 629161b
Show file tree

Hide file tree

Showing 10 changed files with 681 additions and 554 deletions.
diff --git a/ext/phalcon/annotations/generate b/ext/phalcon/annotations/generate
@@ -8,7 +8,7 @@ fi
 re2c -o scanner.c scanner.re && ./lemon -s parser.lemon && cat base.c >> parser.c
 sed s/"\#line"/"\/\/"/g scanner.c > xx && mv -f xx scanner.c
 sed s/"#line"/"\/\/"/g parser.c > xx && mv -f xx parser.c
-sed s/"#define TOKEN"/"#define ATOKEN"/g parser.c > xx && mv -f xx parser.c
+sed s/"define TOKEN"/"define ATOKEN"/g parser.c > xx && mv -f xx parser.c
 sed s/YY/AA/g scanner.c > xx && mv -f xx scanner.c
 sed s/yy/aa/g scanner.c > xx && mv -f xx scanner.c
 sed s/YY/AA/g parser.c > xx && mv -f xx parser.c

diff --git a/ext/phalcon/mvc/model.zep.c b/ext/phalcon/mvc/model.zep.c
diff --git a/ext/phalcon/mvc/model/metadata/strategy/annotations.zep.c b/ext/phalcon/mvc/model/metadata/strategy/annotations.zep.c