 CREATE TABLE IDN_RECOVERY_DATA (
   USER_NAME VARCHAR(255) NOT NULL,
   USER_DOMAIN VARCHAR(127) NOT NULL,
-  TENANT_ID INTEGER DEFAULT -1,
+  TENANT_ID INTEGER DEFAULT -1 NOT NULL,
   CODE VARCHAR(255) NOT NULL,
   SCENARIO VARCHAR(255) NOT NULL,
   STEP VARCHAR(127) NOT NULL,
   TIME_CREATED TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  REMAINING_SETS VARCHAR(2500) DEFAULT NULL),
+  REMAINING_SETS VARCHAR(2500),
   PRIMARY KEY(USER_NAME, USER_DOMAIN, TENANT_ID, SCENARIO,STEP),
-  UNIQUE(CODE)
+  UNIQUE(CODE))
 /
 
 CREATE TABLE IDN_PASSWORD_HISTORY_DATA (
   ID INTEGER NOT NULL,
   USER_NAME   VARCHAR(255) NOT NULL,
   USER_DOMAIN VARCHAR(127) NOT NULL,
-  TENANT_ID   INTEGER DEFAULT -1,
-  SALT_VALUE  VARCHAR(255),
+  TENANT_ID   INTEGER DEFAULT -1 NOT NULL,
+  SALT_VALUE  VARCHAR(255) NOT NULL,
   HASH        VARCHAR(255) NOT NULL,
   TIME_CREATED TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (ID),


CREATE TABLE IDN_CLAIM (
  ID INTEGER NOT NULL,
  DIALECT_ID INTEGER,
  CLAIM_URI VARCHAR (255) NOT NULL,
  TENANT_ID INTEGER NOT NULL,
  PRIMARY KEY (ID),

  SAML2_SESSION_INDEX  VARCHAR(255) ,
  SAML2_AUTHN_CONTEXT_CLASS_REF  VARCHAR(255) ,
  SAML2_ASSERTION  VARCHAR(4096) ,
  PRIMARY KEY (ID))
/
CREATE SEQUENCE IDN_SAML2_ASSERTION_STORE_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
/
