gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-11-26 15:32:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix merge errors

Browse Source
This commit is contained in:
Uwe Steinmann 2017-02-21 07:04:49 +01:00
parent 4b1b702fc5
commit 9aadb7f471
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
install/create_tables-postgres.sql
View File

@ -44,8 +44,6 @@ CREATE TABLE "tblAttributeDefinitions" (
-- --------------------------------------------------------
--
<<<<<<< HEAD
=======
-- Table structure for table `tblUsers`
--
@ -59,7 +57,6 @@ CREATE TABLE "tblRoles" (
-- --------------------------------------------------------
--
>>>>>>> seeddms-6.0.x-postgres
-- Table structure for table "tblUsers"
--
@ -67,10 +64,7 @@ CREATE TABLE "tblUsers" (
"id" SERIAL UNIQUE,
"login" varchar(50) default NULL,
"pwd" varchar(50) default NULL,
<<<<<<< HEAD
=======
"secret" varchar(50) default NULL,
>>>>>>> seeddms-6.0.x-postgres
"fullName" varchar(100) default NULL,
"email" varchar(70) default NULL,
"language" varchar(32) NOT NULL,
@ -81,11 +75,7 @@ CREATE TABLE "tblUsers" (
"pwdExpiration" TIMESTAMP default NULL,
"loginfailures" INTEGER NOT NULL default '0',
"disabled" INTEGER NOT NULL default '0',
<<<<<<< HEAD
"quota" BIGINT,
=======
"quota" INTEGER,
>>>>>>> seeddms-6.0.x-postgres
"homefolder" INTEGER default NULL,
UNIQUE ("login")
);
@ -138,11 +128,7 @@ CREATE TABLE "tblUserImages" (
"id" SERIAL UNIQUE,
"userID" INTEGER NOT NULL default '0' REFERENCES "tblUsers" ("id") ON DELETE CASCADE,
"image" TEXT NOT NULL,
<<<<<<< HEAD
"mimeType" varchar(100) NOT NULL default ''
=======
"mimeType" varchar(10) NOT NULL default ''
>>>>>>> seeddms-6.0.x-postgres
) ;
-- --------------------------------------------------------