adjust oracle sql syntaxes to postgres sql syntaxes
Merge remote branch 'origin/master'