From bf257b7b2239a57d43fae23ba3dddf564f569049 Mon Sep 17 00:00:00 2001 From: Piotr Gawron <piotr.gawron@uni.lu> Date: Wed, 11 Oct 2017 16:46:52 +0200 Subject: [PATCH] db migration scripts fixed, db connection extracted to file --- .../annotation/AnnotationTestFunctions.java | 2 + .../model/sbgnml/DbSerializationTest.java | 2 + persist/.classpath | 74 +- persist/src/db/10.0.3/fix_db_20161005.sql | 2 +- persist/src/db/11.0.0/fix_db_20170714.sql | 13 +- persist/src/db/7/fix_db_20140516.sql | 2 +- persist/src/db/7/fix_db_20141027.sql | 2 +- persist/src/db/base.sql | 1256 ++++++++--------- .../resources/applicationContext-persist.xml | 43 +- persist/src/main/resources/dataSource.xml | 25 + persist/src/main/resources/db.properties | 3 + .../persist/PersistTestFunctions.java | 5 +- .../reactome/ReactomeTestFunctions.java | 1 + .../lcsb/mapviewer/api/RestTestFunctions.java | 12 +- .../services/ServiceTestFunctions.java | 8 +- web/src/main/webapp/WEB-INF/web.xml | 1 + .../lcsb/mapviewer/bean/WebTestFunctions.java | 8 +- 17 files changed, 699 insertions(+), 760 deletions(-) create mode 100644 persist/src/main/resources/dataSource.xml create mode 100644 persist/src/main/resources/db.properties diff --git a/annotation/src/test/java/lcsb/mapviewer/annotation/AnnotationTestFunctions.java b/annotation/src/test/java/lcsb/mapviewer/annotation/AnnotationTestFunctions.java index a155631f38..cad5977a4c 100644 --- a/annotation/src/test/java/lcsb/mapviewer/annotation/AnnotationTestFunctions.java +++ b/annotation/src/test/java/lcsb/mapviewer/annotation/AnnotationTestFunctions.java @@ -60,6 +60,8 @@ import lcsb.mapviewer.persist.dao.cache.CacheTypeDao; "/applicationContext-annotation.xml", // "/applicationContext-persist.xml", // "/test-applicationContext.xml", // + "/test-applicationContext.xml", // + "/dataSource.xml", // }) @RunWith(SpringJUnit4ClassRunner.class) public abstract class AnnotationTestFunctions extends AbstractTransactionalJUnit4SpringContextTests { diff --git a/converter-SBGNML/src/test/java/lcsb/mapviewer/converter/model/sbgnml/DbSerializationTest.java b/converter-SBGNML/src/test/java/lcsb/mapviewer/converter/model/sbgnml/DbSerializationTest.java index 66b52bba70..c98a7c7b00 100644 --- a/converter-SBGNML/src/test/java/lcsb/mapviewer/converter/model/sbgnml/DbSerializationTest.java +++ b/converter-SBGNML/src/test/java/lcsb/mapviewer/converter/model/sbgnml/DbSerializationTest.java @@ -22,6 +22,8 @@ import lcsb.mapviewer.persist.dao.map.ModelDao; @Transactional(value = "txManager") @ContextConfiguration(locations = { "/applicationContext-persist.xml", // "/test-applicationContext.xml",// + "/dataSource.xml", // + }) @RunWith(SpringJUnit4ClassRunner.class) public class DbSerializationTest { diff --git a/persist/.classpath b/persist/.classpath index 62d4b8e472..08d7a50f5b 100644 --- a/persist/.classpath +++ b/persist/.classpath @@ -1,37 +1,37 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" output="target/classes" path="src/main/java"> - <attributes> - <attribute name="optional" value="true"/> - <attribute name="maven.pomderived" value="true"/> - </attributes> - </classpathentry> - <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"> - <attributes> - <attribute name="maven.pomderived" value="true"/> - </attributes> - </classpathentry> - <classpathentry kind="src" output="target/test-classes" path="src/test/java"> - <attributes> - <attribute name="optional" value="true"/> - <attribute name="maven.pomderived" value="true"/> - </attributes> - </classpathentry> - <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"> - <attributes> - <attribute name="maven.pomderived" value="true"/> - </attributes> - </classpathentry> - <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> - <attributes> - <attribute name="maven.pomderived" value="true"/> - <attribute name="org.eclipse.jst.component.nondependency" value=""/> - </attributes> - </classpathentry> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> - <attributes> - <attribute name="maven.pomderived" value="true"/> - </attributes> - </classpathentry> - <classpathentry kind="output" path="target/classes"/> -</classpath> +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" output="target/classes" path="src/main/java"> + <attributes> + <attribute name="optional" value="true"/> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"> + <attributes> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="src" output="target/test-classes" path="src/test/java"> + <attributes> + <attribute name="optional" value="true"/> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"> + <attributes> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> + <attributes> + <attribute name="maven.pomderived" value="true"/> + <attribute name="org.eclipse.jst.component.nondependency" value=""/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> + <attributes> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="output" path="target/classes"/> +</classpath> diff --git a/persist/src/db/10.0.3/fix_db_20161005.sql b/persist/src/db/10.0.3/fix_db_20161005.sql index e6ed06483f..823936ab20 100644 --- a/persist/src/db/10.0.3/fix_db_20161005.sql +++ b/persist/src/db/10.0.3/fix_db_20161005.sql @@ -12,7 +12,7 @@ update element_table set alias_type_db ='Right square Compartment' where alias_t update element_table set alias_type_db ='Square Compartment' where alias_type_db = 'Square Compartment Alias'; update element_table set alias_type_db ='Top square Compartment' where alias_type_db = 'Top square Compartment Alias'; -alter table node_table drop column element_iddb; +alter table node_table drop column if exists element_iddb; alter table node_table rename alias_iddb to element_iddb; update element_table set alias_type_db ='Complex' where alias_type_db = 'Complex Species Alias'; diff --git a/persist/src/db/11.0.0/fix_db_20170714.sql b/persist/src/db/11.0.0/fix_db_20170714.sql index 463e23d836..e45dcf09e6 100644 --- a/persist/src/db/11.0.0/fix_db_20170714.sql +++ b/persist/src/db/11.0.0/fix_db_20170714.sql @@ -1,18 +1,17 @@ -- some sequences had too low values -DO $$ +DO ' DECLARE rec RECORD; size INT; BEGIN FOR rec IN SELECT * FROM information_schema.sequences LOOP - /*RAISE NOTICE 'SELECT MAX(iddb)+1 FROM %', REPLACE(rec.sequence_name, '_iddb_seq', '');*/ - EXECUTE format('SELECT COUNT(1) FROM information_schema.tables WHERE table_name = ''%s''', REPLACE(rec.sequence_name, '_iddb_seq', '')) INTO size; + EXECUTE format(''SELECT COUNT(1) FROM information_schema.tables WHERE table_name = ''''%s'''''', REPLACE(rec.sequence_name, ''_iddb_seq'', '''')) INTO size; IF size = 1 THEN - EXECUTE format('SELECT setval(''%s'', (SELECT MAX(iddb)+1 FROM %I))', rec.sequence_name, REPLACE(rec.sequence_name, '_iddb_seq', '')); + EXECUTE format(''SELECT setval(''''%s'''', (SELECT MAX(iddb)+1 FROM %I))'', rec.sequence_name, REPLACE(rec.sequence_name, ''_iddb_seq'', '''')); END IF; - EXECUTE format('SELECT COUNT(1) FROM information_schema.tables WHERE table_name = ''%s''', REPLACE(rec.sequence_name, '_iddb_seq', '_table')) INTO size; + EXECUTE format(''SELECT COUNT(1) FROM information_schema.tables WHERE table_name = ''''%s'''''', REPLACE(rec.sequence_name, ''_iddb_seq'', ''_table'')) INTO size; IF size = 1 THEN - EXECUTE format('SELECT setval(''%s'', (SELECT MAX(iddb)+1 FROM %I))', rec.sequence_name, REPLACE(rec.sequence_name, '_iddb_seq', '_table')); + EXECUTE format(''SELECT setval(''''%s'''', (SELECT MAX(iddb)+1 FROM %I))'', rec.sequence_name, REPLACE(rec.sequence_name, ''_iddb_seq'', ''_table'')); END IF; END LOOP; -END $$; \ No newline at end of file +END '; \ No newline at end of file diff --git a/persist/src/db/7/fix_db_20140516.sql b/persist/src/db/7/fix_db_20140516.sql index 8ac5468cd7..0ea33c6166 100644 --- a/persist/src/db/7/fix_db_20140516.sql +++ b/persist/src/db/7/fix_db_20140516.sql @@ -51,7 +51,7 @@ delete from cacheentry; ALTER TABLE cacheentry ALTER COLUMN iddb SET DEFAULT nextval('cacheentry_iddb_seq'::regclass); --recreate search index -drop index query_index; +drop index if exists query_index; CREATE INDEX query_index ON cachequery USING btree diff --git a/persist/src/db/7/fix_db_20141027.sql b/persist/src/db/7/fix_db_20141027.sql index 22f7f52db7..da47bbd1c5 100644 --- a/persist/src/db/7/fix_db_20141027.sql +++ b/persist/src/db/7/fix_db_20141027.sql @@ -2,7 +2,7 @@ update cache_type set iddb = 0 where classname='lcsb.mapviewer.reactome.utils.ReactomeConnector'; update cache_type set iddb = 1 where classname='lcsb.mapviewer.annotation.services.AnnotationRestService'; update cache_type set iddb = 2 where classname='lcsb.mapviewer.annotation.services.ChEMBLParser'; -update cache_type set iddb = 3 where classname='lcsb.mapviewer.annotation.services.PubmedBackend'; +update cache_type set iddb = 3 where classname='lcsb.mapviewer.annotation.services.PubmedParser'; update cache_type set iddb = 4 where classname='lcsb.mapviewer.annotation.services.DrugbankHTMLParser'; update cache_type set iddb = 5 where classname='lcsb.mapviewer.annotation.services.IdConverter'; update cache_type set iddb = 6 where classname='lcsb.mapviewer.annotation.cache.MockCacheInterface'; diff --git a/persist/src/db/base.sql b/persist/src/db/base.sql index fc1b4a081f..9644b601c5 100644 --- a/persist/src/db/base.sql +++ b/persist/src/db/base.sql @@ -2,9 +2,10 @@ -- PostgreSQL database dump -- --- Dumped from database version 9.3.4 --- Dumped by pg_dump version 9.3.4 --- Started on 2015-09-29 17:54:52 +-- Dumped from database version 9.5.4 +-- Dumped by pg_dump version 9.5.4 + +-- Started on 2017-09-21 13:13:48 SET statement_timeout = 0; SET lock_timeout = 0; @@ -12,9 +13,10 @@ SET client_encoding = 'UTF8'; SET standard_conforming_strings = on; SET check_function_bodies = false; SET client_min_messages = warning; +SET row_security = off; -- --- TOC entry 235 (class 3079 OID 11750) +-- TOC entry 1 (class 3079 OID 12355) -- Name: plpgsql; Type: EXTENSION; Schema: -; Owner: -- @@ -22,8 +24,8 @@ CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog; -- --- TOC entry 2383 (class 0 OID 0) --- Dependencies: 235 +-- TOC entry 2548 (class 0 OID 0) +-- Dependencies: 1 -- Name: EXTENSION plpgsql; Type: COMMENT; Schema: -; Owner: -- @@ -37,8 +39,8 @@ SET default_tablespace = ''; SET default_with_oids = false; -- --- TOC entry 170 (class 1259 OID 1047247) --- Name: alias_table; Type: TABLE; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 181 (class 1259 OID 1746678) +-- Name: alias_table; Type: TABLE; Schema: public; Owner: map_viewer -- CREATE TABLE alias_table ( @@ -71,10 +73,10 @@ CREATE TABLE alias_table ( ); -ALTER TABLE public.alias_table OWNER TO map_viewer; +ALTER TABLE alias_table OWNER TO map_viewer; -- --- TOC entry 171 (class 1259 OID 1047253) +-- TOC entry 182 (class 1259 OID 1746684) -- Name: alias_table_iddb_seq; Type: SEQUENCE; Schema: public; Owner: map_viewer -- @@ -86,11 +88,11 @@ CREATE SEQUENCE alias_table_iddb_seq CACHE 1; -ALTER TABLE public.alias_table_iddb_seq OWNER TO map_viewer; +ALTER TABLE alias_table_iddb_seq OWNER TO map_viewer; -- --- TOC entry 2384 (class 0 OID 0) --- Dependencies: 171 +-- TOC entry 2549 (class 0 OID 0) +-- Dependencies: 182 -- Name: alias_table_iddb_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: map_viewer -- @@ -98,8 +100,8 @@ ALTER SEQUENCE alias_table_iddb_seq OWNED BY alias_table.iddb; -- --- TOC entry 172 (class 1259 OID 1047255) --- Name: antisense_rna_region_table; Type: TABLE; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 183 (class 1259 OID 1746686) +-- Name: antisense_rna_region_table; Type: TABLE; Schema: public; Owner: map_viewer -- CREATE TABLE antisense_rna_region_table ( @@ -115,10 +117,10 @@ CREATE TABLE antisense_rna_region_table ( ); -ALTER TABLE public.antisense_rna_region_table OWNER TO map_viewer; +ALTER TABLE antisense_rna_region_table OWNER TO map_viewer; -- --- TOC entry 173 (class 1259 OID 1047261) +-- TOC entry 184 (class 1259 OID 1746692) -- Name: antisense_rna_region_table_idrnaregiondb_seq; Type: SEQUENCE; Schema: public; Owner: map_viewer -- @@ -130,11 +132,11 @@ CREATE SEQUENCE antisense_rna_region_table_idrnaregiondb_seq CACHE 1; -ALTER TABLE public.antisense_rna_region_table_idrnaregiondb_seq OWNER TO map_viewer; +ALTER TABLE antisense_rna_region_table_idrnaregiondb_seq OWNER TO map_viewer; -- --- TOC entry 2385 (class 0 OID 0) --- Dependencies: 173 +-- TOC entry 2550 (class 0 OID 0) +-- Dependencies: 184 -- Name: antisense_rna_region_table_idrnaregiondb_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: map_viewer -- @@ -142,8 +144,8 @@ ALTER SEQUENCE antisense_rna_region_table_idrnaregiondb_seq OWNED BY antisense_r -- --- TOC entry 174 (class 1259 OID 1047263) --- Name: arrowtypedata; Type: TABLE; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 185 (class 1259 OID 1746694) +-- Name: arrowtypedata; Type: TABLE; Schema: public; Owner: map_viewer -- CREATE TABLE arrowtypedata ( @@ -156,10 +158,10 @@ CREATE TABLE arrowtypedata ( ); -ALTER TABLE public.arrowtypedata OWNER TO map_viewer; +ALTER TABLE arrowtypedata OWNER TO map_viewer; -- --- TOC entry 175 (class 1259 OID 1047266) +-- TOC entry 186 (class 1259 OID 1746697) -- Name: arrowtypedata_iddb_seq; Type: SEQUENCE; Schema: public; Owner: map_viewer -- @@ -171,11 +173,11 @@ CREATE SEQUENCE arrowtypedata_iddb_seq CACHE 1; -ALTER TABLE public.arrowtypedata_iddb_seq OWNER TO map_viewer; +ALTER TABLE arrowtypedata_iddb_seq OWNER TO map_viewer; -- --- TOC entry 2386 (class 0 OID 0) --- Dependencies: 175 +-- TOC entry 2551 (class 0 OID 0) +-- Dependencies: 186 -- Name: arrowtypedata_iddb_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: map_viewer -- @@ -183,8 +185,8 @@ ALTER SEQUENCE arrowtypedata_iddb_seq OWNED BY arrowtypedata.iddb; -- --- TOC entry 176 (class 1259 OID 1047268) --- Name: cacheentry; Type: TABLE; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 187 (class 1259 OID 1746699) +-- Name: cacheentry; Type: TABLE; Schema: public; Owner: map_viewer -- CREATE TABLE cacheentry ( @@ -194,11 +196,11 @@ CREATE TABLE cacheentry ( ); -ALTER TABLE public.cacheentry OWNER TO map_viewer; +ALTER TABLE cacheentry OWNER TO map_viewer; -- --- TOC entry 177 (class 1259 OID 1047274) --- Name: cachequery; Type: TABLE; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 188 (class 1259 OID 1746705) +-- Name: cachequery; Type: TABLE; Schema: public; Owner: map_viewer -- CREATE TABLE cachequery ( @@ -209,10 +211,10 @@ CREATE TABLE cachequery ( ); -ALTER TABLE public.cachequery OWNER TO map_viewer; +ALTER TABLE cachequery OWNER TO map_viewer; -- --- TOC entry 178 (class 1259 OID 1047280) +-- TOC entry 189 (class 1259 OID 1746711) -- Name: cachequery_iddb_seq; Type: SEQUENCE; Schema: public; Owner: map_viewer -- @@ -224,11 +226,11 @@ CREATE SEQUENCE cachequery_iddb_seq CACHE 1; -ALTER TABLE public.cachequery_iddb_seq OWNER TO map_viewer; +ALTER TABLE cachequery_iddb_seq OWNER TO map_viewer; -- --- TOC entry 2387 (class 0 OID 0) --- Dependencies: 178 +-- TOC entry 2552 (class 0 OID 0) +-- Dependencies: 189 -- Name: cachequery_iddb_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: map_viewer -- @@ -236,8 +238,8 @@ ALTER SEQUENCE cachequery_iddb_seq OWNED BY cachequery.iddb; -- --- TOC entry 179 (class 1259 OID 1047282) --- Name: feedback; Type: TABLE; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 190 (class 1259 OID 1746713) +-- Name: feedback; Type: TABLE; Schema: public; Owner: map_viewer -- CREATE TABLE feedback ( @@ -257,10 +259,10 @@ CREATE TABLE feedback ( ); -ALTER TABLE public.feedback OWNER TO map_viewer; +ALTER TABLE feedback OWNER TO map_viewer; -- --- TOC entry 180 (class 1259 OID 1047288) +-- TOC entry 191 (class 1259 OID 1746719) -- Name: feedback_iddb_seq; Type: SEQUENCE; Schema: public; Owner: map_viewer -- @@ -272,11 +274,11 @@ CREATE SEQUENCE feedback_iddb_seq CACHE 1; -ALTER TABLE public.feedback_iddb_seq OWNER TO map_viewer; +ALTER TABLE feedback_iddb_seq OWNER TO map_viewer; -- --- TOC entry 2388 (class 0 OID 0) --- Dependencies: 180 +-- TOC entry 2553 (class 0 OID 0) +-- Dependencies: 191 -- Name: feedback_iddb_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: map_viewer -- @@ -284,8 +286,8 @@ ALTER SEQUENCE feedback_iddb_seq OWNED BY feedback.iddb; -- --- TOC entry 181 (class 1259 OID 1047290) --- Name: layer_table; Type: TABLE; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 192 (class 1259 OID 1746721) +-- Name: layer_table; Type: TABLE; Schema: public; Owner: map_viewer -- CREATE TABLE layer_table ( @@ -298,10 +300,10 @@ CREATE TABLE layer_table ( ); -ALTER TABLE public.layer_table OWNER TO map_viewer; +ALTER TABLE layer_table OWNER TO map_viewer; -- --- TOC entry 182 (class 1259 OID 1047296) +-- TOC entry 193 (class 1259 OID 1746727) -- Name: layer_table_iddb_seq; Type: SEQUENCE; Schema: public; Owner: map_viewer -- @@ -313,11 +315,11 @@ CREATE SEQUENCE layer_table_iddb_seq CACHE 1; -ALTER TABLE public.layer_table_iddb_seq OWNER TO map_viewer; +ALTER TABLE layer_table_iddb_seq OWNER TO map_viewer; -- --- TOC entry 2389 (class 0 OID 0) --- Dependencies: 182 +-- TOC entry 2554 (class 0 OID 0) +-- Dependencies: 193 -- Name: layer_table_iddb_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: map_viewer -- @@ -325,8 +327,8 @@ ALTER SEQUENCE layer_table_iddb_seq OWNED BY layer_table.iddb; -- --- TOC entry 183 (class 1259 OID 1047298) --- Name: layer_table_layerline; Type: TABLE; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 194 (class 1259 OID 1746729) +-- Name: layer_table_layerline; Type: TABLE; Schema: public; Owner: map_viewer -- CREATE TABLE layer_table_layerline ( @@ -336,11 +338,11 @@ CREATE TABLE layer_table_layerline ( ); -ALTER TABLE public.layer_table_layerline OWNER TO map_viewer; +ALTER TABLE layer_table_layerline OWNER TO map_viewer; -- --- TOC entry 184 (class 1259 OID 1047301) --- Name: layer_table_layeroval; Type: TABLE; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 195 (class 1259 OID 1746732) +-- Name: layer_table_layeroval; Type: TABLE; Schema: public; Owner: map_viewer -- CREATE TABLE layer_table_layeroval ( @@ -350,11 +352,11 @@ CREATE TABLE layer_table_layeroval ( ); -ALTER TABLE public.layer_table_layeroval OWNER TO map_viewer; +ALTER TABLE layer_table_layeroval OWNER TO map_viewer; -- --- TOC entry 185 (class 1259 OID 1047304) --- Name: layer_table_layerrect; Type: TABLE; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 196 (class 1259 OID 1746735) +-- Name: layer_table_layerrect; Type: TABLE; Schema: public; Owner: map_viewer -- CREATE TABLE layer_table_layerrect ( @@ -364,11 +366,11 @@ CREATE TABLE layer_table_layerrect ( ); -ALTER TABLE public.layer_table_layerrect OWNER TO map_viewer; +ALTER TABLE layer_table_layerrect OWNER TO map_viewer; -- --- TOC entry 186 (class 1259 OID 1047307) --- Name: layer_table_layertext; Type: TABLE; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 197 (class 1259 OID 1746738) +-- Name: layer_table_layertext; Type: TABLE; Schema: public; Owner: map_viewer -- CREATE TABLE layer_table_layertext ( @@ -378,11 +380,11 @@ CREATE TABLE layer_table_layertext ( ); -ALTER TABLE public.layer_table_layertext OWNER TO map_viewer; +ALTER TABLE layer_table_layertext OWNER TO map_viewer; -- --- TOC entry 187 (class 1259 OID 1047310) --- Name: layerline; Type: TABLE; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 198 (class 1259 OID 1746741) +-- Name: layerline; Type: TABLE; Schema: public; Owner: map_viewer -- CREATE TABLE layerline ( @@ -394,10 +396,10 @@ CREATE TABLE layerline ( ); -ALTER TABLE public.layerline OWNER TO map_viewer; +ALTER TABLE layerline OWNER TO map_viewer; -- --- TOC entry 188 (class 1259 OID 1047316) +-- TOC entry 199 (class 1259 OID 1746747) -- Name: layerline_iddb_seq; Type: SEQUENCE; Schema: public; Owner: map_viewer -- @@ -409,11 +411,11 @@ CREATE SEQUENCE layerline_iddb_seq CACHE 1; -ALTER TABLE public.layerline_iddb_seq OWNER TO map_viewer; +ALTER TABLE layerline_iddb_seq OWNER TO map_viewer; -- --- TOC entry 2390 (class 0 OID 0) --- Dependencies: 188 +-- TOC entry 2555 (class 0 OID 0) +-- Dependencies: 199 -- Name: layerline_iddb_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: map_viewer -- @@ -421,8 +423,8 @@ ALTER SEQUENCE layerline_iddb_seq OWNED BY layerline.iddb; -- --- TOC entry 189 (class 1259 OID 1047318) --- Name: layeroval; Type: TABLE; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 200 (class 1259 OID 1746749) +-- Name: layeroval; Type: TABLE; Schema: public; Owner: map_viewer -- CREATE TABLE layeroval ( @@ -435,10 +437,10 @@ CREATE TABLE layeroval ( ); -ALTER TABLE public.layeroval OWNER TO map_viewer; +ALTER TABLE layeroval OWNER TO map_viewer; -- --- TOC entry 190 (class 1259 OID 1047324) +-- TOC entry 201 (class 1259 OID 1746755) -- Name: layeroval_iddb_seq; Type: SEQUENCE; Schema: public; Owner: map_viewer -- @@ -450,11 +452,11 @@ CREATE SEQUENCE layeroval_iddb_seq CACHE 1; -ALTER TABLE public.layeroval_iddb_seq OWNER TO map_viewer; +ALTER TABLE layeroval_iddb_seq OWNER TO map_viewer; -- --- TOC entry 2391 (class 0 OID 0) --- Dependencies: 190 +-- TOC entry 2556 (class 0 OID 0) +-- Dependencies: 201 -- Name: layeroval_iddb_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: map_viewer -- @@ -462,8 +464,8 @@ ALTER SEQUENCE layeroval_iddb_seq OWNED BY layeroval.iddb; -- --- TOC entry 191 (class 1259 OID 1047326) --- Name: layerrect; Type: TABLE; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 202 (class 1259 OID 1746757) +-- Name: layerrect; Type: TABLE; Schema: public; Owner: map_viewer -- CREATE TABLE layerrect ( @@ -476,10 +478,10 @@ CREATE TABLE layerrect ( ); -ALTER TABLE public.layerrect OWNER TO map_viewer; +ALTER TABLE layerrect OWNER TO map_viewer; -- --- TOC entry 192 (class 1259 OID 1047332) +-- TOC entry 203 (class 1259 OID 1746763) -- Name: layerrect_iddb_seq; Type: SEQUENCE; Schema: public; Owner: map_viewer -- @@ -491,11 +493,11 @@ CREATE SEQUENCE layerrect_iddb_seq CACHE 1; -ALTER TABLE public.layerrect_iddb_seq OWNER TO map_viewer; +ALTER TABLE layerrect_iddb_seq OWNER TO map_viewer; -- --- TOC entry 2392 (class 0 OID 0) --- Dependencies: 192 +-- TOC entry 2557 (class 0 OID 0) +-- Dependencies: 203 -- Name: layerrect_iddb_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: map_viewer -- @@ -503,8 +505,8 @@ ALTER SEQUENCE layerrect_iddb_seq OWNED BY layerrect.iddb; -- --- TOC entry 193 (class 1259 OID 1047334) --- Name: layertext; Type: TABLE; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 204 (class 1259 OID 1746765) +-- Name: layertext; Type: TABLE; Schema: public; Owner: map_viewer -- CREATE TABLE layertext ( @@ -519,10 +521,10 @@ CREATE TABLE layertext ( ); -ALTER TABLE public.layertext OWNER TO map_viewer; +ALTER TABLE layertext OWNER TO map_viewer; -- --- TOC entry 194 (class 1259 OID 1047340) +-- TOC entry 205 (class 1259 OID 1746771) -- Name: layertext_iddb_seq; Type: SEQUENCE; Schema: public; Owner: map_viewer -- @@ -534,11 +536,11 @@ CREATE SEQUENCE layertext_iddb_seq CACHE 1; -ALTER TABLE public.layertext_iddb_seq OWNER TO map_viewer; +ALTER TABLE layertext_iddb_seq OWNER TO map_viewer; -- --- TOC entry 2393 (class 0 OID 0) --- Dependencies: 194 +-- TOC entry 2558 (class 0 OID 0) +-- Dependencies: 205 -- Name: layertext_iddb_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: map_viewer -- @@ -546,8 +548,8 @@ ALTER SEQUENCE layertext_iddb_seq OWNED BY layertext.iddb; -- --- TOC entry 195 (class 1259 OID 1047342) --- Name: layout; Type: TABLE; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 206 (class 1259 OID 1746773) +-- Name: layout; Type: TABLE; Schema: public; Owner: map_viewer -- CREATE TABLE layout ( @@ -558,10 +560,10 @@ CREATE TABLE layout ( ); -ALTER TABLE public.layout OWNER TO map_viewer; +ALTER TABLE layout OWNER TO map_viewer; -- --- TOC entry 196 (class 1259 OID 1047348) +-- TOC entry 207 (class 1259 OID 1746779) -- Name: layout_iddb_seq; Type: SEQUENCE; Schema: public; Owner: map_viewer -- @@ -573,10 +575,10 @@ CREATE SEQUENCE layout_iddb_seq CACHE 1; -ALTER TABLE public.layout_iddb_seq OWNER TO map_viewer; +ALTER TABLE layout_iddb_seq OWNER TO map_viewer; -- --- TOC entry 197 (class 1259 OID 1047350) +-- TOC entry 208 (class 1259 OID 1746781) -- Name: layout_iddb_seq1; Type: SEQUENCE; Schema: public; Owner: map_viewer -- @@ -588,11 +590,11 @@ CREATE SEQUENCE layout_iddb_seq1 CACHE 1; -ALTER TABLE public.layout_iddb_seq1 OWNER TO map_viewer; +ALTER TABLE layout_iddb_seq1 OWNER TO map_viewer; -- --- TOC entry 2394 (class 0 OID 0) --- Dependencies: 197 +-- TOC entry 2559 (class 0 OID 0) +-- Dependencies: 208 -- Name: layout_iddb_seq1; Type: SEQUENCE OWNED BY; Schema: public; Owner: map_viewer -- @@ -600,8 +602,8 @@ ALTER SEQUENCE layout_iddb_seq1 OWNED BY layout.iddb; -- --- TOC entry 198 (class 1259 OID 1047352) --- Name: log_table; Type: TABLE; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 209 (class 1259 OID 1746783) +-- Name: log_table; Type: TABLE; Schema: public; Owner: map_viewer -- CREATE TABLE log_table ( @@ -616,10 +618,10 @@ CREATE TABLE log_table ( ); -ALTER TABLE public.log_table OWNER TO map_viewer; +ALTER TABLE log_table OWNER TO map_viewer; -- --- TOC entry 199 (class 1259 OID 1047358) +-- TOC entry 210 (class 1259 OID 1746789) -- Name: log_table_iddb_seq; Type: SEQUENCE; Schema: public; Owner: map_viewer -- @@ -631,11 +633,11 @@ CREATE SEQUENCE log_table_iddb_seq CACHE 1; -ALTER TABLE public.log_table_iddb_seq OWNER TO map_viewer; +ALTER TABLE log_table_iddb_seq OWNER TO map_viewer; -- --- TOC entry 2395 (class 0 OID 0) --- Dependencies: 199 +-- TOC entry 2560 (class 0 OID 0) +-- Dependencies: 210 -- Name: log_table_iddb_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: map_viewer -- @@ -643,8 +645,8 @@ ALTER SEQUENCE log_table_iddb_seq OWNED BY log_table.iddb; -- --- TOC entry 200 (class 1259 OID 1047360) --- Name: mappath; Type: TABLE; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 211 (class 1259 OID 1746791) +-- Name: mappath; Type: TABLE; Schema: public; Owner: map_viewer -- CREATE TABLE mappath ( @@ -655,10 +657,10 @@ CREATE TABLE mappath ( ); -ALTER TABLE public.mappath OWNER TO map_viewer; +ALTER TABLE mappath OWNER TO map_viewer; -- --- TOC entry 201 (class 1259 OID 1047363) +-- TOC entry 212 (class 1259 OID 1746794) -- Name: mappath_iddb_seq; Type: SEQUENCE; Schema: public; Owner: map_viewer -- @@ -670,11 +672,11 @@ CREATE SEQUENCE mappath_iddb_seq CACHE 1; -ALTER TABLE public.mappath_iddb_seq OWNER TO map_viewer; +ALTER TABLE mappath_iddb_seq OWNER TO map_viewer; -- --- TOC entry 2396 (class 0 OID 0) --- Dependencies: 201 +-- TOC entry 2561 (class 0 OID 0) +-- Dependencies: 212 -- Name: mappath_iddb_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: map_viewer -- @@ -682,8 +684,8 @@ ALTER SEQUENCE mappath_iddb_seq OWNED BY mappath.iddb; -- --- TOC entry 202 (class 1259 OID 1047365) --- Name: mappathnode; Type: TABLE; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 213 (class 1259 OID 1746796) +-- Name: mappathnode; Type: TABLE; Schema: public; Owner: map_viewer -- CREATE TABLE mappathnode ( @@ -694,10 +696,10 @@ CREATE TABLE mappathnode ( ); -ALTER TABLE public.mappathnode OWNER TO map_viewer; +ALTER TABLE mappathnode OWNER TO map_viewer; -- --- TOC entry 203 (class 1259 OID 1047368) +-- TOC entry 214 (class 1259 OID 1746799) -- Name: mappathnode_iddb_seq; Type: SEQUENCE; Schema: public; Owner: map_viewer -- @@ -709,11 +711,11 @@ CREATE SEQUENCE mappathnode_iddb_seq CACHE 1; -ALTER TABLE public.mappathnode_iddb_seq OWNER TO map_viewer; +ALTER TABLE mappathnode_iddb_seq OWNER TO map_viewer; -- --- TOC entry 2397 (class 0 OID 0) --- Dependencies: 203 +-- TOC entry 2562 (class 0 OID 0) +-- Dependencies: 214 -- Name: mappathnode_iddb_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: map_viewer -- @@ -721,8 +723,8 @@ ALTER SEQUENCE mappathnode_iddb_seq OWNED BY mappathnode.iddb; -- --- TOC entry 204 (class 1259 OID 1047370) --- Name: miriam_data_table; Type: TABLE; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 215 (class 1259 OID 1746801) +-- Name: miriam_data_table; Type: TABLE; Schema: public; Owner: map_viewer -- CREATE TABLE miriam_data_table ( @@ -734,10 +736,10 @@ CREATE TABLE miriam_data_table ( ); -ALTER TABLE public.miriam_data_table OWNER TO map_viewer; +ALTER TABLE miriam_data_table OWNER TO map_viewer; -- --- TOC entry 205 (class 1259 OID 1047376) +-- TOC entry 216 (class 1259 OID 1746807) -- Name: miriam_data_table_iddb_seq; Type: SEQUENCE; Schema: public; Owner: map_viewer -- @@ -749,11 +751,11 @@ CREATE SEQUENCE miriam_data_table_iddb_seq CACHE 1; -ALTER TABLE public.miriam_data_table_iddb_seq OWNER TO map_viewer; +ALTER TABLE miriam_data_table_iddb_seq OWNER TO map_viewer; -- --- TOC entry 2398 (class 0 OID 0) --- Dependencies: 205 +-- TOC entry 2563 (class 0 OID 0) +-- Dependencies: 216 -- Name: miriam_data_table_iddb_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: map_viewer -- @@ -761,8 +763,8 @@ ALTER SEQUENCE miriam_data_table_iddb_seq OWNED BY miriam_data_table.iddb; -- --- TOC entry 206 (class 1259 OID 1047378) --- Name: missingconnection; Type: TABLE; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 217 (class 1259 OID 1746809) +-- Name: missingconnection; Type: TABLE; Schema: public; Owner: map_viewer -- CREATE TABLE missingconnection ( @@ -776,10 +778,10 @@ CREATE TABLE missingconnection ( ); -ALTER TABLE public.missingconnection OWNER TO map_viewer; +ALTER TABLE missingconnection OWNER TO map_viewer; -- --- TOC entry 207 (class 1259 OID 1047384) +-- TOC entry 218 (class 1259 OID 1746815) -- Name: missingconnection_iddb_seq; Type: SEQUENCE; Schema: public; Owner: map_viewer -- @@ -791,11 +793,11 @@ CREATE SEQUENCE missingconnection_iddb_seq CACHE 1; -ALTER TABLE public.missingconnection_iddb_seq OWNER TO map_viewer; +ALTER TABLE missingconnection_iddb_seq OWNER TO map_viewer; -- --- TOC entry 2399 (class 0 OID 0) --- Dependencies: 207 +-- TOC entry 2564 (class 0 OID 0) +-- Dependencies: 218 -- Name: missingconnection_iddb_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: map_viewer -- @@ -803,8 +805,8 @@ ALTER SEQUENCE missingconnection_iddb_seq OWNED BY missingconnection.iddb; -- --- TOC entry 208 (class 1259 OID 1047386) --- Name: model_table; Type: TABLE; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 219 (class 1259 OID 1746817) +-- Name: model_table; Type: TABLE; Schema: public; Owner: map_viewer -- CREATE TABLE model_table ( @@ -821,10 +823,10 @@ CREATE TABLE model_table ( ); -ALTER TABLE public.model_table OWNER TO map_viewer; +ALTER TABLE model_table OWNER TO map_viewer; -- --- TOC entry 209 (class 1259 OID 1047392) +-- TOC entry 220 (class 1259 OID 1746823) -- Name: model_table_iddb_seq; Type: SEQUENCE; Schema: public; Owner: map_viewer -- @@ -836,11 +838,11 @@ CREATE SEQUENCE model_table_iddb_seq CACHE 1; -ALTER TABLE public.model_table_iddb_seq OWNER TO map_viewer; +ALTER TABLE model_table_iddb_seq OWNER TO map_viewer; -- --- TOC entry 2400 (class 0 OID 0) --- Dependencies: 209 +-- TOC entry 2565 (class 0 OID 0) +-- Dependencies: 220 -- Name: model_table_iddb_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: map_viewer -- @@ -848,8 +850,8 @@ ALTER SEQUENCE model_table_iddb_seq OWNED BY model_table.iddb; -- --- TOC entry 210 (class 1259 OID 1047394) --- Name: modification_residue_table; Type: TABLE; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 221 (class 1259 OID 1746825) +-- Name: modification_residue_table; Type: TABLE; Schema: public; Owner: map_viewer -- CREATE TABLE modification_residue_table ( @@ -864,10 +866,10 @@ CREATE TABLE modification_residue_table ( ); -ALTER TABLE public.modification_residue_table OWNER TO map_viewer; +ALTER TABLE modification_residue_table OWNER TO map_viewer; -- --- TOC entry 211 (class 1259 OID 1047400) +-- TOC entry 222 (class 1259 OID 1746831) -- Name: modification_residue_table_idmodificationresiduedb_seq; Type: SEQUENCE; Schema: public; Owner: map_viewer -- @@ -879,11 +881,11 @@ CREATE SEQUENCE modification_residue_table_idmodificationresiduedb_seq CACHE 1; -ALTER TABLE public.modification_residue_table_idmodificationresiduedb_seq OWNER TO map_viewer; +ALTER TABLE modification_residue_table_idmodificationresiduedb_seq OWNER TO map_viewer; -- --- TOC entry 2401 (class 0 OID 0) --- Dependencies: 211 +-- TOC entry 2566 (class 0 OID 0) +-- Dependencies: 222 -- Name: modification_residue_table_idmodificationresiduedb_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: map_viewer -- @@ -891,8 +893,8 @@ ALTER SEQUENCE modification_residue_table_idmodificationresiduedb_seq OWNED BY m -- --- TOC entry 212 (class 1259 OID 1047402) --- Name: node_table; Type: TABLE; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 223 (class 1259 OID 1746833) +-- Name: node_table; Type: TABLE; Schema: public; Owner: map_viewer -- CREATE TABLE node_table ( @@ -908,10 +910,10 @@ CREATE TABLE node_table ( ); -ALTER TABLE public.node_table OWNER TO map_viewer; +ALTER TABLE node_table OWNER TO map_viewer; -- --- TOC entry 213 (class 1259 OID 1047405) +-- TOC entry 224 (class 1259 OID 1746836) -- Name: node_table_iddb_seq; Type: SEQUENCE; Schema: public; Owner: map_viewer -- @@ -923,11 +925,11 @@ CREATE SEQUENCE node_table_iddb_seq CACHE 1; -ALTER TABLE public.node_table_iddb_seq OWNER TO map_viewer; +ALTER TABLE node_table_iddb_seq OWNER TO map_viewer; -- --- TOC entry 2402 (class 0 OID 0) --- Dependencies: 213 +-- TOC entry 2567 (class 0 OID 0) +-- Dependencies: 224 -- Name: node_table_iddb_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: map_viewer -- @@ -935,8 +937,8 @@ ALTER SEQUENCE node_table_iddb_seq OWNED BY node_table.iddb; -- --- TOC entry 214 (class 1259 OID 1047407) --- Name: point_table; Type: TABLE; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 225 (class 1259 OID 1746838) +-- Name: point_table; Type: TABLE; Schema: public; Owner: map_viewer -- CREATE TABLE point_table ( @@ -946,11 +948,11 @@ CREATE TABLE point_table ( ); -ALTER TABLE public.point_table OWNER TO map_viewer; +ALTER TABLE point_table OWNER TO map_viewer; -- --- TOC entry 215 (class 1259 OID 1047410) --- Name: polylinedata; Type: TABLE; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 226 (class 1259 OID 1746841) +-- Name: polylinedata; Type: TABLE; Schema: public; Owner: map_viewer -- CREATE TABLE polylinedata ( @@ -963,10 +965,10 @@ CREATE TABLE polylinedata ( ); -ALTER TABLE public.polylinedata OWNER TO map_viewer; +ALTER TABLE polylinedata OWNER TO map_viewer; -- --- TOC entry 216 (class 1259 OID 1047416) +-- TOC entry 227 (class 1259 OID 1746847) -- Name: polylinedata_iddb_seq; Type: SEQUENCE; Schema: public; Owner: map_viewer -- @@ -978,11 +980,11 @@ CREATE SEQUENCE polylinedata_iddb_seq CACHE 1; -ALTER TABLE public.polylinedata_iddb_seq OWNER TO map_viewer; +ALTER TABLE polylinedata_iddb_seq OWNER TO map_viewer; -- --- TOC entry 2403 (class 0 OID 0) --- Dependencies: 216 +-- TOC entry 2568 (class 0 OID 0) +-- Dependencies: 227 -- Name: polylinedata_iddb_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: map_viewer -- @@ -990,8 +992,8 @@ ALTER SEQUENCE polylinedata_iddb_seq OWNED BY polylinedata.iddb; -- --- TOC entry 217 (class 1259 OID 1047418) --- Name: privilege_table; Type: TABLE; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 228 (class 1259 OID 1746849) +-- Name: privilege_table; Type: TABLE; Schema: public; Owner: map_viewer -- CREATE TABLE privilege_table ( @@ -1004,10 +1006,10 @@ CREATE TABLE privilege_table ( ); -ALTER TABLE public.privilege_table OWNER TO map_viewer; +ALTER TABLE privilege_table OWNER TO map_viewer; -- --- TOC entry 218 (class 1259 OID 1047421) +-- TOC entry 229 (class 1259 OID 1746852) -- Name: privilege_table_iddb_seq; Type: SEQUENCE; Schema: public; Owner: map_viewer -- @@ -1019,11 +1021,11 @@ CREATE SEQUENCE privilege_table_iddb_seq CACHE 1; -ALTER TABLE public.privilege_table_iddb_seq OWNER TO map_viewer; +ALTER TABLE privilege_table_iddb_seq OWNER TO map_viewer; -- --- TOC entry 2404 (class 0 OID 0) --- Dependencies: 218 +-- TOC entry 2569 (class 0 OID 0) +-- Dependencies: 229 -- Name: privilege_table_iddb_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: map_viewer -- @@ -1031,8 +1033,8 @@ ALTER SEQUENCE privilege_table_iddb_seq OWNED BY privilege_table.iddb; -- --- TOC entry 219 (class 1259 OID 1047423) --- Name: project_table; Type: TABLE; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 230 (class 1259 OID 1746854) +-- Name: project_table; Type: TABLE; Schema: public; Owner: map_viewer -- CREATE TABLE project_table ( @@ -1044,10 +1046,10 @@ CREATE TABLE project_table ( ); -ALTER TABLE public.project_table OWNER TO map_viewer; +ALTER TABLE project_table OWNER TO map_viewer; -- --- TOC entry 220 (class 1259 OID 1047426) +-- TOC entry 231 (class 1259 OID 1746857) -- Name: project_table_iddb_seq; Type: SEQUENCE; Schema: public; Owner: map_viewer -- @@ -1059,11 +1061,11 @@ CREATE SEQUENCE project_table_iddb_seq CACHE 1; -ALTER TABLE public.project_table_iddb_seq OWNER TO map_viewer; +ALTER TABLE project_table_iddb_seq OWNER TO map_viewer; -- --- TOC entry 2405 (class 0 OID 0) --- Dependencies: 220 +-- TOC entry 2570 (class 0 OID 0) +-- Dependencies: 231 -- Name: project_table_iddb_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: map_viewer -- @@ -1071,8 +1073,8 @@ ALTER SEQUENCE project_table_iddb_seq OWNED BY project_table.iddb; -- --- TOC entry 221 (class 1259 OID 1047428) --- Name: reaction_miriam; Type: TABLE; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 232 (class 1259 OID 1746859) +-- Name: reaction_miriam; Type: TABLE; Schema: public; Owner: map_viewer -- CREATE TABLE reaction_miriam ( @@ -1081,11 +1083,11 @@ CREATE TABLE reaction_miriam ( ); -ALTER TABLE public.reaction_miriam OWNER TO map_viewer; +ALTER TABLE reaction_miriam OWNER TO map_viewer; -- --- TOC entry 222 (class 1259 OID 1047431) --- Name: reaction_table; Type: TABLE; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 233 (class 1259 OID 1746862) +-- Name: reaction_table; Type: TABLE; Schema: public; Owner: map_viewer -- CREATE TABLE reaction_table ( @@ -1102,10 +1104,10 @@ CREATE TABLE reaction_table ( ); -ALTER TABLE public.reaction_table OWNER TO map_viewer; +ALTER TABLE reaction_table OWNER TO map_viewer; -- --- TOC entry 223 (class 1259 OID 1047437) +-- TOC entry 234 (class 1259 OID 1746868) -- Name: reaction_table_iddb_seq; Type: SEQUENCE; Schema: public; Owner: map_viewer -- @@ -1117,11 +1119,11 @@ CREATE SEQUENCE reaction_table_iddb_seq CACHE 1; -ALTER TABLE public.reaction_table_iddb_seq OWNER TO map_viewer; +ALTER TABLE reaction_table_iddb_seq OWNER TO map_viewer; -- --- TOC entry 2406 (class 0 OID 0) --- Dependencies: 223 +-- TOC entry 2571 (class 0 OID 0) +-- Dependencies: 234 -- Name: reaction_table_iddb_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: map_viewer -- @@ -1129,8 +1131,8 @@ ALTER SEQUENCE reaction_table_iddb_seq OWNED BY reaction_table.iddb; -- --- TOC entry 224 (class 1259 OID 1047439) --- Name: references_table; Type: TABLE; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 235 (class 1259 OID 1746870) +-- Name: references_table; Type: TABLE; Schema: public; Owner: map_viewer -- CREATE TABLE references_table ( @@ -1139,11 +1141,11 @@ CREATE TABLE references_table ( ); -ALTER TABLE public.references_table OWNER TO map_viewer; +ALTER TABLE references_table OWNER TO map_viewer; -- --- TOC entry 225 (class 1259 OID 1047445) --- Name: search_index_table; Type: TABLE; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 236 (class 1259 OID 1746876) +-- Name: search_index_table; Type: TABLE; Schema: public; Owner: map_viewer -- CREATE TABLE search_index_table ( @@ -1154,10 +1156,10 @@ CREATE TABLE search_index_table ( ); -ALTER TABLE public.search_index_table OWNER TO map_viewer; +ALTER TABLE search_index_table OWNER TO map_viewer; -- --- TOC entry 226 (class 1259 OID 1047448) +-- TOC entry 237 (class 1259 OID 1746879) -- Name: search_index_table_iddb_seq; Type: SEQUENCE; Schema: public; Owner: map_viewer -- @@ -1169,10 +1171,10 @@ CREATE SEQUENCE search_index_table_iddb_seq CACHE 1; -ALTER TABLE public.search_index_table_iddb_seq OWNER TO map_viewer; +ALTER TABLE search_index_table_iddb_seq OWNER TO map_viewer; -- --- TOC entry 227 (class 1259 OID 1047450) +-- TOC entry 238 (class 1259 OID 1746881) -- Name: search_index_table_iddb_seq1; Type: SEQUENCE; Schema: public; Owner: map_viewer -- @@ -1184,11 +1186,11 @@ CREATE SEQUENCE search_index_table_iddb_seq1 CACHE 1; -ALTER TABLE public.search_index_table_iddb_seq1 OWNER TO map_viewer; +ALTER TABLE search_index_table_iddb_seq1 OWNER TO map_viewer; -- --- TOC entry 2407 (class 0 OID 0) --- Dependencies: 227 +-- TOC entry 2572 (class 0 OID 0) +-- Dependencies: 238 -- Name: search_index_table_iddb_seq1; Type: SEQUENCE OWNED BY; Schema: public; Owner: map_viewer -- @@ -1196,8 +1198,8 @@ ALTER SEQUENCE search_index_table_iddb_seq1 OWNED BY search_index_table.iddb; -- --- TOC entry 228 (class 1259 OID 1047452) --- Name: species_table; Type: TABLE; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 239 (class 1259 OID 1746883) +-- Name: species_table; Type: TABLE; Schema: public; Owner: map_viewer -- CREATE TABLE species_table ( @@ -1233,10 +1235,10 @@ CREATE TABLE species_table ( ); -ALTER TABLE public.species_table OWNER TO map_viewer; +ALTER TABLE species_table OWNER TO map_viewer; -- --- TOC entry 229 (class 1259 OID 1047458) +-- TOC entry 240 (class 1259 OID 1746889) -- Name: species_table_iddb_seq; Type: SEQUENCE; Schema: public; Owner: map_viewer -- @@ -1248,11 +1250,11 @@ CREATE SEQUENCE species_table_iddb_seq CACHE 1; -ALTER TABLE public.species_table_iddb_seq OWNER TO map_viewer; +ALTER TABLE species_table_iddb_seq OWNER TO map_viewer; -- --- TOC entry 2408 (class 0 OID 0) --- Dependencies: 229 +-- TOC entry 2573 (class 0 OID 0) +-- Dependencies: 240 -- Name: species_table_iddb_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: map_viewer -- @@ -1260,8 +1262,8 @@ ALTER SEQUENCE species_table_iddb_seq OWNED BY species_table.iddb; -- --- TOC entry 230 (class 1259 OID 1047460) --- Name: unified_node_elements; Type: TABLE; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 241 (class 1259 OID 1746891) +-- Name: unified_node_elements; Type: TABLE; Schema: public; Owner: map_viewer -- CREATE TABLE unified_node_elements ( @@ -1270,11 +1272,11 @@ CREATE TABLE unified_node_elements ( ); -ALTER TABLE public.unified_node_elements OWNER TO map_viewer; +ALTER TABLE unified_node_elements OWNER TO map_viewer; -- --- TOC entry 231 (class 1259 OID 1047463) --- Name: unifiednode; Type: TABLE; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 242 (class 1259 OID 1746894) +-- Name: unifiednode; Type: TABLE; Schema: public; Owner: map_viewer -- CREATE TABLE unifiednode ( @@ -1282,10 +1284,10 @@ CREATE TABLE unifiednode ( ); -ALTER TABLE public.unifiednode OWNER TO map_viewer; +ALTER TABLE unifiednode OWNER TO map_viewer; -- --- TOC entry 232 (class 1259 OID 1047466) +-- TOC entry 243 (class 1259 OID 1746897) -- Name: unifiednode_iddb_seq; Type: SEQUENCE; Schema: public; Owner: map_viewer -- @@ -1297,11 +1299,11 @@ CREATE SEQUENCE unifiednode_iddb_seq CACHE 1; -ALTER TABLE public.unifiednode_iddb_seq OWNER TO map_viewer; +ALTER TABLE unifiednode_iddb_seq OWNER TO map_viewer; -- --- TOC entry 2409 (class 0 OID 0) --- Dependencies: 232 +-- TOC entry 2574 (class 0 OID 0) +-- Dependencies: 243 -- Name: unifiednode_iddb_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: map_viewer -- @@ -1309,8 +1311,8 @@ ALTER SEQUENCE unifiednode_iddb_seq OWNED BY unifiednode.iddb; -- --- TOC entry 233 (class 1259 OID 1047468) --- Name: user_table; Type: TABLE; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 244 (class 1259 OID 1746899) +-- Name: user_table; Type: TABLE; Schema: public; Owner: map_viewer -- CREATE TABLE user_table ( @@ -1323,10 +1325,10 @@ CREATE TABLE user_table ( ); -ALTER TABLE public.user_table OWNER TO map_viewer; +ALTER TABLE user_table OWNER TO map_viewer; -- --- TOC entry 234 (class 1259 OID 1047474) +-- TOC entry 245 (class 1259 OID 1746905) -- Name: user_table_iddb_seq; Type: SEQUENCE; Schema: public; Owner: map_viewer -- @@ -1338,11 +1340,11 @@ CREATE SEQUENCE user_table_iddb_seq CACHE 1; -ALTER TABLE public.user_table_iddb_seq OWNER TO map_viewer; +ALTER TABLE user_table_iddb_seq OWNER TO map_viewer; -- --- TOC entry 2410 (class 0 OID 0) --- Dependencies: 234 +-- TOC entry 2575 (class 0 OID 0) +-- Dependencies: 245 -- Name: user_table_iddb_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: map_viewer -- @@ -1350,7 +1352,7 @@ ALTER SEQUENCE user_table_iddb_seq OWNED BY user_table.iddb; -- --- TOC entry 2040 (class 2604 OID 1047476) +-- TOC entry 2198 (class 2604 OID 1746907) -- Name: iddb; Type: DEFAULT; Schema: public; Owner: map_viewer -- @@ -1358,7 +1360,7 @@ ALTER TABLE ONLY alias_table ALTER COLUMN iddb SET DEFAULT nextval('alias_table_ -- --- TOC entry 2041 (class 2604 OID 1047477) +-- TOC entry 2199 (class 2604 OID 1746908) -- Name: idrnaregiondb; Type: DEFAULT; Schema: public; Owner: map_viewer -- @@ -1366,7 +1368,7 @@ ALTER TABLE ONLY antisense_rna_region_table ALTER COLUMN idrnaregiondb SET DEFAU -- --- TOC entry 2042 (class 2604 OID 1047478) +-- TOC entry 2200 (class 2604 OID 1746909) -- Name: iddb; Type: DEFAULT; Schema: public; Owner: map_viewer -- @@ -1374,7 +1376,7 @@ ALTER TABLE ONLY arrowtypedata ALTER COLUMN iddb SET DEFAULT nextval('arrowtyped -- --- TOC entry 2043 (class 2604 OID 1047479) +-- TOC entry 2201 (class 2604 OID 1746910) -- Name: iddb; Type: DEFAULT; Schema: public; Owner: map_viewer -- @@ -1382,7 +1384,7 @@ ALTER TABLE ONLY cachequery ALTER COLUMN iddb SET DEFAULT nextval('cachequery_id -- --- TOC entry 2044 (class 2604 OID 1047480) +-- TOC entry 2202 (class 2604 OID 1746911) -- Name: iddb; Type: DEFAULT; Schema: public; Owner: map_viewer -- @@ -1390,7 +1392,7 @@ ALTER TABLE ONLY feedback ALTER COLUMN iddb SET DEFAULT nextval('feedback_iddb_s -- --- TOC entry 2045 (class 2604 OID 1047481) +-- TOC entry 2203 (class 2604 OID 1746912) -- Name: iddb; Type: DEFAULT; Schema: public; Owner: map_viewer -- @@ -1398,7 +1400,7 @@ ALTER TABLE ONLY layer_table ALTER COLUMN iddb SET DEFAULT nextval('layer_table_ -- --- TOC entry 2046 (class 2604 OID 1047482) +-- TOC entry 2204 (class 2604 OID 1746913) -- Name: iddb; Type: DEFAULT; Schema: public; Owner: map_viewer -- @@ -1406,7 +1408,7 @@ ALTER TABLE ONLY layerline ALTER COLUMN iddb SET DEFAULT nextval('layerline_iddb -- --- TOC entry 2047 (class 2604 OID 1047483) +-- TOC entry 2205 (class 2604 OID 1746914) -- Name: iddb; Type: DEFAULT; Schema: public; Owner: map_viewer -- @@ -1414,7 +1416,7 @@ ALTER TABLE ONLY layeroval ALTER COLUMN iddb SET DEFAULT nextval('layeroval_iddb -- --- TOC entry 2048 (class 2604 OID 1047484) +-- TOC entry 2206 (class 2604 OID 1746915) -- Name: iddb; Type: DEFAULT; Schema: public; Owner: map_viewer -- @@ -1422,7 +1424,7 @@ ALTER TABLE ONLY layerrect ALTER COLUMN iddb SET DEFAULT nextval('layerrect_iddb -- --- TOC entry 2049 (class 2604 OID 1047485) +-- TOC entry 2207 (class 2604 OID 1746916) -- Name: iddb; Type: DEFAULT; Schema: public; Owner: map_viewer -- @@ -1430,7 +1432,7 @@ ALTER TABLE ONLY layertext ALTER COLUMN iddb SET DEFAULT nextval('layertext_iddb -- --- TOC entry 2050 (class 2604 OID 1047486) +-- TOC entry 2208 (class 2604 OID 1746917) -- Name: iddb; Type: DEFAULT; Schema: public; Owner: map_viewer -- @@ -1438,7 +1440,7 @@ ALTER TABLE ONLY layout ALTER COLUMN iddb SET DEFAULT nextval('layout_iddb_seq1' -- --- TOC entry 2051 (class 2604 OID 1047487) +-- TOC entry 2209 (class 2604 OID 1746918) -- Name: iddb; Type: DEFAULT; Schema: public; Owner: map_viewer -- @@ -1446,7 +1448,7 @@ ALTER TABLE ONLY log_table ALTER COLUMN iddb SET DEFAULT nextval('log_table_iddb -- --- TOC entry 2052 (class 2604 OID 1047488) +-- TOC entry 2210 (class 2604 OID 1746919) -- Name: iddb; Type: DEFAULT; Schema: public; Owner: map_viewer -- @@ -1454,7 +1456,7 @@ ALTER TABLE ONLY mappath ALTER COLUMN iddb SET DEFAULT nextval('mappath_iddb_seq -- --- TOC entry 2053 (class 2604 OID 1047489) +-- TOC entry 2211 (class 2604 OID 1746920) -- Name: iddb; Type: DEFAULT; Schema: public; Owner: map_viewer -- @@ -1462,7 +1464,7 @@ ALTER TABLE ONLY mappathnode ALTER COLUMN iddb SET DEFAULT nextval('mappathnode_ -- --- TOC entry 2054 (class 2604 OID 1047490) +-- TOC entry 2212 (class 2604 OID 1746921) -- Name: iddb; Type: DEFAULT; Schema: public; Owner: map_viewer -- @@ -1470,7 +1472,7 @@ ALTER TABLE ONLY miriam_data_table ALTER COLUMN iddb SET DEFAULT nextval('miriam -- --- TOC entry 2055 (class 2604 OID 1047491) +-- TOC entry 2213 (class 2604 OID 1746922) -- Name: iddb; Type: DEFAULT; Schema: public; Owner: map_viewer -- @@ -1478,7 +1480,7 @@ ALTER TABLE ONLY missingconnection ALTER COLUMN iddb SET DEFAULT nextval('missin -- --- TOC entry 2056 (class 2604 OID 1047492) +-- TOC entry 2214 (class 2604 OID 1746923) -- Name: iddb; Type: DEFAULT; Schema: public; Owner: map_viewer -- @@ -1486,7 +1488,7 @@ ALTER TABLE ONLY model_table ALTER COLUMN iddb SET DEFAULT nextval('model_table_ -- --- TOC entry 2057 (class 2604 OID 1047493) +-- TOC entry 2215 (class 2604 OID 1746924) -- Name: idmodificationresiduedb; Type: DEFAULT; Schema: public; Owner: map_viewer -- @@ -1494,7 +1496,7 @@ ALTER TABLE ONLY modification_residue_table ALTER COLUMN idmodificationresiduedb -- --- TOC entry 2058 (class 2604 OID 1047494) +-- TOC entry 2216 (class 2604 OID 1746925) -- Name: iddb; Type: DEFAULT; Schema: public; Owner: map_viewer -- @@ -1502,7 +1504,7 @@ ALTER TABLE ONLY node_table ALTER COLUMN iddb SET DEFAULT nextval('node_table_id -- --- TOC entry 2059 (class 2604 OID 1047495) +-- TOC entry 2217 (class 2604 OID 1746926) -- Name: iddb; Type: DEFAULT; Schema: public; Owner: map_viewer -- @@ -1510,7 +1512,7 @@ ALTER TABLE ONLY polylinedata ALTER COLUMN iddb SET DEFAULT nextval('polylinedat -- --- TOC entry 2060 (class 2604 OID 1047496) +-- TOC entry 2218 (class 2604 OID 1746927) -- Name: iddb; Type: DEFAULT; Schema: public; Owner: map_viewer -- @@ -1518,7 +1520,7 @@ ALTER TABLE ONLY privilege_table ALTER COLUMN iddb SET DEFAULT nextval('privileg -- --- TOC entry 2061 (class 2604 OID 1047497) +-- TOC entry 2219 (class 2604 OID 1746928) -- Name: iddb; Type: DEFAULT; Schema: public; Owner: map_viewer -- @@ -1526,7 +1528,7 @@ ALTER TABLE ONLY project_table ALTER COLUMN iddb SET DEFAULT nextval('project_ta -- --- TOC entry 2062 (class 2604 OID 1047498) +-- TOC entry 2220 (class 2604 OID 1746929) -- Name: iddb; Type: DEFAULT; Schema: public; Owner: map_viewer -- @@ -1534,7 +1536,7 @@ ALTER TABLE ONLY reaction_table ALTER COLUMN iddb SET DEFAULT nextval('reaction_ -- --- TOC entry 2063 (class 2604 OID 1047499) +-- TOC entry 2221 (class 2604 OID 1746930) -- Name: iddb; Type: DEFAULT; Schema: public; Owner: map_viewer -- @@ -1542,7 +1544,7 @@ ALTER TABLE ONLY search_index_table ALTER COLUMN iddb SET DEFAULT nextval('searc -- --- TOC entry 2064 (class 2604 OID 1047500) +-- TOC entry 2222 (class 2604 OID 1746931) -- Name: iddb; Type: DEFAULT; Schema: public; Owner: map_viewer -- @@ -1550,7 +1552,7 @@ ALTER TABLE ONLY species_table ALTER COLUMN iddb SET DEFAULT nextval('species_ta -- --- TOC entry 2065 (class 2604 OID 1047501) +-- TOC entry 2223 (class 2604 OID 1746932) -- Name: iddb; Type: DEFAULT; Schema: public; Owner: map_viewer -- @@ -1558,7 +1560,7 @@ ALTER TABLE ONLY unifiednode ALTER COLUMN iddb SET DEFAULT nextval('unifiednode_ -- --- TOC entry 2066 (class 2604 OID 1047502) +-- TOC entry 2224 (class 2604 OID 1746933) -- Name: iddb; Type: DEFAULT; Schema: public; Owner: map_viewer -- @@ -1566,18 +1568,16 @@ ALTER TABLE ONLY user_table ALTER COLUMN iddb SET DEFAULT nextval('user_table_id -- --- TOC entry 2311 (class 0 OID 1047247) --- Dependencies: 170 +-- TOC entry 2476 (class 0 OID 1746678) +-- Dependencies: 181 -- Data for Name: alias_table; Type: TABLE DATA; Schema: public; Owner: map_viewer -- -COPY alias_table (alias_type_db, iddb, aliasid, color, fontsize, height, maxvisibilitylevel, minvisibilitylevel, visibilitylevel, width, x, y, innerwidth, namepoint, outerwidth, thickness, title, activity, linewidth, state, compartmentalias_iddb, model_iddb, parent_iddb, idcompartmentdb, idcomplexaliasdb, idspeciesdb) FROM stdin; -\. -- --- TOC entry 2411 (class 0 OID 0) --- Dependencies: 171 +-- TOC entry 2576 (class 0 OID 0) +-- Dependencies: 182 -- Name: alias_table_iddb_seq; Type: SEQUENCE SET; Schema: public; Owner: map_viewer -- @@ -1585,18 +1585,16 @@ SELECT pg_catalog.setval('alias_table_iddb_seq', 18198, true); -- --- TOC entry 2313 (class 0 OID 1047255) --- Dependencies: 172 +-- TOC entry 2478 (class 0 OID 1746686) +-- Dependencies: 183 -- Data for Name: antisense_rna_region_table; Type: TABLE DATA; Schema: public; Owner: map_viewer -- -COPY antisense_rna_region_table (idantisensernaregiondb, id, name, pos, size, type, idrnaregiondb, state, idspeciesdb) FROM stdin; -\. -- --- TOC entry 2412 (class 0 OID 0) --- Dependencies: 173 +-- TOC entry 2577 (class 0 OID 0) +-- Dependencies: 184 -- Name: antisense_rna_region_table_idrnaregiondb_seq; Type: SEQUENCE SET; Schema: public; Owner: map_viewer -- @@ -1604,18 +1602,16 @@ SELECT pg_catalog.setval('antisense_rna_region_table_idrnaregiondb_seq', 1, fals -- --- TOC entry 2315 (class 0 OID 1047263) --- Dependencies: 174 +-- TOC entry 2480 (class 0 OID 1746694) +-- Dependencies: 185 -- Data for Name: arrowtypedata; Type: TABLE DATA; Schema: public; Owner: map_viewer -- -COPY arrowtypedata (iddb, angle, arrowlinetype, arrowtype, len, linetype) FROM stdin; -\. -- --- TOC entry 2413 (class 0 OID 0) --- Dependencies: 175 +-- TOC entry 2578 (class 0 OID 0) +-- Dependencies: 186 -- Name: arrowtypedata_iddb_seq; Type: SEQUENCE SET; Schema: public; Owner: map_viewer -- @@ -1623,28 +1619,24 @@ SELECT pg_catalog.setval('arrowtypedata_iddb_seq', 45802, true); -- --- TOC entry 2317 (class 0 OID 1047268) --- Dependencies: 176 +-- TOC entry 2482 (class 0 OID 1746699) +-- Dependencies: 187 -- Data for Name: cacheentry; Type: TABLE DATA; Schema: public; Owner: map_viewer -- -COPY cacheentry (iddb, accessed, value) FROM stdin; -\. -- --- TOC entry 2318 (class 0 OID 1047274) --- Dependencies: 177 +-- TOC entry 2483 (class 0 OID 1746705) +-- Dependencies: 188 -- Data for Name: cachequery; Type: TABLE DATA; Schema: public; Owner: map_viewer -- -COPY cachequery (iddb, accessed, query, value) FROM stdin; -\. -- --- TOC entry 2414 (class 0 OID 0) --- Dependencies: 178 +-- TOC entry 2579 (class 0 OID 0) +-- Dependencies: 189 -- Name: cachequery_iddb_seq; Type: SEQUENCE SET; Schema: public; Owner: map_viewer -- @@ -1652,18 +1644,16 @@ SELECT pg_catalog.setval('cachequery_iddb_seq', 3717, true); -- --- TOC entry 2320 (class 0 OID 1047282) --- Dependencies: 179 +-- TOC entry 2485 (class 0 OID 1746713) +-- Dependencies: 190 -- Data for Name: feedback; Type: TABLE DATA; Schema: public; Owner: map_viewer -- -COPY feedback (feedback_type, iddb, content, coordinates, deleted, email, name, removereason, tableid, tablename, pinned, model_iddb, user_iddb) FROM stdin; -\. -- --- TOC entry 2415 (class 0 OID 0) --- Dependencies: 180 +-- TOC entry 2580 (class 0 OID 0) +-- Dependencies: 191 -- Name: feedback_iddb_seq; Type: SEQUENCE SET; Schema: public; Owner: map_viewer -- @@ -1671,18 +1661,16 @@ SELECT pg_catalog.setval('feedback_iddb_seq', 27, true); -- --- TOC entry 2322 (class 0 OID 1047290) --- Dependencies: 181 +-- TOC entry 2487 (class 0 OID 1746721) +-- Dependencies: 192 -- Data for Name: layer_table; Type: TABLE DATA; Schema: public; Owner: map_viewer -- -COPY layer_table (iddb, layerid, locked, name, visible, model_iddb) FROM stdin; -\. -- --- TOC entry 2416 (class 0 OID 0) --- Dependencies: 182 +-- TOC entry 2581 (class 0 OID 0) +-- Dependencies: 193 -- Name: layer_table_iddb_seq; Type: SEQUENCE SET; Schema: public; Owner: map_viewer -- @@ -1690,58 +1678,48 @@ SELECT pg_catalog.setval('layer_table_iddb_seq', 4, true); -- --- TOC entry 2324 (class 0 OID 1047298) --- Dependencies: 183 +-- TOC entry 2489 (class 0 OID 1746729) +-- Dependencies: 194 -- Data for Name: layer_table_layerline; Type: TABLE DATA; Schema: public; Owner: map_viewer -- -COPY layer_table_layerline (layer_table_iddb, lines_iddb, idx) FROM stdin; -\. -- --- TOC entry 2325 (class 0 OID 1047301) --- Dependencies: 184 +-- TOC entry 2490 (class 0 OID 1746732) +-- Dependencies: 195 -- Data for Name: layer_table_layeroval; Type: TABLE DATA; Schema: public; Owner: map_viewer -- -COPY layer_table_layeroval (layer_table_iddb, ovals_iddb, idx) FROM stdin; -\. -- --- TOC entry 2326 (class 0 OID 1047304) --- Dependencies: 185 +-- TOC entry 2491 (class 0 OID 1746735) +-- Dependencies: 196 -- Data for Name: layer_table_layerrect; Type: TABLE DATA; Schema: public; Owner: map_viewer -- -COPY layer_table_layerrect (layer_table_iddb, rectangles_iddb, idx) FROM stdin; -\. -- --- TOC entry 2327 (class 0 OID 1047307) --- Dependencies: 186 +-- TOC entry 2492 (class 0 OID 1746738) +-- Dependencies: 197 -- Data for Name: layer_table_layertext; Type: TABLE DATA; Schema: public; Owner: map_viewer -- -COPY layer_table_layertext (layer_table_iddb, texts_iddb, idx) FROM stdin; -\. -- --- TOC entry 2328 (class 0 OID 1047310) --- Dependencies: 187 +-- TOC entry 2493 (class 0 OID 1746741) +-- Dependencies: 198 -- Data for Name: layerline; Type: TABLE DATA; Schema: public; Owner: map_viewer -- -COPY layerline (iddb, color, linewdith, atd_iddb, line_iddb) FROM stdin; -\. -- --- TOC entry 2417 (class 0 OID 0) --- Dependencies: 188 +-- TOC entry 2582 (class 0 OID 0) +-- Dependencies: 199 -- Name: layerline_iddb_seq; Type: SEQUENCE SET; Schema: public; Owner: map_viewer -- @@ -1749,18 +1727,16 @@ SELECT pg_catalog.setval('layerline_iddb_seq', 1, false); -- --- TOC entry 2330 (class 0 OID 1047318) --- Dependencies: 189 +-- TOC entry 2495 (class 0 OID 1746749) +-- Dependencies: 200 -- Data for Name: layeroval; Type: TABLE DATA; Schema: public; Owner: map_viewer -- -COPY layeroval (iddb, color, height, width, x, y) FROM stdin; -\. -- --- TOC entry 2418 (class 0 OID 0) --- Dependencies: 190 +-- TOC entry 2583 (class 0 OID 0) +-- Dependencies: 201 -- Name: layeroval_iddb_seq; Type: SEQUENCE SET; Schema: public; Owner: map_viewer -- @@ -1768,18 +1744,16 @@ SELECT pg_catalog.setval('layeroval_iddb_seq', 1, false); -- --- TOC entry 2332 (class 0 OID 1047326) --- Dependencies: 191 +-- TOC entry 2497 (class 0 OID 1746757) +-- Dependencies: 202 -- Data for Name: layerrect; Type: TABLE DATA; Schema: public; Owner: map_viewer -- -COPY layerrect (iddb, color, height, width, x, y) FROM stdin; -\. -- --- TOC entry 2419 (class 0 OID 0) --- Dependencies: 192 +-- TOC entry 2584 (class 0 OID 0) +-- Dependencies: 203 -- Name: layerrect_iddb_seq; Type: SEQUENCE SET; Schema: public; Owner: map_viewer -- @@ -1787,18 +1761,16 @@ SELECT pg_catalog.setval('layerrect_iddb_seq', 1, false); -- --- TOC entry 2334 (class 0 OID 1047334) --- Dependencies: 193 +-- TOC entry 2499 (class 0 OID 1746765) +-- Dependencies: 204 -- Data for Name: layertext; Type: TABLE DATA; Schema: public; Owner: map_viewer -- -COPY layertext (iddb, color, fontsize, height, notes, width, x, y) FROM stdin; -\. -- --- TOC entry 2420 (class 0 OID 0) --- Dependencies: 194 +-- TOC entry 2585 (class 0 OID 0) +-- Dependencies: 205 -- Name: layertext_iddb_seq; Type: SEQUENCE SET; Schema: public; Owner: map_viewer -- @@ -1806,19 +1778,17 @@ SELECT pg_catalog.setval('layertext_iddb_seq', 104, true); -- --- TOC entry 2336 (class 0 OID 1047342) --- Dependencies: 195 +-- TOC entry 2501 (class 0 OID 1746773) +-- Dependencies: 206 -- Data for Name: layout; Type: TABLE DATA; Schema: public; Owner: map_viewer -- -COPY layout (iddb, directory, title, model_iddb) FROM stdin; -5 normal Normal 3 -\. +INSERT INTO layout VALUES (5, 'normal', 'Normal', 3); -- --- TOC entry 2421 (class 0 OID 0) --- Dependencies: 196 +-- TOC entry 2586 (class 0 OID 0) +-- Dependencies: 207 -- Name: layout_iddb_seq; Type: SEQUENCE SET; Schema: public; Owner: map_viewer -- @@ -1826,8 +1796,8 @@ SELECT pg_catalog.setval('layout_iddb_seq', 164, true); -- --- TOC entry 2422 (class 0 OID 0) --- Dependencies: 197 +-- TOC entry 2587 (class 0 OID 0) +-- Dependencies: 208 -- Name: layout_iddb_seq1; Type: SEQUENCE SET; Schema: public; Owner: map_viewer -- @@ -1835,18 +1805,16 @@ SELECT pg_catalog.setval('layout_iddb_seq1', 90, true); -- --- TOC entry 2339 (class 0 OID 1047352) --- Dependencies: 198 +-- TOC entry 2504 (class 0 OID 1746783) +-- Dependencies: 209 -- Data for Name: log_table; Type: TABLE DATA; Schema: public; Owner: map_viewer -- -COPY log_table (log_type_db, iddb, description, "time", type, objectid, tablename, user_iddb) FROM stdin; -\. -- --- TOC entry 2423 (class 0 OID 0) --- Dependencies: 199 +-- TOC entry 2588 (class 0 OID 0) +-- Dependencies: 210 -- Name: log_table_iddb_seq; Type: SEQUENCE SET; Schema: public; Owner: map_viewer -- @@ -1854,18 +1822,16 @@ SELECT pg_catalog.setval('log_table_iddb_seq', 1, false); -- --- TOC entry 2341 (class 0 OID 1047360) --- Dependencies: 200 +-- TOC entry 2506 (class 0 OID 1746791) +-- Dependencies: 211 -- Data for Name: mappath; Type: TABLE DATA; Schema: public; Owner: map_viewer -- -COPY mappath (iddb, length, beginnode_iddb, endnode_iddb) FROM stdin; -\. -- --- TOC entry 2424 (class 0 OID 0) --- Dependencies: 201 +-- TOC entry 2589 (class 0 OID 0) +-- Dependencies: 212 -- Name: mappath_iddb_seq; Type: SEQUENCE SET; Schema: public; Owner: map_viewer -- @@ -1873,18 +1839,16 @@ SELECT pg_catalog.setval('mappath_iddb_seq', 1, false); -- --- TOC entry 2343 (class 0 OID 1047365) --- Dependencies: 202 +-- TOC entry 2508 (class 0 OID 1746796) +-- Dependencies: 213 -- Data for Name: mappathnode; Type: TABLE DATA; Schema: public; Owner: map_viewer -- -COPY mappathnode (iddb, element_iddb, mappath_iddb, reaction_iddb) FROM stdin; -\. -- --- TOC entry 2425 (class 0 OID 0) --- Dependencies: 203 +-- TOC entry 2590 (class 0 OID 0) +-- Dependencies: 214 -- Name: mappathnode_iddb_seq; Type: SEQUENCE SET; Schema: public; Owner: map_viewer -- @@ -1892,18 +1856,16 @@ SELECT pg_catalog.setval('mappathnode_iddb_seq', 1, false); -- --- TOC entry 2345 (class 0 OID 1047370) --- Dependencies: 204 +-- TOC entry 2510 (class 0 OID 1746801) +-- Dependencies: 215 -- Data for Name: miriam_data_table; Type: TABLE DATA; Schema: public; Owner: map_viewer -- -COPY miriam_data_table (iddb, datatypeuri, relationtype, resource, species_iddb) FROM stdin; -\. -- --- TOC entry 2426 (class 0 OID 0) --- Dependencies: 205 +-- TOC entry 2591 (class 0 OID 0) +-- Dependencies: 216 -- Name: miriam_data_table_iddb_seq; Type: SEQUENCE SET; Schema: public; Owner: map_viewer -- @@ -1911,18 +1873,16 @@ SELECT pg_catalog.setval('miriam_data_table_iddb_seq', 98614, true); -- --- TOC entry 2347 (class 0 OID 1047378) --- Dependencies: 206 +-- TOC entry 2512 (class 0 OID 1746809) +-- Dependencies: 217 -- Data for Name: missingconnection; Type: TABLE DATA; Schema: public; Owner: map_viewer -- -COPY missingconnection (iddb, description, link, name, score, type, element_iddb) FROM stdin; -\. -- --- TOC entry 2427 (class 0 OID 0) --- Dependencies: 207 +-- TOC entry 2592 (class 0 OID 0) +-- Dependencies: 218 -- Name: missingconnection_iddb_seq; Type: SEQUENCE SET; Schema: public; Owner: map_viewer -- @@ -1930,19 +1890,17 @@ SELECT pg_catalog.setval('missingconnection_iddb_seq', 23235, true); -- --- TOC entry 2349 (class 0 OID 1047386) --- Dependencies: 208 +-- TOC entry 2514 (class 0 OID 1746817) +-- Dependencies: 219 -- Data for Name: model_table; Type: TABLE DATA; Schema: public; Owner: map_viewer -- -COPY model_table (iddb, creationdate, height, mapversion, notes, shortdescription, tilesize, width, zoomlevels, project_iddb) FROM stdin; -3 2014-03-27 15:59:31.321 14285 empty DISEASE MAP \N For information on content, functionalities and referencing the Parkinson's disease map, click <a target="_blank" href = "http://minerva.uni.lu/pd_map/">here</a>. 256 25195 7 4 -\. +INSERT INTO model_table VALUES (3, '2014-03-27 15:59:31.321', 14285, 'empty DISEASE MAP', NULL, 'For information on content, functionalities and referencing the Parkinson''s disease map, click <a target="_blank" href = "http://minerva.uni.lu/pd_map/">here</a>.', 256, 25195, 7, 4); -- --- TOC entry 2428 (class 0 OID 0) --- Dependencies: 209 +-- TOC entry 2593 (class 0 OID 0) +-- Dependencies: 220 -- Name: model_table_iddb_seq; Type: SEQUENCE SET; Schema: public; Owner: map_viewer -- @@ -1950,18 +1908,16 @@ SELECT pg_catalog.setval('model_table_iddb_seq', 24, true); -- --- TOC entry 2351 (class 0 OID 1047394) --- Dependencies: 210 +-- TOC entry 2516 (class 0 OID 1746825) +-- Dependencies: 221 -- Data for Name: modification_residue_table; Type: TABLE DATA; Schema: public; Owner: map_viewer -- -COPY modification_residue_table (idmodificationresiduedb, angle, id, name, side, size, state, idspeciesdb) FROM stdin; -\. -- --- TOC entry 2429 (class 0 OID 0) --- Dependencies: 211 +-- TOC entry 2594 (class 0 OID 0) +-- Dependencies: 222 -- Name: modification_residue_table_idmodificationresiduedb_seq; Type: SEQUENCE SET; Schema: public; Owner: map_viewer -- @@ -1969,18 +1925,16 @@ SELECT pg_catalog.setval('modification_residue_table_idmodificationresiduedb_seq -- --- TOC entry 2353 (class 0 OID 1047402) --- Dependencies: 212 +-- TOC entry 2518 (class 0 OID 1746833) +-- Dependencies: 223 -- Data for Name: node_table; Type: TABLE DATA; Schema: public; Owner: map_viewer -- -COPY node_table (node_type_db, iddb, nodeoperatorforinput_iddb, nodeoperatorforoutput_iddb, line_iddb, reaction_iddb, alias_iddb, element_iddb, parent_iddb) FROM stdin; -\. -- --- TOC entry 2430 (class 0 OID 0) --- Dependencies: 213 +-- TOC entry 2595 (class 0 OID 0) +-- Dependencies: 224 -- Name: node_table_iddb_seq; Type: SEQUENCE SET; Schema: public; Owner: map_viewer -- @@ -1988,28 +1942,24 @@ SELECT pg_catalog.setval('node_table_iddb_seq', 22901, true); -- --- TOC entry 2355 (class 0 OID 1047407) --- Dependencies: 214 +-- TOC entry 2520 (class 0 OID 1746838) +-- Dependencies: 225 -- Data for Name: point_table; Type: TABLE DATA; Schema: public; Owner: map_viewer -- -COPY point_table (iddb, point_val, idx) FROM stdin; -\. -- --- TOC entry 2356 (class 0 OID 1047410) --- Dependencies: 215 +-- TOC entry 2521 (class 0 OID 1746841) +-- Dependencies: 226 -- Data for Name: polylinedata; Type: TABLE DATA; Schema: public; Owner: map_viewer -- -COPY polylinedata (iddb, color, type, width, beginatd_iddb, endatd_iddb) FROM stdin; -\. -- --- TOC entry 2431 (class 0 OID 0) --- Dependencies: 216 +-- TOC entry 2596 (class 0 OID 0) +-- Dependencies: 227 -- Name: polylinedata_iddb_seq; Type: SEQUENCE SET; Schema: public; Owner: map_viewer -- @@ -2017,78 +1967,76 @@ SELECT pg_catalog.setval('polylinedata_iddb_seq', 22901, true); -- --- TOC entry 2358 (class 0 OID 1047418) --- Dependencies: 217 +-- TOC entry 2523 (class 0 OID 1746849) +-- Dependencies: 228 -- Data for Name: privilege_table; Type: TABLE DATA; Schema: public; Owner: map_viewer -- -COPY privilege_table (privilege_class_type_db, iddb, level, type, idobject, user_iddb) FROM stdin; -OBJECT_PRIVILEGE 71 1 0 1 1 -OBJECT_PRIVILEGE 72 1 2 1 1 -OBJECT_PRIVILEGE 73 1 3 1 1 -BASIC_PRIVILEGE 162 1 5 0 1 -BASIC_PRIVILEGE 163 1 6 0 1 -BASIC_PRIVILEGE 164 1 9 0 1 -OBJECT_PRIVILEGE 77 1 0 1 3 -OBJECT_PRIVILEGE 78 1 0 6 1 -OBJECT_PRIVILEGE 79 1 2 6 1 -OBJECT_PRIVILEGE 80 1 3 6 1 -BASIC_PRIVILEGE 165 1 10 0 1 -OBJECT_PRIVILEGE 84 1 0 6 3 -OBJECT_PRIVILEGE 15 1 0 4 1 -OBJECT_PRIVILEGE 16 1 2 4 1 -OBJECT_PRIVILEGE 17 1 3 4 1 -OBJECT_PRIVILEGE 21 1 0 4 3 -OBJECT_PRIVILEGE 85 1 0 7 1 -OBJECT_PRIVILEGE 86 1 2 7 1 -OBJECT_PRIVILEGE 87 1 3 7 1 -OBJECT_PRIVILEGE 91 1 0 7 3 -OBJECT_PRIVILEGE 92 1 0 8 1 -OBJECT_PRIVILEGE 93 1 2 8 1 -OBJECT_PRIVILEGE 94 1 3 8 1 -OBJECT_PRIVILEGE 98 1 0 8 3 -OBJECT_PRIVILEGE 99 1 0 9 1 -OBJECT_PRIVILEGE 100 1 2 9 1 -OBJECT_PRIVILEGE 101 1 3 9 1 -OBJECT_PRIVILEGE 105 1 0 9 3 -OBJECT_PRIVILEGE 106 1 0 10 1 -OBJECT_PRIVILEGE 107 1 2 10 1 -OBJECT_PRIVILEGE 108 1 3 10 1 -OBJECT_PRIVILEGE 112 1 0 10 3 -OBJECT_PRIVILEGE 113 1 0 11 1 -OBJECT_PRIVILEGE 114 1 2 11 1 -OBJECT_PRIVILEGE 115 1 3 11 1 -OBJECT_PRIVILEGE 119 1 0 11 3 -OBJECT_PRIVILEGE 120 1 0 17 1 -OBJECT_PRIVILEGE 121 1 2 17 1 -OBJECT_PRIVILEGE 122 1 3 17 1 -OBJECT_PRIVILEGE 126 1 0 17 3 -OBJECT_PRIVILEGE 127 1 0 18 1 -OBJECT_PRIVILEGE 128 1 2 18 1 -OBJECT_PRIVILEGE 129 1 3 18 1 -OBJECT_PRIVILEGE 133 1 0 18 3 -OBJECT_PRIVILEGE 134 1 0 19 1 -OBJECT_PRIVILEGE 135 1 2 19 1 -OBJECT_PRIVILEGE 136 1 3 19 1 -OBJECT_PRIVILEGE 140 1 0 19 3 -OBJECT_PRIVILEGE 141 1 0 20 1 -OBJECT_PRIVILEGE 142 1 2 20 1 -OBJECT_PRIVILEGE 143 1 3 20 1 -OBJECT_PRIVILEGE 147 1 0 20 3 -OBJECT_PRIVILEGE 148 1 0 21 1 -OBJECT_PRIVILEGE 149 1 2 21 1 -OBJECT_PRIVILEGE 150 1 3 21 1 -OBJECT_PRIVILEGE 154 1 0 21 3 -OBJECT_PRIVILEGE 155 1 0 22 1 -OBJECT_PRIVILEGE 156 1 2 22 1 -OBJECT_PRIVILEGE 157 1 3 22 1 -OBJECT_PRIVILEGE 161 1 0 22 3 -\. - - --- --- TOC entry 2432 (class 0 OID 0) --- Dependencies: 218 +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 71, 1, 0, 1, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 72, 1, 2, 1, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 73, 1, 3, 1, 1); +INSERT INTO privilege_table VALUES ('BASIC_PRIVILEGE', 162, 1, 5, 0, 1); +INSERT INTO privilege_table VALUES ('BASIC_PRIVILEGE', 163, 1, 6, 0, 1); +INSERT INTO privilege_table VALUES ('BASIC_PRIVILEGE', 164, 1, 9, 0, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 77, 1, 0, 1, 3); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 78, 1, 0, 6, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 79, 1, 2, 6, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 80, 1, 3, 6, 1); +INSERT INTO privilege_table VALUES ('BASIC_PRIVILEGE', 165, 1, 10, 0, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 84, 1, 0, 6, 3); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 15, 1, 0, 4, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 16, 1, 2, 4, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 17, 1, 3, 4, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 21, 1, 0, 4, 3); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 85, 1, 0, 7, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 86, 1, 2, 7, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 87, 1, 3, 7, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 91, 1, 0, 7, 3); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 92, 1, 0, 8, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 93, 1, 2, 8, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 94, 1, 3, 8, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 98, 1, 0, 8, 3); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 99, 1, 0, 9, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 100, 1, 2, 9, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 101, 1, 3, 9, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 105, 1, 0, 9, 3); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 106, 1, 0, 10, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 107, 1, 2, 10, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 108, 1, 3, 10, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 112, 1, 0, 10, 3); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 113, 1, 0, 11, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 114, 1, 2, 11, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 115, 1, 3, 11, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 119, 1, 0, 11, 3); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 120, 1, 0, 17, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 121, 1, 2, 17, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 122, 1, 3, 17, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 126, 1, 0, 17, 3); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 127, 1, 0, 18, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 128, 1, 2, 18, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 129, 1, 3, 18, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 133, 1, 0, 18, 3); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 134, 1, 0, 19, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 135, 1, 2, 19, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 136, 1, 3, 19, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 140, 1, 0, 19, 3); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 141, 1, 0, 20, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 142, 1, 2, 20, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 143, 1, 3, 20, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 147, 1, 0, 20, 3); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 148, 1, 0, 21, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 149, 1, 2, 21, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 150, 1, 3, 21, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 154, 1, 0, 21, 3); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 155, 1, 0, 22, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 156, 1, 2, 22, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 157, 1, 3, 22, 1); +INSERT INTO privilege_table VALUES ('OBJECT_PRIVILEGE', 161, 1, 0, 22, 3); + + +-- +-- TOC entry 2597 (class 0 OID 0) +-- Dependencies: 229 -- Name: privilege_table_iddb_seq; Type: SEQUENCE SET; Schema: public; Owner: map_viewer -- @@ -2096,19 +2044,17 @@ SELECT pg_catalog.setval('privilege_table_iddb_seq', 165, true); -- --- TOC entry 2360 (class 0 OID 1047423) --- Dependencies: 219 +-- TOC entry 2525 (class 0 OID 1746854) +-- Dependencies: 230 -- Data for Name: project_table; Type: TABLE DATA; Schema: public; Owner: map_viewer -- -COPY project_table (iddb, name, progress, status, visible) FROM stdin; -4 empty 0 0 t -\. +INSERT INTO project_table VALUES (4, 'empty', 0, 0, true); -- --- TOC entry 2433 (class 0 OID 0) --- Dependencies: 220 +-- TOC entry 2598 (class 0 OID 0) +-- Dependencies: 231 -- Name: project_table_iddb_seq; Type: SEQUENCE SET; Schema: public; Owner: map_viewer -- @@ -2116,28 +2062,24 @@ SELECT pg_catalog.setval('project_table_iddb_seq', 22, true); -- --- TOC entry 2362 (class 0 OID 1047428) --- Dependencies: 221 +-- TOC entry 2527 (class 0 OID 1746859) +-- Dependencies: 232 -- Data for Name: reaction_miriam; Type: TABLE DATA; Schema: public; Owner: map_viewer -- -COPY reaction_miriam (reaction_id, miriam_id) FROM stdin; -\. -- --- TOC entry 2363 (class 0 OID 1047431) --- Dependencies: 222 +-- TOC entry 2528 (class 0 OID 1746862) +-- Dependencies: 233 -- Data for Name: reaction_table; Type: TABLE DATA; Schema: public; Owner: map_viewer -- -COPY reaction_table (reaction_type_db, iddb, idreaction, kineticlaw, metaid, name, notes, reversible, type, model_iddb) FROM stdin; -\. -- --- TOC entry 2434 (class 0 OID 0) --- Dependencies: 223 +-- TOC entry 2599 (class 0 OID 0) +-- Dependencies: 234 -- Name: reaction_table_iddb_seq; Type: SEQUENCE SET; Schema: public; Owner: map_viewer -- @@ -2145,28 +2087,24 @@ SELECT pg_catalog.setval('reaction_table_iddb_seq', 6640, true); -- --- TOC entry 2365 (class 0 OID 1047439) --- Dependencies: 224 +-- TOC entry 2530 (class 0 OID 1746870) +-- Dependencies: 235 -- Data for Name: references_table; Type: TABLE DATA; Schema: public; Owner: map_viewer -- -COPY references_table (reference_id, reference) FROM stdin; -\. -- --- TOC entry 2366 (class 0 OID 1047445) --- Dependencies: 225 +-- TOC entry 2531 (class 0 OID 1746876) +-- Dependencies: 236 -- Data for Name: search_index_table; Type: TABLE DATA; Schema: public; Owner: map_viewer -- -COPY search_index_table (iddb, value, weight, source_iddb) FROM stdin; -\. -- --- TOC entry 2435 (class 0 OID 0) --- Dependencies: 226 +-- TOC entry 2600 (class 0 OID 0) +-- Dependencies: 237 -- Name: search_index_table_iddb_seq; Type: SEQUENCE SET; Schema: public; Owner: map_viewer -- @@ -2174,8 +2112,8 @@ SELECT pg_catalog.setval('search_index_table_iddb_seq', 15, true); -- --- TOC entry 2436 (class 0 OID 0) --- Dependencies: 227 +-- TOC entry 2601 (class 0 OID 0) +-- Dependencies: 238 -- Name: search_index_table_iddb_seq1; Type: SEQUENCE SET; Schema: public; Owner: map_viewer -- @@ -2183,18 +2121,16 @@ SELECT pg_catalog.setval('search_index_table_iddb_seq1', 1, false); -- --- TOC entry 2369 (class 0 OID 1047452) --- Dependencies: 228 +-- TOC entry 2534 (class 0 OID 1746883) +-- Dependencies: 239 -- Data for Name: species_table; Type: TABLE DATA; Schema: public; Owner: map_viewer -- -COPY species_table (species_type_db, iddb, compartmentid, metaid, name, charge, idspecies, initialamount, initialconcentration, notes, onlysubstanceunits, positiontocompartment, type, antisensernaid, homodimer, hypothetical, degradedid, drugid, geneid, structuralstate, ionid, phenotypeid, idprotein, rnaid, simplemoleculeid, unknownid, complex_iddb, model_iddb, parent_iddb) FROM stdin; -\. -- --- TOC entry 2437 (class 0 OID 0) --- Dependencies: 229 +-- TOC entry 2602 (class 0 OID 0) +-- Dependencies: 240 -- Name: species_table_iddb_seq; Type: SEQUENCE SET; Schema: public; Owner: map_viewer -- @@ -2202,28 +2138,24 @@ SELECT pg_catalog.setval('species_table_iddb_seq', 15168, true); -- --- TOC entry 2371 (class 0 OID 1047460) --- Dependencies: 230 +-- TOC entry 2536 (class 0 OID 1746891) +-- Dependencies: 241 -- Data for Name: unified_node_elements; Type: TABLE DATA; Schema: public; Owner: map_viewer -- -COPY unified_node_elements (iddb_node, iddb_element) FROM stdin; -\. -- --- TOC entry 2372 (class 0 OID 1047463) --- Dependencies: 231 +-- TOC entry 2537 (class 0 OID 1746894) +-- Dependencies: 242 -- Data for Name: unifiednode; Type: TABLE DATA; Schema: public; Owner: map_viewer -- -COPY unifiednode (iddb) FROM stdin; -\. -- --- TOC entry 2438 (class 0 OID 0) --- Dependencies: 232 +-- TOC entry 2603 (class 0 OID 0) +-- Dependencies: 243 -- Name: unifiednode_iddb_seq; Type: SEQUENCE SET; Schema: public; Owner: map_viewer -- @@ -2231,20 +2163,18 @@ SELECT pg_catalog.setval('unifiednode_iddb_seq', 9891, true); -- --- TOC entry 2374 (class 0 OID 1047468) --- Dependencies: 233 +-- TOC entry 2539 (class 0 OID 1746899) +-- Dependencies: 244 -- Data for Name: user_table; Type: TABLE DATA; Schema: public; Owner: map_viewer -- -COPY user_table (iddb, cryptedpassword, email, login, name, surname) FROM stdin; -3 d41d8cd98f00b204e9800998ecf8427e \N anonymous \N \N -1 21232f297a57a5a743894a0e4a801fc3 \N admin \N \N -\. +INSERT INTO user_table VALUES (3, 'd41d8cd98f00b204e9800998ecf8427e', NULL, 'anonymous', NULL, NULL); +INSERT INTO user_table VALUES (1, '21232f297a57a5a743894a0e4a801fc3', NULL, 'admin', NULL, NULL); -- --- TOC entry 2439 (class 0 OID 0) --- Dependencies: 234 +-- TOC entry 2604 (class 0 OID 0) +-- Dependencies: 245 -- Name: user_table_iddb_seq; Type: SEQUENCE SET; Schema: public; Owner: map_viewer -- @@ -2252,8 +2182,8 @@ SELECT pg_catalog.setval('user_table_iddb_seq', 3, true); -- --- TOC entry 2068 (class 2606 OID 1047592) --- Name: alias_table_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2226 (class 2606 OID 1746935) +-- Name: alias_table_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY alias_table @@ -2261,8 +2191,8 @@ ALTER TABLE ONLY alias_table -- --- TOC entry 2070 (class 2606 OID 1047594) --- Name: antisense_rna_region_table_idantisensernaregiondb_key; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2228 (class 2606 OID 1746937) +-- Name: antisense_rna_region_table_idantisensernaregiondb_key; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY antisense_rna_region_table @@ -2270,8 +2200,8 @@ ALTER TABLE ONLY antisense_rna_region_table -- --- TOC entry 2072 (class 2606 OID 1047596) --- Name: antisense_rna_region_table_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2230 (class 2606 OID 1746939) +-- Name: antisense_rna_region_table_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY antisense_rna_region_table @@ -2279,8 +2209,8 @@ ALTER TABLE ONLY antisense_rna_region_table -- --- TOC entry 2074 (class 2606 OID 1047598) --- Name: arrowtypedata_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2232 (class 2606 OID 1746941) +-- Name: arrowtypedata_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY arrowtypedata @@ -2288,8 +2218,8 @@ ALTER TABLE ONLY arrowtypedata -- --- TOC entry 2076 (class 2606 OID 1047600) --- Name: cacheentry_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2234 (class 2606 OID 1746943) +-- Name: cacheentry_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY cacheentry @@ -2297,8 +2227,8 @@ ALTER TABLE ONLY cacheentry -- --- TOC entry 2078 (class 2606 OID 1047602) --- Name: cachequery_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2236 (class 2606 OID 1746945) +-- Name: cachequery_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY cachequery @@ -2306,8 +2236,8 @@ ALTER TABLE ONLY cachequery -- --- TOC entry 2080 (class 2606 OID 1047604) --- Name: feedback_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2238 (class 2606 OID 1746947) +-- Name: feedback_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY feedback @@ -2315,8 +2245,8 @@ ALTER TABLE ONLY feedback -- --- TOC entry 2084 (class 2606 OID 1047606) --- Name: layer_table_layerline_lines_iddb_key; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2242 (class 2606 OID 1746949) +-- Name: layer_table_layerline_lines_iddb_key; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY layer_table_layerline @@ -2324,8 +2254,8 @@ ALTER TABLE ONLY layer_table_layerline -- --- TOC entry 2086 (class 2606 OID 1047608) --- Name: layer_table_layerline_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2244 (class 2606 OID 1746951) +-- Name: layer_table_layerline_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY layer_table_layerline @@ -2333,8 +2263,8 @@ ALTER TABLE ONLY layer_table_layerline -- --- TOC entry 2088 (class 2606 OID 1047610) --- Name: layer_table_layeroval_ovals_iddb_key; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2246 (class 2606 OID 1746953) +-- Name: layer_table_layeroval_ovals_iddb_key; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY layer_table_layeroval @@ -2342,8 +2272,8 @@ ALTER TABLE ONLY layer_table_layeroval -- --- TOC entry 2090 (class 2606 OID 1047612) --- Name: layer_table_layeroval_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2248 (class 2606 OID 1746955) +-- Name: layer_table_layeroval_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY layer_table_layeroval @@ -2351,8 +2281,8 @@ ALTER TABLE ONLY layer_table_layeroval -- --- TOC entry 2092 (class 2606 OID 1047614) --- Name: layer_table_layerrect_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2250 (class 2606 OID 1746957) +-- Name: layer_table_layerrect_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY layer_table_layerrect @@ -2360,8 +2290,8 @@ ALTER TABLE ONLY layer_table_layerrect -- --- TOC entry 2094 (class 2606 OID 1047616) --- Name: layer_table_layerrect_rectangles_iddb_key; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2252 (class 2606 OID 1746959) +-- Name: layer_table_layerrect_rectangles_iddb_key; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY layer_table_layerrect @@ -2369,8 +2299,8 @@ ALTER TABLE ONLY layer_table_layerrect -- --- TOC entry 2096 (class 2606 OID 1047618) --- Name: layer_table_layertext_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2254 (class 2606 OID 1746961) +-- Name: layer_table_layertext_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY layer_table_layertext @@ -2378,8 +2308,8 @@ ALTER TABLE ONLY layer_table_layertext -- --- TOC entry 2098 (class 2606 OID 1047620) --- Name: layer_table_layertext_texts_iddb_key; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2256 (class 2606 OID 1746963) +-- Name: layer_table_layertext_texts_iddb_key; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY layer_table_layertext @@ -2387,8 +2317,8 @@ ALTER TABLE ONLY layer_table_layertext -- --- TOC entry 2082 (class 2606 OID 1047622) --- Name: layer_table_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2240 (class 2606 OID 1746965) +-- Name: layer_table_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY layer_table @@ -2396,8 +2326,8 @@ ALTER TABLE ONLY layer_table -- --- TOC entry 2100 (class 2606 OID 1047624) --- Name: layerline_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2258 (class 2606 OID 1746967) +-- Name: layerline_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY layerline @@ -2405,8 +2335,8 @@ ALTER TABLE ONLY layerline -- --- TOC entry 2102 (class 2606 OID 1047626) --- Name: layeroval_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2260 (class 2606 OID 1746969) +-- Name: layeroval_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY layeroval @@ -2414,8 +2344,8 @@ ALTER TABLE ONLY layeroval -- --- TOC entry 2104 (class 2606 OID 1047628) --- Name: layerrect_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2262 (class 2606 OID 1746971) +-- Name: layerrect_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY layerrect @@ -2423,8 +2353,8 @@ ALTER TABLE ONLY layerrect -- --- TOC entry 2106 (class 2606 OID 1047630) --- Name: layertext_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2264 (class 2606 OID 1746973) +-- Name: layertext_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY layertext @@ -2432,8 +2362,8 @@ ALTER TABLE ONLY layertext -- --- TOC entry 2108 (class 2606 OID 1047632) --- Name: layout_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2266 (class 2606 OID 1746975) +-- Name: layout_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY layout @@ -2441,8 +2371,8 @@ ALTER TABLE ONLY layout -- --- TOC entry 2110 (class 2606 OID 1047634) --- Name: log_table_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2268 (class 2606 OID 1746977) +-- Name: log_table_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY log_table @@ -2450,8 +2380,8 @@ ALTER TABLE ONLY log_table -- --- TOC entry 2112 (class 2606 OID 1047636) --- Name: mappath_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2270 (class 2606 OID 1746979) +-- Name: mappath_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY mappath @@ -2459,8 +2389,8 @@ ALTER TABLE ONLY mappath -- --- TOC entry 2114 (class 2606 OID 1047638) --- Name: mappathnode_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2272 (class 2606 OID 1746981) +-- Name: mappathnode_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY mappathnode @@ -2468,8 +2398,8 @@ ALTER TABLE ONLY mappathnode -- --- TOC entry 2116 (class 2606 OID 1047640) --- Name: miriam_data_table_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2274 (class 2606 OID 1746983) +-- Name: miriam_data_table_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY miriam_data_table @@ -2477,8 +2407,8 @@ ALTER TABLE ONLY miriam_data_table -- --- TOC entry 2118 (class 2606 OID 1047642) --- Name: missingconnection_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2276 (class 2606 OID 1746985) +-- Name: missingconnection_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY missingconnection @@ -2486,8 +2416,8 @@ ALTER TABLE ONLY missingconnection -- --- TOC entry 2120 (class 2606 OID 1047644) --- Name: model_table_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2278 (class 2606 OID 1746987) +-- Name: model_table_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY model_table @@ -2495,8 +2425,8 @@ ALTER TABLE ONLY model_table -- --- TOC entry 2122 (class 2606 OID 1047646) --- Name: modification_residue_table_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2280 (class 2606 OID 1746989) +-- Name: modification_residue_table_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY modification_residue_table @@ -2504,8 +2434,8 @@ ALTER TABLE ONLY modification_residue_table -- --- TOC entry 2124 (class 2606 OID 1047648) --- Name: node_table_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2282 (class 2606 OID 1746991) +-- Name: node_table_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY node_table @@ -2513,8 +2443,8 @@ ALTER TABLE ONLY node_table -- --- TOC entry 2126 (class 2606 OID 1047651) --- Name: point_table_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2284 (class 2606 OID 1746993) +-- Name: point_table_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY point_table @@ -2522,8 +2452,8 @@ ALTER TABLE ONLY point_table -- --- TOC entry 2128 (class 2606 OID 1047654) --- Name: polylinedata_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2286 (class 2606 OID 1746995) +-- Name: polylinedata_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY polylinedata @@ -2531,8 +2461,8 @@ ALTER TABLE ONLY polylinedata -- --- TOC entry 2130 (class 2606 OID 1047656) --- Name: privilege_table_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2288 (class 2606 OID 1746997) +-- Name: privilege_table_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY privilege_table @@ -2540,8 +2470,8 @@ ALTER TABLE ONLY privilege_table -- --- TOC entry 2132 (class 2606 OID 1047658) --- Name: project_table_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2290 (class 2606 OID 1746999) +-- Name: project_table_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY project_table @@ -2549,8 +2479,8 @@ ALTER TABLE ONLY project_table -- --- TOC entry 2134 (class 2606 OID 1047660) --- Name: reaction_miriam_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2292 (class 2606 OID 1747001) +-- Name: reaction_miriam_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY reaction_miriam @@ -2558,8 +2488,8 @@ ALTER TABLE ONLY reaction_miriam -- --- TOC entry 2136 (class 2606 OID 1047662) --- Name: reaction_table_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2294 (class 2606 OID 1747003) +-- Name: reaction_table_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY reaction_table @@ -2567,8 +2497,8 @@ ALTER TABLE ONLY reaction_table -- --- TOC entry 2138 (class 2606 OID 1047665) --- Name: search_index_table_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2296 (class 2606 OID 1747005) +-- Name: search_index_table_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY search_index_table @@ -2576,8 +2506,8 @@ ALTER TABLE ONLY search_index_table -- --- TOC entry 2140 (class 2606 OID 1047667) --- Name: species_table_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2298 (class 2606 OID 1747007) +-- Name: species_table_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY species_table @@ -2585,8 +2515,8 @@ ALTER TABLE ONLY species_table -- --- TOC entry 2142 (class 2606 OID 1047669) --- Name: unified_node_elements_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2300 (class 2606 OID 1747009) +-- Name: unified_node_elements_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY unified_node_elements @@ -2594,8 +2524,8 @@ ALTER TABLE ONLY unified_node_elements -- --- TOC entry 2144 (class 2606 OID 1047673) --- Name: unifiednode_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2302 (class 2606 OID 1747011) +-- Name: unifiednode_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY unifiednode @@ -2603,8 +2533,8 @@ ALTER TABLE ONLY unifiednode -- --- TOC entry 2146 (class 2606 OID 1047675) --- Name: user_table_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer; Tablespace: +-- TOC entry 2304 (class 2606 OID 1747013) +-- Name: user_table_pkey; Type: CONSTRAINT; Schema: public; Owner: map_viewer -- ALTER TABLE ONLY user_table @@ -2612,7 +2542,7 @@ ALTER TABLE ONLY user_table -- --- TOC entry 2147 (class 2606 OID 1047676) +-- TOC entry 2305 (class 2606 OID 1747014) -- Name: fk1220391f1e595a8a; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2621,7 +2551,7 @@ ALTER TABLE ONLY alias_table -- --- TOC entry 2148 (class 2606 OID 1047681) +-- TOC entry 2306 (class 2606 OID 1747019) -- Name: fk1220391f28cbc89c; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2630,7 +2560,7 @@ ALTER TABLE ONLY alias_table -- --- TOC entry 2149 (class 2606 OID 1047686) +-- TOC entry 2307 (class 2606 OID 1747024) -- Name: fk1220391f5720a4be; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2639,7 +2569,7 @@ ALTER TABLE ONLY alias_table -- --- TOC entry 2150 (class 2606 OID 1047691) +-- TOC entry 2308 (class 2606 OID 1747029) -- Name: fk1220391f746527fb; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2648,7 +2578,7 @@ ALTER TABLE ONLY alias_table -- --- TOC entry 2151 (class 2606 OID 1047696) +-- TOC entry 2309 (class 2606 OID 1747034) -- Name: fk1220391f911dfddb; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2657,7 +2587,7 @@ ALTER TABLE ONLY alias_table -- --- TOC entry 2152 (class 2606 OID 1047701) +-- TOC entry 2310 (class 2606 OID 1747039) -- Name: fk1220391fd07dda99; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2666,7 +2596,7 @@ ALTER TABLE ONLY alias_table -- --- TOC entry 2167 (class 2606 OID 1047706) +-- TOC entry 2325 (class 2606 OID 1747044) -- Name: fk143908c51b95291e; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2675,7 +2605,7 @@ ALTER TABLE ONLY layerline -- --- TOC entry 2168 (class 2606 OID 1047711) +-- TOC entry 2326 (class 2606 OID 1747049) -- Name: fk143908c5ddccc464; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2684,7 +2614,7 @@ ALTER TABLE ONLY layerline -- --- TOC entry 2197 (class 2606 OID 1047716) +-- TOC entry 2355 (class 2606 OID 1747054) -- Name: fk19f9ea0a4f8f9d0a; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2693,7 +2623,7 @@ ALTER TABLE ONLY search_index_table -- --- TOC entry 2198 (class 2606 OID 1047721) +-- TOC entry 2356 (class 2606 OID 1747059) -- Name: fk19f9ea0af3f38614; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2702,7 +2632,7 @@ ALTER TABLE ONLY search_index_table -- --- TOC entry 2195 (class 2606 OID 1047726) +-- TOC entry 2353 (class 2606 OID 1747064) -- Name: fk1ccb7638d07dda99; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2711,7 +2641,7 @@ ALTER TABLE ONLY reaction_table -- --- TOC entry 2189 (class 2606 OID 1047733) +-- TOC entry 2347 (class 2606 OID 1747069) -- Name: fk23b8885f4910e2f9; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2720,7 +2650,7 @@ ALTER TABLE ONLY point_table -- --- TOC entry 2178 (class 2606 OID 1047738) +-- TOC entry 2336 (class 2606 OID 1747074) -- Name: fk3197d738b8043c6b; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2729,7 +2659,7 @@ ALTER TABLE ONLY model_table -- --- TOC entry 2192 (class 2606 OID 1047743) +-- TOC entry 2350 (class 2606 OID 1747079) -- Name: fk37460cc0839f2b6e; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2738,7 +2668,7 @@ ALTER TABLE ONLY privilege_table -- --- TOC entry 2202 (class 2606 OID 1047748) +-- TOC entry 2360 (class 2606 OID 1747084) -- Name: fk573952a79b59257d; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2747,7 +2677,7 @@ ALTER TABLE ONLY unified_node_elements -- --- TOC entry 2203 (class 2606 OID 1047753) +-- TOC entry 2361 (class 2606 OID 1747089) -- Name: fk573952a7b6f23f93; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2756,7 +2686,7 @@ ALTER TABLE ONLY unified_node_elements -- --- TOC entry 2182 (class 2606 OID 1047758) +-- TOC entry 2340 (class 2606 OID 1747094) -- Name: fk5cb2435132fc04bd; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2765,7 +2695,7 @@ ALTER TABLE ONLY node_table -- --- TOC entry 2183 (class 2606 OID 1047763) +-- TOC entry 2341 (class 2606 OID 1747099) -- Name: fk5cb243516a806500; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2774,7 +2704,7 @@ ALTER TABLE ONLY node_table -- --- TOC entry 2184 (class 2606 OID 1047768) +-- TOC entry 2342 (class 2606 OID 1747104) -- Name: fk5cb2435185f7f0ff; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2783,7 +2713,7 @@ ALTER TABLE ONLY node_table -- --- TOC entry 2185 (class 2606 OID 1047774) +-- TOC entry 2343 (class 2606 OID 1747109) -- Name: fk5cb243519761b59d; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2792,7 +2722,7 @@ ALTER TABLE ONLY node_table -- --- TOC entry 2186 (class 2606 OID 1047779) +-- TOC entry 2344 (class 2606 OID 1747114) -- Name: fk5cb24351ddccc464; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2801,7 +2731,7 @@ ALTER TABLE ONLY node_table -- --- TOC entry 2187 (class 2606 OID 1047784) +-- TOC entry 2345 (class 2606 OID 1747119) -- Name: fk5cb24351eb3afa39; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2810,7 +2740,7 @@ ALTER TABLE ONLY node_table -- --- TOC entry 2188 (class 2606 OID 1047789) +-- TOC entry 2346 (class 2606 OID 1747124) -- Name: fk5cb24351f8b3fb7e; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2819,7 +2749,7 @@ ALTER TABLE ONLY node_table -- --- TOC entry 2190 (class 2606 OID 1047794) +-- TOC entry 2348 (class 2606 OID 1747129) -- Name: fk60d359aa425ee8c7; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2828,7 +2758,7 @@ ALTER TABLE ONLY polylinedata -- --- TOC entry 2191 (class 2606 OID 1047799) +-- TOC entry 2349 (class 2606 OID 1747134) -- Name: fk60d359aabc19a6f9; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2837,7 +2767,7 @@ ALTER TABLE ONLY polylinedata -- --- TOC entry 2193 (class 2606 OID 1047804) +-- TOC entry 2351 (class 2606 OID 1747139) -- Name: fk71295b151586e740; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2846,7 +2776,7 @@ ALTER TABLE ONLY reaction_miriam -- --- TOC entry 2194 (class 2606 OID 1047809) +-- TOC entry 2352 (class 2606 OID 1747144) -- Name: fk71295b1567cc9103; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2855,7 +2785,7 @@ ALTER TABLE ONLY reaction_miriam -- --- TOC entry 2173 (class 2606 OID 1047814) +-- TOC entry 2331 (class 2606 OID 1747149) -- Name: fk83f98123be8a7411; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2864,7 +2794,7 @@ ALTER TABLE ONLY mappathnode -- --- TOC entry 2174 (class 2606 OID 1047819) +-- TOC entry 2332 (class 2606 OID 1747154) -- Name: fk83f98123d8920019; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2873,7 +2803,7 @@ ALTER TABLE ONLY mappathnode -- --- TOC entry 2175 (class 2606 OID 1047824) +-- TOC entry 2333 (class 2606 OID 1747159) -- Name: fk83f98123f8b3fb7e; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2882,7 +2812,7 @@ ALTER TABLE ONLY mappathnode -- --- TOC entry 2169 (class 2606 OID 1047829) +-- TOC entry 2327 (class 2606 OID 1747164) -- Name: fk873fe74ad07dda99; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2891,7 +2821,7 @@ ALTER TABLE ONLY layout -- --- TOC entry 2170 (class 2606 OID 1047834) +-- TOC entry 2328 (class 2606 OID 1747169) -- Name: fk88cfbf13839f2b6e; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2900,7 +2830,7 @@ ALTER TABLE ONLY log_table -- --- TOC entry 2171 (class 2606 OID 1047839) +-- TOC entry 2329 (class 2606 OID 1747174) -- Name: fk951607816c839650; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2909,7 +2839,7 @@ ALTER TABLE ONLY mappath -- --- TOC entry 2172 (class 2606 OID 1047844) +-- TOC entry 2330 (class 2606 OID 1747179) -- Name: fk95160781aee68e42; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2918,7 +2848,7 @@ ALTER TABLE ONLY mappath -- --- TOC entry 2158 (class 2606 OID 1047849) +-- TOC entry 2316 (class 2606 OID 1747184) -- Name: fka7b17360d07dda99; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2927,7 +2857,7 @@ ALTER TABLE ONLY layer_table -- --- TOC entry 2153 (class 2606 OID 1047854) +-- TOC entry 2311 (class 2606 OID 1747189) -- Name: fkc75381701e595a8a; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2936,7 +2866,7 @@ ALTER TABLE ONLY antisense_rna_region_table -- --- TOC entry 2154 (class 2606 OID 1047859) +-- TOC entry 2312 (class 2606 OID 1747194) -- Name: fkc7538170a4c0d273; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2945,7 +2875,7 @@ ALTER TABLE ONLY antisense_rna_region_table -- --- TOC entry 2155 (class 2606 OID 1047864) +-- TOC entry 2313 (class 2606 OID 1747199) -- Name: fkc7538170f459d889; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2954,7 +2884,7 @@ ALTER TABLE ONLY antisense_rna_region_table -- --- TOC entry 2159 (class 2606 OID 1047869) +-- TOC entry 2317 (class 2606 OID 1747204) -- Name: fkcbfabea647d24b0b; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2963,7 +2893,7 @@ ALTER TABLE ONLY layer_table_layerline -- --- TOC entry 2160 (class 2606 OID 1047874) +-- TOC entry 2318 (class 2606 OID 1747209) -- Name: fkcbfabea6573d6d60; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2972,7 +2902,7 @@ ALTER TABLE ONLY layer_table_layerline -- --- TOC entry 2161 (class 2606 OID 1047879) +-- TOC entry 2319 (class 2606 OID 1747214) -- Name: fkcbfc4b0447d24b0b; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2981,7 +2911,7 @@ ALTER TABLE ONLY layer_table_layeroval -- --- TOC entry 2162 (class 2606 OID 1047884) +-- TOC entry 2320 (class 2606 OID 1747219) -- Name: fkcbfc4b04e771479c; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2990,7 +2920,7 @@ ALTER TABLE ONLY layer_table_layeroval -- --- TOC entry 2163 (class 2606 OID 1047889) +-- TOC entry 2321 (class 2606 OID 1747224) -- Name: fkcbfd689647d24b0b; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -2999,7 +2929,7 @@ ALTER TABLE ONLY layer_table_layerrect -- --- TOC entry 2164 (class 2606 OID 1047894) +-- TOC entry 2322 (class 2606 OID 1747229) -- Name: fkcbfd68968b8fcc8b; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -3008,7 +2938,7 @@ ALTER TABLE ONLY layer_table_layerrect -- --- TOC entry 2165 (class 2606 OID 1047899) +-- TOC entry 2323 (class 2606 OID 1747234) -- Name: fkcbfe53df47d24b0b; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -3017,7 +2947,7 @@ ALTER TABLE ONLY layer_table_layertext -- --- TOC entry 2166 (class 2606 OID 1047904) +-- TOC entry 2324 (class 2606 OID 1747239) -- Name: fkcbfe53dfd0c40912; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -3026,7 +2956,7 @@ ALTER TABLE ONLY layer_table_layertext -- --- TOC entry 2176 (class 2606 OID 1047909) +-- TOC entry 2334 (class 2606 OID 1747244) -- Name: fkcc8b66f9a1903ff9; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -3035,7 +2965,7 @@ ALTER TABLE ONLY miriam_data_table -- --- TOC entry 2196 (class 2606 OID 1047916) +-- TOC entry 2354 (class 2606 OID 1747249) -- Name: fkdfe14357f943f5d4; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -3044,7 +2974,7 @@ ALTER TABLE ONLY references_table -- --- TOC entry 2179 (class 2606 OID 1047924) +-- TOC entry 2337 (class 2606 OID 1747254) -- Name: fke2a456b71e595a8a; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -3053,7 +2983,7 @@ ALTER TABLE ONLY modification_residue_table -- --- TOC entry 2180 (class 2606 OID 1047929) +-- TOC entry 2338 (class 2606 OID 1747259) -- Name: fke2a456b783a4f0d1; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -3062,7 +2992,7 @@ ALTER TABLE ONLY modification_residue_table -- --- TOC entry 2181 (class 2606 OID 1047934) +-- TOC entry 2339 (class 2606 OID 1747264) -- Name: fke2a456b7f6dd3c25; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -3071,7 +3001,7 @@ ALTER TABLE ONLY modification_residue_table -- --- TOC entry 2177 (class 2606 OID 1047939) +-- TOC entry 2335 (class 2606 OID 1747269) -- Name: fkeecb14c4be8a7411; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -3080,7 +3010,7 @@ ALTER TABLE ONLY missingconnection -- --- TOC entry 2199 (class 2606 OID 1047944) +-- TOC entry 2357 (class 2606 OID 1747274) -- Name: fkf137030bb54fb17f; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -3089,7 +3019,7 @@ ALTER TABLE ONLY species_table -- --- TOC entry 2200 (class 2606 OID 1047949) +-- TOC entry 2358 (class 2606 OID 1747279) -- Name: fkf137030bd07dda99; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -3098,7 +3028,7 @@ ALTER TABLE ONLY species_table -- --- TOC entry 2201 (class 2606 OID 1047954) +-- TOC entry 2359 (class 2606 OID 1747284) -- Name: fkf137030bf170df45; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -3107,7 +3037,7 @@ ALTER TABLE ONLY species_table -- --- TOC entry 2156 (class 2606 OID 1047959) +-- TOC entry 2314 (class 2606 OID 1747289) -- Name: fkf8704fa5839f2b6e; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -3116,7 +3046,7 @@ ALTER TABLE ONLY feedback -- --- TOC entry 2157 (class 2606 OID 1047964) +-- TOC entry 2315 (class 2606 OID 1747294) -- Name: fkf8704fa5d07dda99; Type: FK CONSTRAINT; Schema: public; Owner: map_viewer -- @@ -3125,8 +3055,8 @@ ALTER TABLE ONLY feedback -- --- TOC entry 2382 (class 0 OID 0) --- Dependencies: 6 +-- TOC entry 2547 (class 0 OID 0) +-- Dependencies: 7 -- Name: public; Type: ACL; Schema: -; Owner: postgres -- @@ -3136,7 +3066,7 @@ GRANT ALL ON SCHEMA public TO postgres; GRANT ALL ON SCHEMA public TO PUBLIC; --- Completed on 2015-09-29 17:54:52 +-- Completed on 2017-09-21 13:13:48 -- -- PostgreSQL database dump complete diff --git a/persist/src/main/resources/applicationContext-persist.xml b/persist/src/main/resources/applicationContext-persist.xml index 896e204ca1..b459702a7a 100644 --- a/persist/src/main/resources/applicationContext-persist.xml +++ b/persist/src/main/resources/applicationContext-persist.xml @@ -8,28 +8,14 @@ http://www.springframework.org/schema/tx/spring-tx-4.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd"> - -<!-- Data Source Declaration --> - <bean id="DataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource" destroy-method="close"> - <property name="driverClass" value="org.postgresql.Driver" /> - <property name="jdbcUrl" value="jdbc:postgresql://localhost:5432/map_viewer" /> - <property name="user" value="map_viewer" /> - <property name="password" value="123qweasdzxc" /> - <property name="maxPoolSize" value="100" /> - <property name="maxStatements" value="5" /> - <property name="minPoolSize" value="5" /> - </bean> - - - <bean id="BaseDao" class="lcsb.mapviewer.persist.dao.BaseDao" abstract="true"> - </bean> + + <bean id="BaseDao" class="lcsb.mapviewer.persist.dao.BaseDao" abstract="true"/> <bean id="UserDao" class="lcsb.mapviewer.persist.dao.user.UserDao" parent="BaseDao"/> <bean id="PrivilegeDao" class="lcsb.mapviewer.persist.dao.user.PrivilegeDao" parent="BaseDao"/> <bean id="LogDao" class="lcsb.mapviewer.persist.dao.log.LogDao" parent="BaseDao"/> - <bean id="BigFileEntryDao" class="lcsb.mapviewer.persist.dao.cache.BigFileEntryDao" parent="BaseDao"/> <bean id="UploadedFileEntryDao" class="lcsb.mapviewer.persist.dao.cache.UploadedFileEntryDao" parent="BaseDao"/> <bean id="ConfigurationDao" class="lcsb.mapviewer.persist.dao.ConfigurationDao" parent="BaseDao"/> @@ -200,8 +186,6 @@ <prop key="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</prop> <!--<prop key="hibernate.show_sql">true</prop>--> <!--<prop key="hibernate.current_session_context_class">thread</prop>--> - - <!--<prop key="hibernate.hbm2ddl.auto">create</prop> --> </props> </property> </bean> @@ -220,27 +204,4 @@ <bean id="PasswordEncoder" class="org.springframework.security.authentication.encoding.Md5PasswordEncoder"/> -<!-- These beans are responsible for statistics (used for debuging) --> -<!-- - <bean id="hibernateStatisticsMBean" class="org.hibernate.jmx.StatisticsService"> - <property name="statisticsEnabled" value="true" /> - <property name="sessionFactory" value="#{SessionFactory}" /> - </bean> - - <bean id="mbeanServer" class="org.springframework.jmx.support.MBeanServerFactoryBean"> - <property name="locateExistingServerIfPossible" value="true" /> - </bean> - - <bean id="jmxExporter" class="org.springframework.jmx.export.MBeanExporter" - lazy-init="false"> - <property name="server" ref="mbeanServer" /> - <property name="registrationBehaviorName" value="REGISTRATION_REPLACE_EXISTING"/> - <property name="beans"> - <map> - <entry key="yourkey:name=hibernateStatistics" value-ref="hibernateStatisticsMBean" /> - </map> - </property> - </bean> ---> - </beans> diff --git a/persist/src/main/resources/dataSource.xml b/persist/src/main/resources/dataSource.xml new file mode 100644 index 0000000000..e6551f4fb1 --- /dev/null +++ b/persist/src/main/resources/dataSource.xml @@ -0,0 +1,25 @@ +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:tx="http://www.springframework.org/schema/tx" + xmlns:context="http://www.springframework.org/schema/context" + xsi:schemaLocation="http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-4.0.xsd + http://www.springframework.org/schema/tx + http://www.springframework.org/schema/tx/spring-tx-4.0.xsd + http://www.springframework.org/schema/context + http://www.springframework.org/schema/context/spring-context-4.0.xsd"> + + <context:property-placeholder location="classpath:db.properties" /> + +<!-- Data Source Declaration --> + <bean id="DataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource" destroy-method="close"> + <property name="driverClass" value="org.postgresql.Driver" /> + <property name="jdbcUrl" value="${database.uri}" /> + <property name="user" value="${database.username}" /> + <property name="password" value="${database.password}" /> + <property name="maxPoolSize" value="100" /> + <property name="maxStatements" value="5" /> + <property name="minPoolSize" value="5" /> + </bean> + +</beans> diff --git a/persist/src/main/resources/db.properties b/persist/src/main/resources/db.properties new file mode 100644 index 0000000000..e1edfb39ac --- /dev/null +++ b/persist/src/main/resources/db.properties @@ -0,0 +1,3 @@ +database.uri=jdbc:postgresql://localhost:5432/map_viewer +database.username=map_viewer +database.password=123qweasdzxc \ No newline at end of file diff --git a/persist/src/test/java/lcsb/mapviewer/persist/PersistTestFunctions.java b/persist/src/test/java/lcsb/mapviewer/persist/PersistTestFunctions.java index 494cdbda1c..03b6cad194 100644 --- a/persist/src/test/java/lcsb/mapviewer/persist/PersistTestFunctions.java +++ b/persist/src/test/java/lcsb/mapviewer/persist/PersistTestFunctions.java @@ -56,7 +56,10 @@ import lcsb.mapviewer.persist.dao.user.UserDao; @Transactional(value = "txManager") @Rollback(true) -@ContextConfiguration(locations = { "/applicationContext-persist.xml", "/test-applicationContext.xml" }) +@ContextConfiguration(locations = { "/applicationContext-persist.xml", // + "/test-applicationContext.xml", // + "/dataSource.xml" // + }) @RunWith(SpringJUnit4ClassRunner.class) public abstract class PersistTestFunctions { private Logger logger = Logger.getLogger(PersistTestFunctions.class); diff --git a/reactome/src/test/java/lcsb/mapviewer/reactome/ReactomeTestFunctions.java b/reactome/src/test/java/lcsb/mapviewer/reactome/ReactomeTestFunctions.java index 48dbbe2bf5..8ac8e12415 100644 --- a/reactome/src/test/java/lcsb/mapviewer/reactome/ReactomeTestFunctions.java +++ b/reactome/src/test/java/lcsb/mapviewer/reactome/ReactomeTestFunctions.java @@ -55,6 +55,7 @@ import org.xml.sax.SAXException; "/applicationContext-reactome.xml", // "/applicationContext-persist.xml", // "/test-applicationContext.xml", // + "/dataSource.xml", // }) @RunWith(SpringJUnit4ClassRunner.class) public abstract class ReactomeTestFunctions { diff --git a/rest-api/src/test/java/lcsb/mapviewer/api/RestTestFunctions.java b/rest-api/src/test/java/lcsb/mapviewer/api/RestTestFunctions.java index af2f8dcf61..504d6a7f6f 100644 --- a/rest-api/src/test/java/lcsb/mapviewer/api/RestTestFunctions.java +++ b/rest-api/src/test/java/lcsb/mapviewer/api/RestTestFunctions.java @@ -63,8 +63,12 @@ import lcsb.mapviewer.services.view.AuthenticationToken; @Transactional(value = "txManager") @Rollback(true) -@ContextConfiguration( - locations = { "/applicationContext-persist.xml", "/applicationContext-annotation.xml", "/applicationContext-service.xml", "/applicationContext-rest.xml" }) +@ContextConfiguration(locations = { "/applicationContext-persist.xml", // + "/applicationContext-annotation.xml", // + "/applicationContext-service.xml", // + "/applicationContext-rest.xml", // + "/dataSource.xml", // +}) @RunWith(SpringJUnit4ClassRunner.class) public abstract class RestTestFunctions { private Logger logger = Logger.getLogger(RestTestFunctions.class); @@ -200,9 +204,9 @@ public abstract class RestTestFunctions { complexParams.entry(entry4); complexParams.entry(entry5); - Model model =parser.createModel(complexParams); + Model model = parser.createModel(complexParams); model.setTileSize(256); - for (ModelSubmodelConnection connection: model.getSubmodelConnections()) { + for (ModelSubmodelConnection connection : model.getSubmodelConnections()) { connection.getSubmodel().setTileSize(256); } model.setProject(new Project()); diff --git a/service/src/test/java/lcsb/mapviewer/services/ServiceTestFunctions.java b/service/src/test/java/lcsb/mapviewer/services/ServiceTestFunctions.java index 869300e088..be7a28143e 100644 --- a/service/src/test/java/lcsb/mapviewer/services/ServiceTestFunctions.java +++ b/service/src/test/java/lcsb/mapviewer/services/ServiceTestFunctions.java @@ -83,7 +83,11 @@ import lcsb.mapviewer.services.search.db.drug.IDrugService; @Transactional(value = "txManager") @Rollback(false) -@ContextConfiguration(locations = { "/applicationContext-annotation.xml", "/applicationContext-persist.xml", "/applicationContext-service.xml" }) +@ContextConfiguration(locations = { "/applicationContext-annotation.xml", // + "/applicationContext-persist.xml", // + "/applicationContext-service.xml", // + "/dataSource.xml", // +}) @RunWith(SpringJUnit4ClassRunner.class) public abstract class ServiceTestFunctions { private Logger logger = Logger.getLogger(ServiceTestFunctions.class); @@ -178,7 +182,7 @@ public abstract class ServiceTestFunctions { protected ReactionDao reactionDao; @Autowired - protected ElementDao aliasDao; + protected ElementDao aliasDao; protected User user; protected User user2 = null; diff --git a/web/src/main/webapp/WEB-INF/web.xml b/web/src/main/webapp/WEB-INF/web.xml index d794ecf3da..9b6aa5e3e0 100644 --- a/web/src/main/webapp/WEB-INF/web.xml +++ b/web/src/main/webapp/WEB-INF/web.xml @@ -18,6 +18,7 @@ classpath:applicationContext-persist.xml classpath:applicationContext-rest.xml classpath:applicationContext-service.xml + classpath:dataSource.xml </param-value> </context-param> <context-param> diff --git a/web/src/test/java/lcsb/mapviewer/bean/WebTestFunctions.java b/web/src/test/java/lcsb/mapviewer/bean/WebTestFunctions.java index 35be882426..fccf8ea97f 100644 --- a/web/src/test/java/lcsb/mapviewer/bean/WebTestFunctions.java +++ b/web/src/test/java/lcsb/mapviewer/bean/WebTestFunctions.java @@ -86,7 +86,11 @@ import lcsb.mapviewer.services.view.ModelViewFactory; @Transactional(value = "txManager") @Rollback(true) -@ContextConfiguration(locations = { "/applicationContext-persist.xml", "/applicationContext-annotation.xml", "/applicationContext-service.xml" }) +@ContextConfiguration(locations = { "/applicationContext-persist.xml", // + "/applicationContext-annotation.xml", // + "/applicationContext-service.xml", // + "/dataSource.xml", // +}) @RunWith(SpringJUnit4ClassRunner.class) public abstract class WebTestFunctions { private Logger logger = Logger.getLogger(WebTestFunctions.class); @@ -184,7 +188,7 @@ public abstract class WebTestFunctions { protected ReactionDao reactionDao; @Autowired - protected ElementDao aliasDao; + protected ElementDao aliasDao; @Autowired protected ModelViewFactory modelViewFactory; -- GitLab