Fix merge conflict.

[arvados.git] / services / api / db / structure.sql

diff --git a/services/api/db/structure.sql b/services/api/db/structure.sql
index c5f6d567bfe5dc6585da96ee52afbd7dd3da948e..45559757a7c1352ec1617e7dee1ba2e91d409a57 100644 (file)
--- a/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@ -254,8 +254,6 @@ $$;
 
 SET default_tablespace = '';
 
-SET default_with_oids = false;
-
 --
 -- Name: api_client_authorizations; Type: TABLE; Schema: public; Owner: -
 --
@@ -481,7 +479,8 @@ CREATE TABLE public.container_requests (
     secret_mounts jsonb DEFAULT '{}'::jsonb,
     runtime_token text,
     output_storage_classes jsonb DEFAULT '["default"]'::jsonb,
-    output_properties jsonb DEFAULT '{}'::jsonb
+    output_properties jsonb DEFAULT '{}'::jsonb,
+    cumulative_cost double precision DEFAULT 0.0 NOT NULL
 );
 
 
@@ -545,7 +544,9 @@ CREATE TABLE public.containers (
     gateway_address character varying,
     interactive_session_started boolean DEFAULT false NOT NULL,
     output_storage_classes jsonb DEFAULT '["default"]'::jsonb,
-    output_properties jsonb DEFAULT '{}'::jsonb
+    output_properties jsonb DEFAULT '{}'::jsonb,
+    cost double precision DEFAULT 0.0 NOT NULL,
+    subrequests_cost double precision DEFAULT 0.0 NOT NULL
 );
 
 
@@ -3182,6 +3183,7 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20220301155729'),
 ('20220303204419'),
 ('20220401153101'),
-('20220505112900');
-
+('20220505112900'),
+('20220726034131'),
+('20220804133317');