fixed table and fixed sgbd
merge