Ghislain Fourny has proposed merging lp:~zorba-coders/zorba/fix-1046415 into lp:zorba.
Requested reviews: Chris Hillery (ceejatec) Matthias Brantner (matthias-brantner) Related bugs: Bug #1046415 in Zorba: "jsoniq: pair name needs to cast to string" https://bugs.launchpad.net/zorba/+bug/1046415 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix-1046415/+merge/123283 Fixes bug 1046415. -- https://code.launchpad.net/~zorba-coders/zorba/fix-1046415/+merge/123283 Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/compiler/translator/translator.cpp' --- src/compiler/translator/translator.cpp 2012-08-31 12:40:20 +0000 +++ src/compiler/translator/translator.cpp 2012-09-07 14:10:24 +0000 @@ -11364,12 +11364,10 @@ nameExpr = wrap_in_atomization(nameExpr); nameExpr = theExprManager-> - create_promote_expr(theRootSctx, - nameExpr->get_loc(), - nameExpr, - GENV_TYPESYSTEM.STRING_TYPE_ONE, - PromoteIterator::JSONIQ_PAIR_NAME, // JNTY0001 - NULL); + create_cast_expr(theRootSctx, + nameExpr->get_loc(), + nameExpr, + GENV_TYPESYSTEM.STRING_TYPE_ONE); valueExpr = theExprManager-> create_treat_expr(theRootSctx, === modified file 'test/rbkt/Queries/zorba/jsoniq/jnty0001-1.spec' --- test/rbkt/Queries/zorba/jsoniq/jnty0001-1.spec 2012-06-19 14:58:25 +0000 +++ test/rbkt/Queries/zorba/jsoniq/jnty0001-1.spec 2012-09-07 14:10:24 +0000 @@ -1,1 +1,1 @@ -Error: http://www.jsoniq.org/errors:JNTY0001 +Error: http://www.w3.org/2005/xqt-errors:XPTY0004 === removed file 'test/rbkt/Queries/zorba/jsoniq/jnty0001-2.spec' --- test/rbkt/Queries/zorba/jsoniq/jnty0001-2.spec 2012-06-19 14:58:25 +0000 +++ test/rbkt/Queries/zorba/jsoniq/jnty0001-2.spec 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -Error: http://www.jsoniq.org/errors:JNTY0001 === removed file 'test/rbkt/Queries/zorba/jsoniq/jnty0001-2.xq' --- test/rbkt/Queries/zorba/jsoniq/jnty0001-2.xq 2012-06-19 14:58:25 +0000 +++ test/rbkt/Queries/zorba/jsoniq/jnty0001-2.xq 1970-01-01 00:00:00 +0000 @@ -1,5 +0,0 @@ -copy $o := { "foo" : "bar" } -modify ( - insert json { 1 : "bar" } into $o -) -return $o \ No newline at end of file
-- Mailing list: https://launchpad.net/~zorba-coders Post to : [email protected] Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
