When we chose to create a primary key, be sure the other existing
columns won't be in primary key

Change-Id: I523f1b3a4b56c92d48b65cb3d83793b5459c630c
Reviewed-on: https://gerrit.libreoffice.org/47732

(cherry picked from commit 2711f763)

Change-Id: I966b08ad4049c46f4a77812c48ff651b13ea7493
Reviewed-on: https://gerrit.libreoffice.org/47745Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>