[ARVADOS] updated: 9b94f9f3068ee431b81131472fe4353defaffb32
Git user
git at public.curoverse.com
Thu Sep 7 10:59:58 EDT 2017
Summary of changes:
services/api/db/structure.sql | 176 ++++++++++-----------
.../arvados/v1/groups_controller_test.rb | 8 +-
2 files changed, 85 insertions(+), 99 deletions(-)
via 9b94f9f3068ee431b81131472fe4353defaffb32 (commit)
from 893b9849ee1f3d407778a666702dfa300e0cebbc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 9b94f9f3068ee431b81131472fe4353defaffb32
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Thu Sep 7 10:59:42 2017 -0400
12032: Update structure.sql
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>
diff --git a/services/api/db/structure.sql b/services/api/db/structure.sql
index 77c833a..0128dbf 100644
--- a/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@ -33,6 +33,74 @@ SET default_tablespace = '';
SET default_with_oids = false;
--
+-- Name: groups; Type: TABLE; Schema: public; Owner: -; Tablespace:
+--
+
+CREATE TABLE groups (
+ id integer NOT NULL,
+ uuid character varying(255),
+ owner_uuid character varying(255),
+ created_at timestamp without time zone NOT NULL,
+ modified_by_client_uuid character varying(255),
+ modified_by_user_uuid character varying(255),
+ modified_at timestamp without time zone,
+ name character varying(255) NOT NULL,
+ description character varying(524288),
+ updated_at timestamp without time zone NOT NULL,
+ group_class character varying(255),
+ trash_at timestamp without time zone,
+ is_trashed boolean DEFAULT false NOT NULL,
+ delete_at timestamp without time zone
+);
+
+
+--
+-- Name: links; Type: TABLE; Schema: public; Owner: -; Tablespace:
+--
+
+CREATE TABLE links (
+ id integer NOT NULL,
+ uuid character varying(255),
+ owner_uuid character varying(255),
+ created_at timestamp without time zone NOT NULL,
+ modified_by_client_uuid character varying(255),
+ modified_by_user_uuid character varying(255),
+ modified_at timestamp without time zone,
+ tail_uuid character varying(255),
+ link_class character varying(255),
+ name character varying(255),
+ head_uuid character varying(255),
+ properties text,
+ updated_at timestamp without time zone NOT NULL
+);
+
+
+--
+-- Name: users; Type: TABLE; Schema: public; Owner: -; Tablespace:
+--
+
+CREATE TABLE users (
+ id integer NOT NULL,
+ uuid character varying(255),
+ owner_uuid character varying(255) NOT NULL,
+ created_at timestamp without time zone NOT NULL,
+ modified_by_client_uuid character varying(255),
+ modified_by_user_uuid character varying(255),
+ modified_at timestamp without time zone,
+ email character varying(255),
+ first_name character varying(255),
+ last_name character varying(255),
+ identity_url character varying(255),
+ is_admin boolean,
+ prefs text,
+ updated_at timestamp without time zone NOT NULL,
+ default_owner_uuid character varying(255),
+ is_active boolean DEFAULT false,
+ username character varying(255)
+);
+
+
+--
-- Name: api_client_authorizations; Type: TABLE; Schema: public; Owner: -; Tablespace:
--
@@ -377,28 +445,6 @@ ALTER SEQUENCE containers_id_seq OWNED BY containers.id;
--
--- Name: groups; Type: TABLE; Schema: public; Owner: -; Tablespace:
---
-
-CREATE TABLE groups (
- id integer NOT NULL,
- uuid character varying(255),
- owner_uuid character varying(255),
- created_at timestamp without time zone NOT NULL,
- modified_by_client_uuid character varying(255),
- modified_by_user_uuid character varying(255),
- modified_at timestamp without time zone,
- name character varying(255) NOT NULL,
- description character varying(524288),
- updated_at timestamp without time zone NOT NULL,
- group_class character varying(255),
- trash_at timestamp without time zone,
- is_trashed boolean DEFAULT false NOT NULL,
- delete_at timestamp without time zone
-);
-
-
---
-- Name: groups_id_seq; Type: SEQUENCE; Schema: public; Owner: -
--
@@ -665,27 +711,6 @@ ALTER SEQUENCE keep_services_id_seq OWNED BY keep_services.id;
--
--- Name: links; Type: TABLE; Schema: public; Owner: -; Tablespace:
---
-
-CREATE TABLE links (
- id integer NOT NULL,
- uuid character varying(255),
- owner_uuid character varying(255),
- created_at timestamp without time zone NOT NULL,
- modified_by_client_uuid character varying(255),
- modified_by_user_uuid character varying(255),
- modified_at timestamp without time zone,
- tail_uuid character varying(255),
- link_class character varying(255),
- name character varying(255),
- head_uuid character varying(255),
- properties text,
- updated_at timestamp without time zone NOT NULL
-);
-
-
---
-- Name: links_id_seq; Type: SEQUENCE; Schema: public; Owner: -
--
@@ -705,11 +730,23 @@ ALTER SEQUENCE links_id_seq OWNED BY links.id;
--
+-- Name: logs_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE logs_id_seq
+ START WITH 1
+ INCREMENT BY 1
+ NO MINVALUE
+ NO MAXVALUE
+ CACHE 1;
+
+
+--
-- Name: logs; Type: TABLE; Schema: public; Owner: -; Tablespace:
--
CREATE TABLE logs (
- id integer NOT NULL,
+ id integer DEFAULT nextval('logs_id_seq'::regclass) NOT NULL,
uuid character varying(255),
owner_uuid character varying(255),
modified_by_client_uuid character varying(255),
@@ -727,25 +764,6 @@ CREATE TABLE logs (
--
--- Name: logs_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-CREATE SEQUENCE logs_id_seq
- START WITH 1
- INCREMENT BY 1
- NO MINVALUE
- NO MAXVALUE
- CACHE 1;
-
-
---
--- Name: logs_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
---
-
-ALTER SEQUENCE logs_id_seq OWNED BY logs.id;
-
-
---
-- Name: nodes; Type: TABLE; Schema: public; Owner: -; Tablespace:
--
@@ -1089,31 +1107,6 @@ ALTER SEQUENCE traits_id_seq OWNED BY traits.id;
--
--- Name: users; Type: TABLE; Schema: public; Owner: -; Tablespace:
---
-
-CREATE TABLE users (
- id integer NOT NULL,
- uuid character varying(255),
- owner_uuid character varying(255) NOT NULL,
- created_at timestamp without time zone NOT NULL,
- modified_by_client_uuid character varying(255),
- modified_by_user_uuid character varying(255),
- modified_at timestamp without time zone,
- email character varying(255),
- first_name character varying(255),
- last_name character varying(255),
- identity_url character varying(255),
- is_admin boolean,
- prefs text,
- updated_at timestamp without time zone NOT NULL,
- default_owner_uuid character varying(255),
- is_active boolean DEFAULT false,
- username character varying(255)
-);
-
-
---
-- Name: users_id_seq; Type: SEQUENCE; Schema: public; Owner: -
--
@@ -1315,13 +1308,6 @@ ALTER TABLE ONLY links ALTER COLUMN id SET DEFAULT nextval('links_id_seq'::regcl
-- Name: id; Type: DEFAULT; Schema: public; Owner: -
--
-ALTER TABLE ONLY logs ALTER COLUMN id SET DEFAULT nextval('logs_id_seq'::regclass);
-
-
---
--- Name: id; Type: DEFAULT; Schema: public; Owner: -
---
-
ALTER TABLE ONLY nodes ALTER COLUMN id SET DEFAULT nextval('nodes_id_seq'::regclass);
diff --git a/services/api/test/functional/arvados/v1/groups_controller_test.rb b/services/api/test/functional/arvados/v1/groups_controller_test.rb
index 3687819..ddc40a4 100644
--- a/services/api/test/functional/arvados/v1/groups_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/groups_controller_test.rb
@@ -692,17 +692,17 @@ class Arvados::V1::GroupsControllerTest < ActionController::TestCase
test "move trashed subproject to new owner #{auth}" do
authorize_with auth
+ assert_nil Group.readable_by(users(auth)).where(uuid: groups(:trashed_subproject).uuid).first
put :update, {
id: groups(:trashed_subproject).uuid,
group: {
owner_uuid: users(:active).uuid
},
- include_trashed: true,
+ include_trash: true,
format: :json,
}
- # Currently fails but might want to change it in the future
- # so leave the test here.
- assert_response 404
+ assert_response :success
+ assert_not_nil Group.readable_by(users(auth)).where(uuid: groups(:trashed_subproject).uuid).first
end
end
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list