changed outer join syntax because the previous one didn't work
git-svn-id: http://galileo.dmi.unict.it/svn/relational/trunk@19 014f5005-505e-4b48-8d0a-63407b615a7c
This commit is contained in:
parent
889c333058
commit
b61625f10d
10
parser.py
10
parser.py
@ -21,7 +21,7 @@ def parse(expr):
|
|||||||
executable by eval function to get the result of the expression.
|
executable by eval function to get the result of the expression.
|
||||||
It has 2 class of operators:
|
It has 2 class of operators:
|
||||||
without parameters
|
without parameters
|
||||||
*, -, ᑌ, ᑎ, ᐅᐊ, ᐅᐊLEFT, ᐅᐊRIGHT, ᐅᐊFULL
|
*, -, ᑌ, ᑎ, ᐅᐊ, ᐅLEFTᐊ, ᐅRIGHTᐊ, ᐅFULLᐊ
|
||||||
with parameters:
|
with parameters:
|
||||||
σ, π, ρ
|
σ, π, ρ
|
||||||
|
|
||||||
@ -118,14 +118,16 @@ def parse_op(expr):
|
|||||||
|
|
||||||
result=""
|
result=""
|
||||||
symbols={}
|
symbols={}
|
||||||
|
|
||||||
symbols["*"]=".product(%s)"
|
symbols["*"]=".product(%s)"
|
||||||
symbols["-"]=".difference(%s)"
|
symbols["-"]=".difference(%s)"
|
||||||
symbols["ᑌ"]=".union(%s)"
|
symbols["ᑌ"]=".union(%s)"
|
||||||
symbols["ᑎ"]=".intersection(%s)"
|
symbols["ᑎ"]=".intersection(%s)"
|
||||||
|
symbols["ᐅLEFTᐊ"]=".outer_left(%s)"
|
||||||
|
symbols["ᐅRIGHTᐊ"]=".outer_right(%s)"
|
||||||
|
symbols["ᐅFULLᐊ"]=".outer(%s)"
|
||||||
symbols["ᐅᐊ"]=".join(%s)"
|
symbols["ᐅᐊ"]=".join(%s)"
|
||||||
symbols["ᐅᐊLEFT"]=".outer_left(%s)"
|
|
||||||
symbols["ᐅᐊRIGHT"]=".outer_right(%s)"
|
|
||||||
symbols["ᐅᐊFULL"]=".outer(%s)"
|
|
||||||
|
|
||||||
for i in symbols:
|
for i in symbols:
|
||||||
expr=expr.replace(i,"_____%s_____"% (i))
|
expr=expr.replace(i,"_____%s_____"% (i))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user