jdbc rework
jdbc bugfixes