Update to use new users_user table

Author: rowanseymour

core/models/user.go

@@ -23,10 +23,9 @@ type User struct {
 
 const sqlSelectUser = `
 SELECT row_to_json(r) FROM (
-	SELECT u.id, u.email, TRIM(CONCAT(u.first_name, ' ', u.last_name)) AS name, s.avatar
-	FROM auth_user u
-	INNER JOIN orgs_usersettings s ON s.user_id = u.id
-	WHERE u.id = $1 AND u.is_active
+    SELECT id, email, TRIM(CONCAT(u.first_name, ' ', last_name)) AS name, avatar
+    FROM auth_user 
+    WHERE id = $1 AND is_active
 ) r`
 
 func LoadUser(ctx context.Context, rt *runtime.Runtime, id UserID) (*User, error) {

testsuite/schema.sql

@@ -54,20 +54,14 @@ CREATE TABLE contacts_contacturn (
     UNIQUE (org_id, identity)
 );
 
-DROP TABLE IF EXISTS auth_user CASCADE;
-CREATE TABLE auth_user (
+DROP TABLE IF EXISTS users_user CASCADE;
+CREATE TABLE users_user (
     id serial primary key,
     email character varying(254) NOT NULL,
     first_name character varying(150),
     last_name character varying(150),
     is_active boolean NOT NULL,
-    is_staff boolean NOT NULL
-);
-
-DROP TABLE IF EXISTS orgs_usersettings CASCADE;
-CREATE TABLE orgs_usersettings (
-    id serial primary key,
-    user_id integer NOT NULL REFERENCES auth_user(id) ON DELETE CASCADE,
+    is_staff boolean NOT NULL,
     avatar character varying(100) NULL
 );