Menu
▾
▴
treebase-guts — Commit and tracker messages
You can subscribe to this list here.
| 2009 |
Jan
|
Feb
|
Mar
(1) |
Apr
(14) |
May
(36) |
Jun
(148) |
Jul
(33) |
Aug
(2) |
Sep
(17) |
Oct
(42) |
Nov
(137) |
Dec
(88) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2010 |
Jan
(89) |
Feb
(80) |
Mar
(217) |
Apr
(76) |
May
(5) |
Jun
(39) |
Jul
(35) |
Aug
(4) |
Sep
(7) |
Oct
(14) |
Nov
(12) |
Dec
(9) |
| 2011 |
Jan
(6) |
Feb
(4) |
Mar
(11) |
Apr
(55) |
May
(90) |
Jun
(39) |
Jul
(15) |
Aug
(15) |
Sep
(23) |
Oct
(12) |
Nov
(17) |
Dec
(20) |
| 2012 |
Jan
(22) |
Feb
(63) |
Mar
|
Apr
(1) |
May
(6) |
Jun
(3) |
Jul
(1) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
(3) |
Feb
(6) |
Mar
|
Apr
|
May
|
Jun
(4) |
Jul
(1) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
(7) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <rv...@us...> - 2009-11-30 10:41:17
|
Revision: 331
http://treebase.svn.sourceforge.net/treebase/?rev=331&view=rev
Author: rvos
Date: 2009-11-30 10:41:09 +0000 (Mon, 30 Nov 2009)
Log Message:
-----------
Set hibernate log level to debug, to show SQL statements
Modified Paths:
--------------
trunk/treebase-core/src/main/resources/log4j.xml
Modified: trunk/treebase-core/src/main/resources/log4j.xml
===================================================================
--- trunk/treebase-core/src/main/resources/log4j.xml 2009-11-30 10:25:20 UTC (rev 330)
+++ trunk/treebase-core/src/main/resources/log4j.xml 2009-11-30 10:41:09 UTC (rev 331)
@@ -49,9 +49,9 @@
</logger>
<!-- show SQL statement -->
- <!--logger name="org.hibernate.SQL">
+ <logger name="org.hibernate.SQL">
<level value="debug"/>
- </logger-->
+ </logger>
<!-- show jdbc -->
<!--logger name="org.hibernate.jdbc">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rv...@us...> - 2009-11-30 10:25:30
|
Revision: 330
http://treebase.svn.sourceforge.net/treebase/?rev=330&view=rev
Author: rvos
Date: 2009-11-30 10:25:20 +0000 (Mon, 30 Nov 2009)
Log Message:
-----------
Recalculated sequence restart values
Modified Paths:
--------------
trunk/treebase-core/src/main/resources/TBASE2_POSTGRES_CREATION.sql
Modified: trunk/treebase-core/src/main/resources/TBASE2_POSTGRES_CREATION.sql
===================================================================
--- trunk/treebase-core/src/main/resources/TBASE2_POSTGRES_CREATION.sql 2009-11-25 17:15:46 UTC (rev 329)
+++ trunk/treebase-core/src/main/resources/TBASE2_POSTGRES_CREATION.sql 2009-11-30 10:25:20 UTC (rev 330)
@@ -1,1723 +1,3 @@
-/*
---Script generated by Aqua Data Studio 6.5.12 on Jun-12-2009 12:30:24 AM
---Database: TBASE2
---Schema: JRUAN
---Objects: TABLE
-*/
--- ALTER TABLE JRUAN.USERTYPERRD_COLRANGE
--- DROP CONSTRAINT FK405805DDC009330E
--- GO
--- ALTER TABLE JRUAN.USERTYPERRD_COLRANGE
--- DROP CONSTRAINT FK405805DD79A523E6
--- GO
--- ALTER TABLE JRUAN.USERTYPERECORD
--- DROP CONSTRAINT FK136AF61692E6A38E
--- GO
--- ALTER TABLE JRUAN.USERTYPERECORD
--- DROP CONSTRAINT FK136AF6164D737E46
--- GO
--- ALTER TABLE JRUAN.USER
--- DROP CONSTRAINT FK27E3CBF59DD12
--- GO
--- ALTER TABLE JRUAN.USER
--- DROP CONSTRAINT FK27E3CBE3910672
--- GO
--- ALTER TABLE JRUAN.TYPESET
--- DROP CONSTRAINT FKF7F2B6C8A414944F
--- GO
--- ALTER TABLE JRUAN.TREESET_PHYLOTREE
--- DROP CONSTRAINT FK31FC19A7EC59B1E3
--- GO
--- ALTER TABLE JRUAN.TREESET_PHYLOTREE
--- DROP CONSTRAINT FK31FC19A7B710CB23
--- GO
--- ALTER TABLE JRUAN.TREENODEEDGE
--- DROP CONSTRAINT FK7767285D27FD0589
--- GO
--- ALTER TABLE JRUAN.TREENODEEDGE
--- DROP CONSTRAINT FK7767285D1851763B
--- GO
--- ALTER TABLE JRUAN.TREEGROUP
--- DROP CONSTRAINT FKA870258180CBD223
--- GO
--- ALTER TABLE JRUAN.TREEGROUP_PHYLOTREE
--- DROP CONSTRAINT FKFB7D704B710CB23
--- GO
--- ALTER TABLE JRUAN.TREEGROUP_PHYLOTREE
--- DROP CONSTRAINT FKFB7D7045E56A83
--- GO
--- ALTER TABLE JRUAN.TREEBLOCK
--- DROP CONSTRAINT FKA826F38FE310471D
--- GO
--- ALTER TABLE JRUAN.TAXONVARIANT
--- DROP CONSTRAINT FKEE3D127B1DE2FCDD
--- GO
--- ALTER TABLE JRUAN.TAXONSET_TAXON
--- DROP CONSTRAINT FKC656C9031DE2FCDD
--- GO
--- ALTER TABLE JRUAN.TAXONSET_TAXON
--- DROP CONSTRAINT FKC656C90313C28457
--- GO
--- ALTER TABLE JRUAN.TAXONLINK
--- DROP CONSTRAINT FKC102D9A43BF5F2F7
--- GO
--- ALTER TABLE JRUAN.TAXONLINK
--- DROP CONSTRAINT FKC102D9A41DE2FCDD
--- GO
--- ALTER TABLE JRUAN.TAXONLABELSET
--- DROP CONSTRAINT FK28D3A5983C572C3C
--- GO
--- ALTER TABLE JRUAN.TAXONLABELSET_TAXONLABEL
--- DROP CONSTRAINT FK2EB54B71E310471D
--- GO
--- ALTER TABLE JRUAN.TAXONLABELSET_TAXONLABEL
--- DROP CONSTRAINT FK2EB54B7163AB9FD7
--- GO
--- ALTER TABLE JRUAN.TAXONLABELROUP_TAXONLABEL
--- DROP CONSTRAINT FK4B1D0BC763AB9FD7
--- GO
--- ALTER TABLE JRUAN.TAXONLABELROUP_TAXONLABEL
--- DROP CONSTRAINT FK4B1D0BC7294B993D
--- GO
--- ALTER TABLE JRUAN.TAXONLABELGROUP
--- DROP CONSTRAINT FK4AE2663513A813DD
--- GO
--- ALTER TABLE JRUAN.TAXONLABEL
--- DROP CONSTRAINT FK5F548A6A3C572C3C
--- GO
--- ALTER TABLE JRUAN.TAXONLABEL
--- DROP CONSTRAINT FK5F548A6A3C1B6F7
--- GO
--- ALTER TABLE JRUAN.SUBMISSION
--- DROP CONSTRAINT FKA120274CBEF300B2
--- GO
--- ALTER TABLE JRUAN.SUBMISSION
--- DROP CONSTRAINT FKA120274C3C572C3C
--- GO
--- ALTER TABLE JRUAN.SUB_TREEBLOCK
--- DROP CONSTRAINT FK94D50830BFD107C3
--- GO
--- ALTER TABLE JRUAN.SUB_TREEBLOCK
--- DROP CONSTRAINT FK94D508308DFE4858
--- GO
--- ALTER TABLE JRUAN.SUB_TAXONLABEL
--- DROP CONSTRAINT FK86909E98DFE4858
--- GO
--- ALTER TABLE JRUAN.SUB_TAXONLABEL
--- DROP CONSTRAINT FK86909E963AB9FD7
--- GO
--- ALTER TABLE JRUAN.SUB_MATRIX
--- DROP CONSTRAINT FK5F26A2C08DFE4858
--- GO
--- ALTER TABLE JRUAN.SUB_MATRIX
--- DROP CONSTRAINT FK5F26A2C055961AEE
--- GO
--- ALTER TABLE JRUAN.STUDY
--- DROP CONSTRAINT FK4B915A9BEF300B2
--- GO
--- ALTER TABLE JRUAN.STUDY
--- DROP CONSTRAINT FK4B915A98E1E4DF8
--- GO
--- ALTER TABLE JRUAN.STUDY
--- DROP CONSTRAINT FK4B915A9255A519C
--- GO
--- ALTER TABLE JRUAN.STUDY_NEXUSFILE
--- DROP CONSTRAINT FK47FC1EE53C572C3C
--- GO
--- ALTER TABLE JRUAN.STEPMATRIXELEMENT
--- DROP CONSTRAINT FK891100AF9E8198E
--- GO
--- ALTER TABLE JRUAN.STEPMATRIXELEMENT
--- DROP CONSTRAINT FK891100AF6E979EE7
--- GO
--- ALTER TABLE JRUAN.STEPMATRIXELEMENT
--- DROP CONSTRAINT FK891100AF6E972A88
--- GO
--- ALTER TABLE JRUAN.STATESET
--- DROP CONSTRAINT FK7D38523150CBAB47
--- GO
--- ALTER TABLE JRUAN.STATEMODIFIER
--- DROP CONSTRAINT FKD157BE48F4803CE6
--- GO
--- ALTER TABLE JRUAN.STATEMODIFIER
--- DROP CONSTRAINT FKD157BE48BED40086
--- GO
--- ALTER TABLE JRUAN.STATEMODIFIER
--- DROP CONSTRAINT FKD157BE48459091E5
--- GO
--- ALTER TABLE JRUAN.SPECIMENLABEL
--- DROP CONSTRAINT FK1E8F38CCA2039B9D
--- GO
--- ALTER TABLE JRUAN.ROWSEGMENT
--- DROP CONSTRAINT FKEE9AE819E7B3CDA6
--- GO
--- ALTER TABLE JRUAN.ROWSEGMENT
--- DROP CONSTRAINT FKEE9AE81963AB9FD7
--- GO
--- ALTER TABLE JRUAN.RIGHTCHANGESET_CHARSTATE
--- DROP CONSTRAINT FKC8AFC9F2F4803CE6
--- GO
--- ALTER TABLE JRUAN.RIGHTCHANGESET_CHARSTATE
--- DROP CONSTRAINT FKC8AFC9F275763EAE
--- GO
--- ALTER TABLE JRUAN.PHYLOTREENODE
--- DROP CONSTRAINT FK3EA79944B710CB23
--- GO
--- ALTER TABLE JRUAN.PHYLOTREENODE
--- DROP CONSTRAINT FK3EA7994463AB9FD7
--- GO
--- ALTER TABLE JRUAN.PHYLOTREENODE
--- DROP CONSTRAINT FK3EA799445BCC767D
--- GO
--- ALTER TABLE JRUAN.PHYLOTREENODE
--- DROP CONSTRAINT FK3EA79944434FDCCB
--- GO
--- ALTER TABLE JRUAN.PHYLOTREENODE
--- DROP CONSTRAINT FK3EA799443C348165
--- GO
--- ALTER TABLE JRUAN.PHYLOTREENODE
--- DROP CONSTRAINT FK3EA79944271A5763
--- GO
--- ALTER TABLE JRUAN.PHYLOTREE
--- DROP CONSTRAINT FK76F2E442FE2812F1
--- GO
--- ALTER TABLE JRUAN.PHYLOTREE
--- DROP CONSTRAINT FK76F2E442F5AEA931
--- GO
--- ALTER TABLE JRUAN.PHYLOTREE
--- DROP CONSTRAINT FK76F2E442F3D1CF03
--- GO
--- ALTER TABLE JRUAN.PHYLOTREE
--- DROP CONSTRAINT FK76F2E442EA08B443
--- GO
--- ALTER TABLE JRUAN.PHYLOTREE
--- DROP CONSTRAINT FK76F2E442BFD107C3
--- GO
--- ALTER TABLE JRUAN.PHYLOTREE
--- DROP CONSTRAINT FK76F2E442A3015CE3
--- GO
--- ALTER TABLE JRUAN.PHYLOTREE
--- DROP CONSTRAINT FK76F2E4423C572C3C
--- GO
--- ALTER TABLE JRUAN.MATRIXROW
--- DROP CONSTRAINT FKE4688E59A414944F
--- GO
--- ALTER TABLE JRUAN.MATRIXROW
--- DROP CONSTRAINT FKE4688E5963AB9FD7
--- GO
--- ALTER TABLE JRUAN.MATRIXELEMENT
--- DROP CONSTRAINT FK90AE93FBF4803CE6
--- GO
--- ALTER TABLE JRUAN.MATRIXELEMENT
--- DROP CONSTRAINT FK90AE93FBE7B3CDA6
--- GO
--- ALTER TABLE JRUAN.MATRIXELEMENT
--- DROP CONSTRAINT FK90AE93FB8B2E884E
--- GO
--- ALTER TABLE JRUAN.MATRIXELEMENT
--- DROP CONSTRAINT FK90AE93FB405A7CEE
--- GO
--- ALTER TABLE JRUAN.MATRIXDATATYPE
--- DROP CONSTRAINT FKF054C4A5F5DECA46
--- GO
--- ALTER TABLE JRUAN.MATRIXCOLUMN
--- DROP CONSTRAINT FK9B0BE57F5DECA46
--- GO
--- ALTER TABLE JRUAN.MATRIXCOLUMN
--- DROP CONSTRAINT FK9B0BE57BED40086
--- GO
--- ALTER TABLE JRUAN.MATRIXCOLUMN
--- DROP CONSTRAINT FK9B0BE57A414944F
--- GO
--- ALTER TABLE JRUAN.MATRIXCOLUMN_ITEMDEFINITION
--- DROP CONSTRAINT FKB556F8E8B2E884E
--- GO
--- ALTER TABLE JRUAN.MATRIXCOLUMN_ITEMDEFINITION
--- DROP CONSTRAINT FKB556F8E405A7CEE
--- GO
--- ALTER TABLE JRUAN.MATRIX
--- DROP CONSTRAINT FK87208BC1E9B425A6
--- GO
--- ALTER TABLE JRUAN.MATRIX
--- DROP CONSTRAINT FK87208BC1E310471D
--- GO
--- ALTER TABLE JRUAN.MATRIX
--- DROP CONSTRAINT FK87208BC191BD3C8E
--- GO
--- ALTER TABLE JRUAN.MATRIX
--- DROP CONSTRAINT FK87208BC1684F6406
--- GO
--- ALTER TABLE JRUAN.MATRIX
--- DROP CONSTRAINT FK87208BC14D737E46
--- GO
--- ALTER TABLE JRUAN.MATRIX
--- DROP CONSTRAINT FK87208BC14CE484AE
--- GO
--- ALTER TABLE JRUAN.MATRIX
--- DROP CONSTRAINT FK87208BC1491DB20E
--- GO
--- ALTER TABLE JRUAN.MATRIX
--- DROP CONSTRAINT FK87208BC145534A9C
--- GO
--- ALTER TABLE JRUAN.MATRIX
--- DROP CONSTRAINT FK87208BC13C572C3C
--- GO
--- ALTER TABLE JRUAN.MATRIX_ITEMDEFINITION
--- DROP CONSTRAINT FK5717E0E4AC5C19DD
--- GO
--- ALTER TABLE JRUAN.MATRIX_ITEMDEFINITION
--- DROP CONSTRAINT FK5717E0E4405A7CEE
--- GO
--- ALTER TABLE JRUAN.LEFTCHANGESET_CHARSTATE
--- DROP CONSTRAINT FKC8877207F4803CE6
--- GO
--- ALTER TABLE JRUAN.LEFTCHANGESET_CHARSTATE
--- DROP CONSTRAINT FKC887720775763EAE
--- GO
--- ALTER TABLE JRUAN.ITEMVALUE
--- DROP CONSTRAINT FK27B41A1E459091E5
--- GO
--- ALTER TABLE JRUAN.GENETICCODESET
--- DROP CONSTRAINT FK6A12F7DCA414944F
--- GO
--- ALTER TABLE JRUAN.GENETICCODERECORD
--- DROP CONSTRAINT FK237932B782D8ECCE
--- GO
--- ALTER TABLE JRUAN.GENETICCODERECORD
--- DROP CONSTRAINT FK237932B76CB73FC6
--- GO
--- ALTER TABLE JRUAN.EXPLAIN_STREAM
--- DROP CONSTRAINT SQL050919121811070
--- GO
--- ALTER TABLE JRUAN.EXPLAIN_STATEMENT
--- DROP CONSTRAINT SQL050919121810950
--- GO
--- ALTER TABLE JRUAN.EXPLAIN_PREDICATE
--- DROP CONSTRAINT SQL050919121811040
--- GO
--- ALTER TABLE JRUAN.EXPLAIN_OPERATOR
--- DROP CONSTRAINT SQL050919121810970
--- GO
--- ALTER TABLE JRUAN.EXPLAIN_OBJECT
--- DROP CONSTRAINT SQL050919121811000
--- GO
--- ALTER TABLE JRUAN.EXPLAIN_ARGUMENT
--- DROP CONSTRAINT SQL050919121811060
--- GO
--- ALTER TABLE JRUAN.DISTANCEMATRIXELEMENT
--- DROP CONSTRAINT FK92D3DDE6C1429863
--- GO
--- ALTER TABLE JRUAN.DISTANCEMATRIXELEMENT
--- DROP CONSTRAINT FK92D3DDE64B8EF343
--- GO
--- ALTER TABLE JRUAN.DISTANCEMATRIXELEMENT
--- DROP CONSTRAINT FK92D3DDE61F08BAE7
--- GO
--- ALTER TABLE JRUAN.DISCRETECHARSTATE
--- DROP CONSTRAINT FK2EEF2802FE41A723
--- GO
--- ALTER TABLE JRUAN.DISCRETECHARSTATE
--- DROP CONSTRAINT FK2EEF2802C7BEAAFE
--- GO
--- ALTER TABLE JRUAN.DISCRETECHARSTATE
--- DROP CONSTRAINT FK2EEF2802163C67CE
--- GO
--- ALTER TABLE JRUAN.CSTREENODE
--- DROP CONSTRAINT FK82B9AB10F572A92
--- GO
--- ALTER TABLE JRUAN.CSTREENODE
--- DROP CONSTRAINT FK82B9AB10F4803CE6
--- GO
--- ALTER TABLE JRUAN.CSTREENODE
--- DROP CONSTRAINT FK82B9AB10C6999FCE
--- GO
--- ALTER TABLE JRUAN.CONTANCSTATE_VALUE
--- DROP CONSTRAINT FKA84B8C3FD450D2BD
--- GO
--- ALTER TABLE JRUAN.COMPOUND_ELEMENT
--- DROP CONSTRAINT FK311830485F4F7CEB
--- GO
--- ALTER TABLE JRUAN.COMPOUND_ELEMENT
--- DROP CONSTRAINT FK31183048459091E5
--- GO
--- ALTER TABLE JRUAN.CODONPOSITIONSET
--- DROP CONSTRAINT FK4E501CC2A414944F
--- GO
--- ALTER TABLE JRUAN.CODONNONCODING_COLRANGE
--- DROP CONSTRAINT FK307897FC79A523E6
--- GO
--- ALTER TABLE JRUAN.CODONNONCODING_COLRANGE
--- DROP CONSTRAINT FK307897FC491DB20E
--- GO
--- ALTER TABLE JRUAN.CODONCHAR3_COLRANGE
--- DROP CONSTRAINT FKC2EDB73679A523E6
--- GO
--- ALTER TABLE JRUAN.CODONCHAR3_COLRANGE
--- DROP CONSTRAINT FKC2EDB736491DB20E
--- GO
--- ALTER TABLE JRUAN.CODONCHAR2_COLRANGE
--- DROP CONSTRAINT FKCEA4461779A523E6
--- GO
--- ALTER TABLE JRUAN.CODONCHAR2_COLRANGE
--- DROP CONSTRAINT FKCEA44617491DB20E
--- GO
--- ALTER TABLE JRUAN.CODONCHAR1_COLRANGE
--- DROP CONSTRAINT FKDA5AD4F879A523E6
--- GO
--- ALTER TABLE JRUAN.CODONCHAR1_COLRANGE
--- DROP CONSTRAINT FKDA5AD4F8491DB20E
--- GO
--- ALTER TABLE JRUAN.CODERECORD_COLRANGE
--- DROP CONSTRAINT FKA3E6C61EDC51C546
--- GO
--- ALTER TABLE JRUAN.CODERECORD_COLRANGE
--- DROP CONSTRAINT FKA3E6C61E79A523E6
--- GO
--- ALTER TABLE JRUAN.CITATION
--- DROP CONSTRAINT FKD8A7FAE74C983658
--- GO
--- ALTER TABLE JRUAN.CITATION_EDITOR
--- DROP CONSTRAINT FK2A8955C5EC93F501
--- GO
--- ALTER TABLE JRUAN.CITATION_EDITOR
--- DROP CONSTRAINT FK2A8955C568F6F619
--- GO
--- ALTER TABLE JRUAN.CITATION_AUTHOR
--- DROP CONSTRAINT FK24AA55E38E1E4DF8
--- GO
--- ALTER TABLE JRUAN.CITATION_AUTHOR
--- DROP CONSTRAINT FK24AA55E36707573B
--- GO
--- ALTER TABLE JRUAN.CHARWEIGHTSET
--- DROP CONSTRAINT FK99B8AC34A414944F
--- GO
--- ALTER TABLE JRUAN.CHARWEIGHT
--- DROP CONSTRAINT FK8CC7694EE9B425A6
--- GO
--- ALTER TABLE JRUAN.CHARWEIGHT_COLRANGE
--- DROP CONSTRAINT FK54CA674EF9A75EE
--- GO
--- ALTER TABLE JRUAN.CHARWEIGHT_COLRANGE
--- DROP CONSTRAINT FK54CA674E79A523E6
--- GO
--- ALTER TABLE JRUAN.CHARSET
--- DROP CONSTRAINT FK56D8ED2CA414944F
--- GO
--- ALTER TABLE JRUAN.CHARSET_COLRANGE
--- DROP CONSTRAINT FK2CBD9079A523E6
--- GO
--- ALTER TABLE JRUAN.CHARSET_COLRANGE
--- DROP CONSTRAINT FK2CBD90416D5B50
--- GO
--- ALTER TABLE JRUAN.CHARPARTITION
--- DROP CONSTRAINT FKDEA9F834A414944F
--- GO
--- ALTER TABLE JRUAN.CHARGROUP
--- DROP CONSTRAINT FK3AF18C91AA11DC6
--- GO
--- ALTER TABLE JRUAN.CHARGROUP_COLRANGE
--- DROP CONSTRAINT FKB2D8C293971FFFA6
--- GO
--- ALTER TABLE JRUAN.CHARGROUP_COLRANGE
--- DROP CONSTRAINT FKB2D8C29379A523E6
--- GO
--- ALTER TABLE JRUAN.ANCSTATESET
--- DROP CONSTRAINT FK879339E7A414944F
--- GO
--- ALTER TABLE JRUAN.ANCESTRALSTATE
--- DROP CONSTRAINT FK3FA14284F4803CE6
--- GO
--- ALTER TABLE JRUAN.ANCESTRALSTATE
--- DROP CONSTRAINT FK3FA14284684F6406
--- GO
--- ALTER TABLE JRUAN.ANALYZEDDATA
--- DROP CONSTRAINT FK8C961842B710CB23
--- GO
--- ALTER TABLE JRUAN.ANALYZEDDATA
--- DROP CONSTRAINT FK8C96184255961AEE
--- GO
--- ALTER TABLE JRUAN.ANALYZEDDATA
--- DROP CONSTRAINT FK8C9618424BA97F78
--- GO
--- ALTER TABLE JRUAN.ANALYSISSTEP
--- DROP CONSTRAINT FK21F853A8D1884DD8
--- GO
--- ALTER TABLE JRUAN.ANALYSISSTEP
--- DROP CONSTRAINT FK21F853A865EDD5F8
--- GO
--- ALTER TABLE JRUAN.ANALYSISSTEP
--- DROP CONSTRAINT FK21F853A848A2817C
--- GO
--- ALTER TABLE JRUAN.ANALYSIS
--- DROP CONSTRAINT FKF19622DC3C572C3C
--- GO
--- ALTER TABLE JRUAN.ALGORITHM
--- DROP CONSTRAINT FKB388C44FC6E814E6
--- GO
--- ALTER TABLE JRUAN.ALGORITHM
--- DROP CONSTRAINT FKB388C44F9698D32E
--- GO
--- ALTER TABLE JRUAN.ALGORITHM
--- DROP CONSTRAINT FKB388C44F92E6A38E
--- GO
--- ALTER TABLE JRUAN.USERTYPERRD_COLRANGE
--- DROP CONSTRAINT SQL081219134227270
--- GO
--- ALTER TABLE JRUAN.USER
--- DROP CONSTRAINT SQL081219134226851
--- GO
--- ALTER TABLE JRUAN.SUBMISSION
--- DROP CONSTRAINT SQL081219134223811
--- GO
--- ALTER TABLE JRUAN.SUB_TREEBLOCK
--- DROP CONSTRAINT SQL081219134224130
--- GO
--- ALTER TABLE JRUAN.SUB_TAXONLABEL
--- DROP CONSTRAINT SQL081219134224030
--- GO
--- ALTER TABLE JRUAN.SUB_MATRIX
--- DROP CONSTRAINT SQL081219134223920
--- GO
--- ALTER TABLE JRUAN.COMPOUND_ELEMENT
--- DROP CONSTRAINT SQL081219134219010
--- GO
--- ALTER TABLE JRUAN.CODONNONCODING_COLRANGE
--- DROP CONSTRAINT SQL081219134220010
--- GO
--- ALTER TABLE JRUAN.CODONCHAR3_COLRANGE
--- DROP CONSTRAINT SQL081219134219910
--- GO
--- ALTER TABLE JRUAN.CODONCHAR2_COLRANGE
--- DROP CONSTRAINT SQL081219134219810
--- GO
--- ALTER TABLE JRUAN.CODONCHAR1_COLRANGE
--- DROP CONSTRAINT SQL081219134219710
--- GO
--- ALTER TABLE JRUAN.CODERECORD_COLRANGE
--- DROP CONSTRAINT SQL081219134219610
--- GO
--- ALTER TABLE JRUAN.CHARWEIGHT_COLRANGE
--- DROP CONSTRAINT SQL081219134219510
--- GO
--- ALTER TABLE JRUAN.CHARSET_COLRANGE
--- DROP CONSTRAINT SQL081219134219400
--- GO
--- ALTER TABLE JRUAN.CHARGROUP_COLRANGE
--- DROP CONSTRAINT SQL081219134219300
--- GO
--- ALTER TABLE JRUAN.USERTYPERECORD
--- DROP CONSTRAINT SQL081219134227170
--- GO
--- ALTER TABLE JRUAN.USERTYPE
--- DROP CONSTRAINT SQL081219134227060
--- GO
--- ALTER TABLE JRUAN.USERROLE
--- DROP CONSTRAINT SQL081219134226960
--- GO
--- ALTER TABLE JRUAN.USER
--- DROP CONSTRAINT SQL081219134226850
--- GO
--- ALTER TABLE JRUAN.TYPESET
--- DROP CONSTRAINT SQL081219134226550
--- GO
--- ALTER TABLE JRUAN.TREETYPE
--- DROP CONSTRAINT SQL081219134226440
--- GO
--- ALTER TABLE JRUAN.TREESET
--- DROP CONSTRAINT SQL081219134226240
--- GO
--- ALTER TABLE JRUAN.TREESET_PHYLOTREE
--- DROP CONSTRAINT SQL081219134226340
--- GO
--- ALTER TABLE JRUAN.TREEQUALITY
--- DROP CONSTRAINT SQL081219134226140
--- GO
--- ALTER TABLE JRUAN.TREEPARTITION
--- DROP CONSTRAINT SQL081219134226040
--- GO
--- ALTER TABLE JRUAN.TREENODEEDGE
--- DROP CONSTRAINT SQL081219134225930
--- GO
--- ALTER TABLE JRUAN.TREEKIND
--- DROP CONSTRAINT SQL081219134225820
--- GO
--- ALTER TABLE JRUAN.TREEGROUP
--- DROP CONSTRAINT SQL081219134225620
--- GO
--- ALTER TABLE JRUAN.TREEGROUP_PHYLOTREE
--- DROP CONSTRAINT SQL081219134225720
--- GO
--- ALTER TABLE JRUAN.TREEBLOCK
--- DROP CONSTRAINT SQL081219134225510
--- GO
--- ALTER TABLE JRUAN.TREEATTRIBUTE
--- DROP CONSTRAINT SQL081219134225410
--- GO
--- ALTER TABLE JRUAN.TAXONVARIANT
--- DROP CONSTRAINT SQL081219134225250
--- GO
--- ALTER TABLE JRUAN.TAXONSET
--- DROP CONSTRAINT SQL081219134225050
--- GO
--- ALTER TABLE JRUAN.TAXONSET_TAXON
--- DROP CONSTRAINT SQL081219134225150
--- GO
--- ALTER TABLE JRUAN.TAXONLINK
--- DROP CONSTRAINT SQL081219134224950
--- GO
--- ALTER TABLE JRUAN.TAXONLABELSET
--- DROP CONSTRAINT SQL081219134226650
--- GO
--- ALTER TABLE JRUAN.TAXONLABELSET_TAXONLABEL
--- DROP CONSTRAINT SQL081219134226750
--- GO
--- ALTER TABLE JRUAN.TAXONLABELPARTITION
--- DROP CONSTRAINT SQL081219134224760
--- GO
--- ALTER TABLE JRUAN.TAXONLABELGROUP
--- DROP CONSTRAINT SQL081219134224650
--- GO
--- ALTER TABLE JRUAN.TAXONLABEL
--- DROP CONSTRAINT SQL081219134224550
--- GO
--- ALTER TABLE JRUAN.TAXONAUTHORITY
--- DROP CONSTRAINT SQL081219134224450
--- GO
--- ALTER TABLE JRUAN.TAXON
--- DROP CONSTRAINT SQL081219134224350
--- GO
--- ALTER TABLE JRUAN.SUBMISSION
--- DROP CONSTRAINT SQL081219134223810
--- GO
--- ALTER TABLE JRUAN.SUB_TREEBLOCK
--- DROP CONSTRAINT SQL081219134224120
--- GO
--- ALTER TABLE JRUAN.SUB_TAXONLABEL
--- DROP CONSTRAINT SQL081219134224020
--- GO
--- ALTER TABLE JRUAN.SUB_MATRIX
--- DROP CONSTRAINT SQL081219134223910
--- GO
--- ALTER TABLE JRUAN.STUDYSTATUS
--- DROP CONSTRAINT SQL081219134223710
--- GO
--- ALTER TABLE JRUAN.STUDY
--- DROP CONSTRAINT SQL081219134223600
--- GO
--- ALTER TABLE JRUAN.STUDY_NEXUSFILE
--- DROP CONSTRAINT SQL081219134224240
--- GO
--- ALTER TABLE JRUAN.STEPMATRIXELEMENT
--- DROP CONSTRAINT SQL081219134223500
--- GO
--- ALTER TABLE JRUAN.STATESET
--- DROP CONSTRAINT SQL081219134223390
--- GO
--- ALTER TABLE JRUAN.STATEMODIFIER
--- DROP CONSTRAINT SQL081219134223290
--- GO
--- ALTER TABLE JRUAN.STATEFORMAT
--- DROP CONSTRAINT SQL081219134223190
--- GO
--- ALTER TABLE JRUAN.STATECHANGESET
--- DROP CONSTRAINT SQL081219134223070
--- GO
--- ALTER TABLE JRUAN.SPECIMENLABEL
--- DROP CONSTRAINT SQL080428163906480
--- GO
--- ALTER TABLE JRUAN.SOFTWARE
--- DROP CONSTRAINT SQL081219134222960
--- GO
--- ALTER TABLE JRUAN.ROWSEGMENT
--- DROP CONSTRAINT SQL081219134222850
--- GO
--- ALTER TABLE JRUAN.POLYTCOUNT
--- DROP CONSTRAINT SQL081219134222660
--- GO
--- ALTER TABLE JRUAN.PHYLOTREENODE
--- DROP CONSTRAINT SQL081219134222560
--- GO
--- ALTER TABLE JRUAN.PHYLOTREE
--- DROP CONSTRAINT SQL081219134222440
--- GO
--- ALTER TABLE JRUAN.PHYLOCHAR
--- DROP CONSTRAINT SQL081219134222330
--- GO
--- ALTER TABLE JRUAN.PERSON
--- DROP CONSTRAINT SQL081219134222230
--- GO
--- ALTER TABLE JRUAN.NODEATTRIBUTE
--- DROP CONSTRAINT SQL081219134222120
--- GO
--- ALTER TABLE JRUAN.MATRIXROW
--- DROP CONSTRAINT SQL081219134221900
--- GO
--- ALTER TABLE JRUAN.MATRIXKIND
--- DROP CONSTRAINT SQL081219134221790
--- GO
--- ALTER TABLE JRUAN.MATRIXELEMENT
--- DROP CONSTRAINT SQL081219134221690
--- GO
--- ALTER TABLE JRUAN.MATRIXDATATYPE
--- DROP CONSTRAINT SQL081219134221580
--- GO
--- ALTER TABLE JRUAN.MATRIXCOLUMN
--- DROP CONSTRAINT SQL081219134221370
--- GO
--- ALTER TABLE JRUAN.MATRIXCOLUMN_ITEMDEFINITION
--- DROP CONSTRAINT SQL081219134221470
--- GO
--- ALTER TABLE JRUAN.MATRIX
--- DROP CONSTRAINT SQL081219134221270
--- GO
--- ALTER TABLE JRUAN.MATRIX_ITEMDEFINITION
--- DROP CONSTRAINT SQL081219134222010
--- GO
--- ALTER TABLE JRUAN.ITEMVALUE
--- DROP CONSTRAINT SQL081219134221080
--- GO
--- ALTER TABLE JRUAN.ITEMDEFINITION
--- DROP CONSTRAINT SQL081219134220970
--- GO
--- ALTER TABLE JRUAN.HELP
--- DROP CONSTRAINT SQL081219134220860
--- GO
--- ALTER TABLE JRUAN.GEOSPOT
--- DROP CONSTRAINT SQL080428163906080
--- GO
--- ALTER TABLE JRUAN.GENETICCODESET
--- DROP CONSTRAINT SQL081219134220550
--- GO
--- ALTER TABLE JRUAN.GENETICCODERECORD
--- DROP CONSTRAINT SQL081219134220760
--- GO
--- ALTER TABLE JRUAN.GENETICCODE
--- DROP CONSTRAINT SQL081219134220650
--- GO
--- ALTER TABLE JRUAN.GAPMODE
--- DROP CONSTRAINT SQL081219134220440
--- GO
--- ALTER TABLE JRUAN.EXPLAIN_STATEMENT
--- DROP CONSTRAINT SQL050919121810940
--- GO
--- ALTER TABLE JRUAN.EXPLAIN_INSTANCE
--- DROP CONSTRAINT SQL050919121810910
--- GO
--- ALTER TABLE JRUAN.DISTANCEMATRIXELEMENT
--- DROP CONSTRAINT SQL081219134220330
--- GO
--- ALTER TABLE JRUAN.DISCRETECHARSTATE
--- DROP CONSTRAINT SQL081219134220230
--- GO
--- ALTER TABLE JRUAN.CSTREENODE
--- DROP CONSTRAINT SQL081219134219200
--- GO
--- ALTER TABLE JRUAN.COMPOUND_ELEMENT
--- DROP CONSTRAINT SQL081219134219000
--- GO
--- ALTER TABLE JRUAN.COLUMNRANGE
--- DROP CONSTRAINT SQL081219134218890
--- GO
--- ALTER TABLE JRUAN.CODONPOSITIONSET
--- DROP CONSTRAINT SQL081219134220130
--- GO
--- ALTER TABLE JRUAN.CITATIONSTATUS
--- DROP CONSTRAINT SQL081219134218570
--- GO
--- ALTER TABLE JRUAN.CITATION
--- DROP CONSTRAINT SQL081219134218470
--- GO
--- ALTER TABLE JRUAN.CITATION_EDITOR
--- DROP CONSTRAINT SQL081219134218780
--- GO
--- ALTER TABLE JRUAN.CITATION_AUTHOR
--- DROP CONSTRAINT SQL081219134218670
--- GO
--- ALTER TABLE JRUAN.CHARWEIGHTSET
--- DROP CONSTRAINT SQL081219134218310
--- GO
--- ALTER TABLE JRUAN.CHARWEIGHT
--- DROP CONSTRAINT SQL081219134218200
--- GO
--- ALTER TABLE JRUAN.CHARSET
--- DROP CONSTRAINT SQL081219134218100
--- GO
--- ALTER TABLE JRUAN.CHARPARTITION
--- DROP CONSTRAINT SQL081219134217990
--- GO
--- ALTER TABLE JRUAN.CHARGROUP
--- DROP CONSTRAINT SQL081219134217890
--- GO
--- ALTER TABLE JRUAN.ANCSTATESET
--- DROP CONSTRAINT SQL081219134217770
--- GO
--- ALTER TABLE JRUAN.ANCESTRALSTATE
--- DROP CONSTRAINT SQL081219134217670
--- GO
--- ALTER TABLE JRUAN.ANALYZEDDATA
--- DROP CONSTRAINT SQL081219134217570
--- GO
--- ALTER TABLE JRUAN.ANALYSISSTEP
--- DROP CONSTRAINT SQL081219134217470
--- GO
--- ALTER TABLE JRUAN.ANALYSIS
--- DROP CONSTRAINT SQL081219134217310
--- GO
--- ALTER TABLE JRUAN.ALGORITHM
--- DROP CONSTRAINT SQL081219134217210
--- GO
-/*
-ALTER TABLE USERTYPERRD_COLRANGE
- DROP CONSTRAINT FK405805DDC009330E;
-ALTER TABLE USERTYPERRD_COLRANGE
- DROP CONSTRAINT FK405805DD79A523E6;
-ALTER TABLE USERTYPERECORD
- DROP CONSTRAINT FK136AF61692E6A38E;
-ALTER TABLE USERTYPERECORD
- DROP CONSTRAINT FK136AF6164D737E46;
-ALTER TABLE "user"
- DROP CONSTRAINT FK27E3CBF59DD12;
-ALTER TABLE "user"
- DROP CONSTRAINT FK27E3CBE3910672;
-ALTER TABLE TYPESET
- DROP CONSTRAINT FKF7F2B6C8A414944F;
-ALTER TABLE TREESET_PHYLOTREE
- DROP CONSTRAINT FK31FC19A7EC59B1E3;
-ALTER TABLE TREESET_PHYLOTREE
- DROP CONSTRAINT FK31FC19A7B710CB23;
-ALTER TABLE TREENODEEDGE
- DROP CONSTRAINT FK7767285D27FD0589;
-ALTER TABLE TREENODEEDGE
- DROP CONSTRAINT FK7767285D1851763B;
-ALTER TABLE TREEGROUP
- DROP CONSTRAINT FKA870258180CBD223;
-ALTER TABLE TREEGROUP_PHYLOTREE
- DROP CONSTRAINT FKFB7D704B710CB23;
-ALTER TABLE TREEGROUP_PHYLOTREE
- DROP CONSTRAINT FKFB7D7045E56A83;
-ALTER TABLE TREEBLOCK
- DROP CONSTRAINT FKA826F38FE310471D;
-ALTER TABLE TAXONVARIANT
- DROP CONSTRAINT FKEE3D127B1DE2FCDD;
-ALTER TABLE TAXONSET_TAXON
- DROP CONSTRAINT FKC656C9031DE2FCDD;
-ALTER TABLE TAXONSET_TAXON
- DROP CONSTRAINT FKC656C90313C28457;
-ALTER TABLE TAXONLINK
- DROP CONSTRAINT FKC102D9A43BF5F2F7;
-ALTER TABLE TAXONLINK
- DROP CONSTRAINT FKC102D9A41DE2FCDD;
-ALTER TABLE TAXONLABELSET
- DROP CONSTRAINT FK28D3A5983C572C3C;
-ALTER TABLE TAXONLABELSET_TAXONLABEL
- DROP CONSTRAINT FK2EB54B71E310471D;
-ALTER TABLE TAXONLABELSET_TAXONLABEL
- DROP CONSTRAINT FK2EB54B7163AB9FD7;
-ALTER TABLE TAXONLABELROUP_TAXONLABEL
- DROP CONSTRAINT FK4B1D0BC763AB9FD7;
-ALTER TABLE TAXONLABELROUP_TAXONLABEL
- DROP CONSTRAINT FK4B1D0BC7294B993D;
-ALTER TABLE TAXONLABELGROUP
- DROP CONSTRAINT FK4AE2663513A813DD;
-ALTER TABLE TAXONLABEL
- DROP CONSTRAINT FK5F548A6A3C572C3C;
-ALTER TABLE TAXONLABEL
- DROP CONSTRAINT FK5F548A6A3C1B6F7;
-ALTER TABLE SUBMISSION
- DROP CONSTRAINT FKA120274CBEF300B2;
-ALTER TABLE SUBMISSION
- DROP CONSTRAINT FKA120274C3C572C3C;
-ALTER TABLE SUB_TREEBLOCK
- DROP CONSTRAINT FK94D50830BFD107C3;
-ALTER TABLE SUB_TREEBLOCK
- DROP CONSTRAINT FK94D508308DFE4858;
-ALTER TABLE SUB_TAXONLABEL
- DROP CONSTRAINT FK86909E98DFE4858;
-ALTER TABLE SUB_TAXONLABEL
- DROP CONSTRAINT FK86909E963AB9FD7;
-ALTER TABLE SUB_MATRIX
- DROP CONSTRAINT FK5F26A2C08DFE4858;
-ALTER TABLE SUB_MATRIX
- DROP CONSTRAINT FK5F26A2C055961AEE;
-ALTER TABLE STUDY
- DROP CONSTRAINT FK4B915A9BEF300B2;
-ALTER TABLE STUDY
- DROP CONSTRAINT FK4B915A98E1E4DF8;
-ALTER TABLE STUDY
- DROP CONSTRAINT FK4B915A9255A519C;
-ALTER TABLE STUDY_NEXUSFILE
- DROP CONSTRAINT FK47FC1EE53C572C3C;
-ALTER TABLE STEPMATRIXELEMENT
- DROP CONSTRAINT FK891100AF9E8198E;
-ALTER TABLE STEPMATRIXELEMENT
- DROP CONSTRAINT FK891100AF6E979EE7;
-ALTER TABLE STEPMATRIXELEMENT
- DROP CONSTRAINT FK891100AF6E972A88;
-ALTER TABLE STATESET
- DROP CONSTRAINT FK7D38523150CBAB47;
-ALTER TABLE STATEMODIFIER
- DROP CONSTRAINT FKD157BE48F4803CE6;
-ALTER TABLE STATEMODIFIER
- DROP CONSTRAINT FKD157BE48BED40086;
-ALTER TABLE STATEMODIFIER
- DROP CONSTRAINT FKD157BE48459091E5;
-ALTER TABLE SPECIMENLABEL
- DROP CONSTRAINT FK1E8F38CCA2039B9D;
-ALTER TABLE ROWSEGMENT
- DROP CONSTRAINT FKEE9AE819E7B3CDA6;
-ALTER TABLE ROWSEGMENT
- DROP CONSTRAINT FKEE9AE81963AB9FD7;
-ALTER TABLE RIGHTCHANGESET_CHARSTATE
- DROP CONSTRAINT FKC8AFC9F2F4803CE6;
-ALTER TABLE RIGHTCHANGESET_CHARSTATE
- DROP CONSTRAINT FKC8AFC9F275763EAE;
-ALTER TABLE PHYLOTREENODE
- DROP CONSTRAINT FK3EA79944B710CB23;
-ALTER TABLE PHYLOTREENODE
- DROP CONSTRAINT FK3EA7994463AB9FD7;
-ALTER TABLE PHYLOTREENODE
- DROP CONSTRAINT FK3EA799445BCC767D;
-ALTER TABLE PHYLOTREENODE
- DROP CONSTRAINT FK3EA79944434FDCCB;
-ALTER TABLE PHYLOTREENODE
- DROP CONSTRAINT FK3EA799443C348165;
-ALTER TABLE PHYLOTREENODE
- DROP CONSTRAINT FK3EA79944271A5763;
-ALTER TABLE PHYLOTREE
- DROP CONSTRAINT FK76F2E442FE2812F1;
-ALTER TABLE PHYLOTREE
- DROP CONSTRAINT FK76F2E442F5AEA931;
-ALTER TABLE PHYLOTREE
- DROP CONSTRAINT FK76F2E442F3D1CF03;
-ALTER TABLE PHYLOTREE
- DROP CONSTRAINT FK76F2E442EA08B443;
-ALTER TABLE PHYLOTREE
- DROP CONSTRAINT FK76F2E442BFD107C3;
-ALTER TABLE PHYLOTREE
- DROP CONSTRAINT FK76F2E442A3015CE3;
-ALTER TABLE PHYLOTREE
- DROP CONSTRAINT FK76F2E4423C572C3C;
-ALTER TABLE MATRIXROW
- DROP CONSTRAINT FKE4688E59A414944F;
-ALTER TABLE MATRIXROW
- DROP CONSTRAINT FKE4688E5963AB9FD7;
-ALTER TABLE MATRIXELEMENT
- DROP CONSTRAINT FK90AE93FBF4803CE6;
-ALTER TABLE MATRIXELEMENT
- DROP CONSTRAINT FK90AE93FBE7B3CDA6;
-ALTER TABLE MATRIXELEMENT
- DROP CONSTRAINT FK90AE93FB8B2E884E;
-ALTER TABLE MATRIXELEMENT
- DROP CONSTRAINT FK90AE93FB405A7CEE;
-ALTER TABLE MATRIXDATATYPE
- DROP CONSTRAINT FKF054C4A5F5DECA46;
-ALTER TABLE MATRIXCOLUMN
- DROP CONSTRAINT FK9B0BE57F5DECA46;
-ALTER TABLE MATRIXCOLUMN
- DROP CONSTRAINT FK9B0BE57BED40086;
-ALTER TABLE MATRIXCOLUMN
- DROP CONSTRAINT FK9B0BE57A414944F;
-ALTER TABLE MATRIXCOLUMN_ITEMDEFINITION
- DROP CONSTRAINT FKB556F8E8B2E884E;
-ALTER TABLE MATRIXCOLUMN_ITEMDEFINITION
- DROP CONSTRAINT FKB556F8E405A7CEE;
-ALTER TABLE MATRIX
- DROP CONSTRAINT FK87208BC1E9B425A6;
-ALTER TABLE MATRIX
- DROP CONSTRAINT FK87208BC1E310471D;
-ALTER TABLE MATRIX
- DROP CONSTRAINT FK87208BC191BD3C8E;
-ALTER TABLE MATRIX
- DROP CONSTRAINT FK87208BC1684F6406;
-ALTER TABLE MATRIX
- DROP CONSTRAINT FK87208BC14D737E46;
-ALTER TABLE MATRIX
- DROP CONSTRAINT FK87208BC14CE484AE;
-ALTER TABLE MATRIX
- DROP CONSTRAINT FK87208BC1491DB20E;
-ALTER TABLE MATRIX
- DROP CONSTRAINT FK87208BC145534A9C;
-ALTER TABLE MATRIX
- DROP CONSTRAINT FK87208BC13C572C3C;
-ALTER TABLE MATRIX_ITEMDEFINITION
- DROP CONSTRAINT FK5717E0E4AC5C19DD;
-ALTER TABLE MATRIX_ITEMDEFINITION
- DROP CONSTRAINT FK5717E0E4405A7CEE;
-ALTER TABLE LEFTCHANGESET_CHARSTATE
- DROP CONSTRAINT FKC8877207F4803CE6;
-ALTER TABLE LEFTCHANGESET_CHARSTATE
- DROP CONSTRAINT FKC887720775763EAE;
-ALTER TABLE ITEMVALUE
- DROP CONSTRAINT FK27B41A1E459091E5;
-ALTER TABLE GENETICCODESET
- DROP CONSTRAINT FK6A12F7DCA414944F;
-ALTER TABLE GENETICCODERECORD
- DROP CONSTRAINT FK237932B782D8ECCE;
-ALTER TABLE GENETICCODERECORD
- DROP CONSTRAINT FK237932B76CB73FC6;
---ALTER TABLE EXPLAIN_STREAM
--- DROP CONSTRAINT SQL050919121811070;
---ALTER TABLE EXPLAIN_STATEMENT
--- DROP CONSTRAINT SQL050919121810950;
---ALTER TABLE EXPLAIN_PREDICATE
--- DROP CONSTRAINT SQL050919121811040;
---ALTER TABLE EXPLAIN_OPERATOR
--- DROP CONSTRAINT SQL050919121810970;
---ALTER TABLE EXPLAIN_OBJECT
--- DROP CONSTRAINT SQL050919121811000;
---ALTER TABLE EXPLAIN_ARGUMENT
--- DROP CONSTRAINT SQL050919121811060;
-ALTER TABLE DISTANCEMATRIXELEMENT
- DROP CONSTRAINT FK92D3DDE6C1429863;
-ALTER TABLE DISTANCEMATRIXELEMENT
- DROP CONSTRAINT FK92D3DDE64B8EF343;
-ALTER TABLE DISTANCEMATRIXELEMENT
- DROP CONSTRAINT FK92D3DDE61F08BAE7;
-ALTER TABLE DISCRETECHARSTATE
- DROP CONSTRAINT FK2EEF2802FE41A723;
-ALTER TABLE DISCRETECHARSTATE
- DROP CONSTRAINT FK2EEF2802C7BEAAFE;
-ALTER TABLE DISCRETECHARSTATE
- DROP CONSTRAINT FK2EEF2802163C67CE;
-ALTER TABLE CSTREENODE
- DROP CONSTRAINT FK82B9AB10F572A92;
-ALTER TABLE CSTREENODE
- DROP CONSTRAINT FK82B9AB10F4803CE6;
-ALTER TABLE CSTREENODE
- DROP CONSTRAINT FK82B9AB10C6999FCE;
-ALTER TABLE CONTANCSTATE_VALUE
- DROP CONSTRAINT FKA84B8C3FD450D2BD;
-ALTER TABLE COMPOUND_ELEMENT
- DROP CONSTRAINT FK311830485F4F7CEB;
-ALTER TABLE COMPOUND_ELEMENT
- DROP CONSTRAINT FK31183048459091E5;
-ALTER TABLE CODONPOSITIONSET
- DROP CONSTRAINT FK4E501CC2A414944F;
-ALTER TABLE CODONNONCODING_COLRANGE
- DROP CONSTRAINT FK307897FC79A523E6;
-ALTER TABLE CODONNONCODING_COLRANGE
- DROP CONSTRAINT FK307897FC491DB20E;
-ALTER TABLE CODONCHAR3_COLRANGE
- DROP CONSTRAINT FKC2EDB73679A523E6;
-ALTER TABLE CODONCHAR3_COLRANGE
- DROP CONSTRAINT FKC2EDB736491DB20E;
-ALTER TABLE CODONCHAR2_COLRANGE
- DROP CONSTRAINT FKCEA4461779A523E6;
-ALTER TABLE CODONCHAR2_COLRANGE
- DROP CONSTRAINT FKCEA44617491DB20E;
-ALTER TABLE CODONCHAR1_COLRANGE
- DROP CONSTRAINT FKDA5AD4F879A523E6;
-ALTER TABLE CODONCHAR1_COLRANGE
- DROP CONSTRAINT FKDA5AD4F8491DB20E;
-ALTER TABLE CODERECORD_COLRANGE
- DROP CONSTRAINT FKA3E6C61EDC51C546;
-ALTER TABLE CODERECORD_COLRANGE
- DROP CONSTRAINT FKA3E6C61E79A523E6;
-ALTER TABLE CITATION
- DROP CONSTRAINT FKD8A7FAE74C983658;
-ALTER TABLE CITATION_EDITOR
- DROP CONSTRAINT FK2A8955C5EC93F501;
-ALTER TABLE CITATION_EDITOR
- DROP CONSTRAINT FK2A8955C568F6F619;
-ALTER TABLE CITATION_AUTHOR
- DROP CONSTRAINT FK24AA55E38E1E4DF8;
-ALTER TABLE CITATION_AUTHOR
- DROP CONSTRAINT FK24AA55E36707573B;
-ALTER TABLE CHARWEIGHTSET
- DROP CONSTRAINT FK99B8AC34A414944F;
-ALTER TABLE CHARWEIGHT
- DROP CONSTRAINT FK8CC7694EE9B425A6;
-ALTER TABLE CHARWEIGHT_COLRANGE
- DROP CONSTRAINT FK54CA674EF9A75EE;
-ALTER TABLE CHARWEIGHT_COLRANGE
- DROP CONSTRAINT FK54CA674E79A523E6;
-ALTER TABLE CHARSET
- DROP CONSTRAINT FK56D8ED2CA414944F;
-ALTER TABLE CHARSET_COLRANGE
- DROP CONSTRAINT FK2CBD9079A523E6;
-ALTER TABLE CHARSET_COLRANGE
- DROP CONSTRAINT FK2CBD90416D5B50;
-ALTER TABLE CHARPARTITION
- DROP CONSTRAINT FKDEA9F834A414944F;
-ALTER TABLE CHARGROUP
- DROP CONSTRAINT FK3AF18C91AA11DC6;
-ALTER TABLE CHARGROUP_COLRANGE
- DROP CONSTRAINT FKB2D8C293971FFFA6;
-ALTER TABLE CHARGROUP_COLRANGE
- DROP CONSTRAINT FKB2D8C29379A523E6;
-ALTER TABLE ANCSTATESET
- DROP CONSTRAINT FK879339E7A414944F;
-ALTER TABLE ANCESTRALSTATE
- DROP CONSTRAINT FK3FA14284F4803CE6;
-ALTER TABLE ANCESTRALSTATE
- DROP CONSTRAINT FK3FA14284684F6406;
-ALTER TABLE ANALYZEDDATA
- DROP CONSTRAINT FK8C961842B710CB23;
-ALTER TABLE ANALYZEDDATA
- DROP CONSTRAINT FK8C96184255961AEE;
-ALTER TABLE ANALYZEDDATA
- DROP CONSTRAINT FK8C9618424BA97F78;
-ALTER TABLE ANALYSISSTEP
- DROP CONSTRAINT FK21F853A8D1884DD8;
-ALTER TABLE ANALYSISSTEP
- DROP CONSTRAINT FK21F853A865EDD5F8;
-ALTER TABLE ANALYSISSTEP
- DROP CONSTRAINT FK21F853A848A2817C;
-ALTER TABLE ANALYSIS
- DROP CONSTRAINT FKF19622DC3C572C3C;
-ALTER TABLE ALGORITHM
- DROP CONSTRAINT FKB388C44FC6E814E6;
-ALTER TABLE ALGORITHM
- DROP CONSTRAINT FKB388C44F9698D32E;
-ALTER TABLE ALGORITHM
- DROP CONSTRAINT FKB388C44F92E6A38E;
-ALTER TABLE USERTYPERRD_COLRANGE
- DROP CONSTRAINT SQL081219134227270;
-ALTER TABLE "user"
- DROP CONSTRAINT SQL081219134226851;
-ALTER TABLE SUBMISSION
- DROP CONSTRAINT SQL081219134223811;
-ALTER TABLE SUB_TREEBLOCK
- DROP CONSTRAINT SQL081219134224130;
-ALTER TABLE SUB_TAXONLABEL
- DROP CONSTRAINT SQL081219134224030;
-ALTER TABLE SUB_MATRIX
- DROP CONSTRAINT SQL081219134223920;
-ALTER TABLE COMPOUND_ELEMENT
- DROP CONSTRAINT SQL081219134219010;
-ALTER TABLE CODONNONCODING_COLRANGE
- DROP CONSTRAINT SQL081219134220010;
-ALTER TABLE CODONCHAR3_COLRANGE
- DROP CONSTRAINT SQL081219134219910;
-ALTER TABLE CODONCHAR2_COLRANGE
- DROP CONSTRAINT SQL081219134219810;
-ALTER TABLE CODONCHAR1_COLRANGE
- DROP CONSTRAINT SQL081219134219710;
-ALTER TABLE CODERECORD_COLRANGE
- DROP CONSTRAINT SQL081219134219610;
-ALTER TABLE CHARWEIGHT_COLRANGE
- DROP CONSTRAINT SQL081219134219510;
-ALTER TABLE CHARSET_COLRANGE
- DROP CONSTRAINT SQL081219134219400;
-ALTER TABLE CHARGROUP_COLRANGE
- DROP CONSTRAINT SQL081219134219300;
-ALTER TABLE USERTYPERECORD
- DROP CONSTRAINT SQL081219134227170;
-ALTER TABLE USERTYPE
- DROP CONSTRAINT SQL081219134227060;
-ALTER TABLE USERROLE
- DROP CONSTRAINT SQL081219134226960;
-ALTER TABLE "user"
- DROP CONSTRAINT SQL081219134226850;
-ALTER TABLE TYPESET
- DROP CONSTRAINT SQL081219134226550;
-ALTER TABLE TREETYPE
- DROP CONSTRAINT SQL081219134226440;
-ALTER TABLE TREESET
- DROP CONSTRAINT SQL081219134226240;
-ALTER TABLE TREESET_PHYLOTREE
- DROP CONSTRAINT SQL081219134226340;
-ALTER TABLE TREEQUALITY
- DROP CONSTRAINT SQL081219134226140;
-ALTER TABLE TREEPARTITION
- DROP CONSTRAINT SQL081219134226040;
-ALTER TABLE TREENODEEDGE
- DROP CONSTRAINT SQL081219134225930;
-ALTER TABLE TREEKIND
- DROP CONSTRAINT SQL081219134225820;
-ALTER TABLE TREEGROUP
- DROP CONSTRAINT SQL081219134225620;
-ALTER TABLE TREEGROUP_PHYLOTREE
- DROP CONSTRAINT SQL081219134225720;
-ALTER TABLE TREEBLOCK
- DROP CONSTRAINT SQL081219134225510;
-ALTER TABLE TREEATTRIBUTE
- DROP CONSTRAINT SQL081219134225410;
-ALTER TABLE TAXONVARIANT
- DROP CONSTRAINT SQL081219134225250;
-ALTER TABLE TAXONSET
- DROP CONSTRAINT SQL081219134225050;
-ALTER TABLE TAXONSET_TAXON
- DROP CONSTRAINT SQL081219134225150;
-ALTER TABLE TAXONLINK
- DROP CONSTRAINT SQL081219134224950;
-ALTER TABLE TAXONLABELSET
- DROP CONSTRAINT SQL081219134226650;
-ALTER TABLE TAXONLABELSET_TAXONLABEL
- DROP CONSTRAINT SQL081219134226750;
-ALTER TABLE TAXONLABELPARTITION
- DROP CONSTRAINT SQL081219134224760;
-ALTER TABLE TAXONLABELGROUP
- DROP CONSTRAINT SQL081219134224650;
-ALTER TABLE TAXONLABEL
- DROP CONSTRAINT SQL081219134224550;
-ALTER TABLE TAXONAUTHORITY
- DROP CONSTRAINT SQL081219134224450;
-ALTER TABLE TAXON
- DROP CONSTRAINT SQL081219134224350;
-ALTER TABLE SUBMISSION
- DROP CONSTRAINT SQL081219134223810;
-ALTER TABLE SUB_TREEBLOCK
- DROP CONSTRAINT SQL081219134224120;
-ALTER TABLE SUB_TAXONLABEL
- DROP CONSTRAINT SQL081219134224020;
-ALTER TABLE SUB_MATRIX
- DROP CONSTRAINT SQL081219134223910;
-ALTER TABLE STUDYSTATUS
- DROP CONSTRAINT SQL081219134223710;
-ALTER TABLE STUDY
- DROP CONSTRAINT SQL081219134223600;
-ALTER TABLE STUDY_NEXUSFILE
- DROP CONSTRAINT SQL081219134224240;
-ALTER TABLE STEPMATRIXELEMENT
- DROP CONSTRAINT SQL081219134223500;
-ALTER TABLE STATESET
- DROP CONSTRAINT SQL081219134223390;
-ALTER TABLE STATEMODIFIER
- DROP CONSTRAINT SQL081219134223290;
-ALTER TABLE STATEFORMAT
- DROP CONSTRAINT SQL081219134223190;
-ALTER TABLE STATECHANGESET
- DROP CONSTRAINT SQL081219134223070;
-ALTER TABLE SPECIMENLABEL
- DROP CONSTRAINT SQL080428163906480;
-ALTER TABLE SOFTWARE
- DROP CONSTRAINT SQL081219134222960;
-ALTER TABLE ROWSEGMENT
- DROP CONSTRAINT SQL081219134222850;
-ALTER TABLE POLYTCOUNT
- DROP CONSTRAINT SQL081219134222660;
-ALTER TABLE PHYLOTREENODE
- DROP CONSTRAINT SQL081219134222560;
-ALTER TABLE PHYLOTREE
- DROP CONSTRAINT SQL081219134222440;
-ALTER TABLE PHYLOCHAR
- DROP CONSTRAINT SQL081219134222330;
-ALTER TABLE PERSON
- DROP CONSTRAINT SQL081219134222230;
-ALTER TABLE NODEATTRIBUTE
- DROP CONSTRAINT SQL081219134222120;
-ALTER TABLE MATRIXROW
- DROP CONSTRAINT SQL081219134221900;
-ALTER TABLE MATRIXKIND
- DROP CONSTRAINT SQL081219134221790;
-ALTER TABLE MATRIXELEMENT
- DROP CONSTRAINT SQL081219134221690;
-ALTER TABLE MATRIXDATATYPE
- DROP CONSTRAINT SQL081219134221580;
-ALTER TABLE MATRIXCOLUMN
- DROP CONSTRAINT SQL081219134221370;
-ALTER TABLE MATRIXCOLUMN_ITEMDEFINITION
- DROP CONSTRAINT SQL081219134221470;
-ALTER TABLE MATRIX
- DROP CONSTRAINT SQL081219134221270;
-ALTER TABLE MATRIX_ITEMDEFINITION
- DROP CONSTRAINT SQL081219134222010;
-ALTER TABLE ITEMVALUE
- DROP CONSTRAINT SQL081219134221080;
-ALTER TABLE ITEMDEFINITION
- DROP CONSTRAINT SQL081219134220970;
-ALTER TABLE HELP
- DROP CONSTRAINT SQL081219134220860;
-ALTER TABLE GEOSPOT
- DROP CONSTRAINT SQL080428163906080;
-ALTER TABLE GENETICCODESET
- DROP CONSTRAINT SQL081219134220550;
-ALTER TABLE GENETICCODERECORD
- DROP CONSTRAINT SQL081219134220760;
-ALTER TABLE GENETICCODE
- DROP CONSTRAINT SQL081219134220650;
-ALTER TABLE GAPMODE
- DROP CONSTRAINT SQL081219134220440;
---ALTER TABLE EXPLAIN_STATEMENT
--- DROP CONSTRAINT SQL050919121810940;
---ALTER TABLE EXPLAIN_INSTANCE
--- DROP CONSTRAINT SQL050919121810910;
-ALTER TABLE DISTANCEMATRIXELEMENT
- DROP CONSTRAINT SQL081219134220330;
-ALTER TABLE DISCRETECHARSTATE
- DROP CONSTRAINT SQL081219134220230;
-ALTER TABLE CSTREENODE
- DROP CONSTRAINT SQL081219134219200;
-ALTER TABLE COMPOUND_ELEMENT
- DROP CONSTRAINT SQL081219134219000;
-ALTER TABLE COLUMNRANGE
- DROP CONSTRAINT SQL081219134218890;
-ALTER TABLE CODONPOSITIONSET
- DROP CONSTRAINT SQL081219134220130;
-ALTER TABLE CITATIONSTATUS
- DROP CONSTRAINT SQL081219134218570;
-ALTER TABLE CITATION
- DROP CONSTRAINT SQL081219134218470;
-ALTER TABLE CITATION_EDITOR
- DROP CONSTRAINT SQL081219134218780;
-ALTER TABLE CITATION_AUTHOR
- DROP CONSTRAINT SQL081219134218670;
-ALTER TABLE CHARWEIGHTSET
- DROP CONSTRAINT SQL081219134218310;
-ALTER TABLE CHARWEIGHT
- DROP CONSTRAINT SQL081219134218200;
-ALTER TABLE CHARSET
- DROP CONSTRAINT SQL081219134218100;
-ALTER TABLE CHARPARTITION
- DROP CONSTRAINT SQL081219134217990;
-ALTER TABLE CHARGROUP
- DROP CONSTRAINT SQL081219134217890;
-ALTER TABLE ANCSTATESET
- DROP CONSTRAINT SQL081219134217770;
-ALTER TABLE ANCESTRALSTATE
- DROP CONSTRAINT SQL081219134217670;
-ALTER TABLE ANALYZEDDATA
- DROP CONSTRAINT SQL081219134217570;
-ALTER TABLE ANALYSISSTEP
- DROP CONSTRAINT SQL081219134217470;
-ALTER TABLE ANALYSIS
- DROP CONSTRAINT SQL081219134217310;
-ALTER TABLE ALGORITHM
- DROP CONSTRAINT SQL081219134217210;
-*/
--- DROP INDEX JRUAN.TVARI_NBID_IDX
--- GO
--- DROP INDEX JRUAN.TVARI_TAXON_IDX
--- GO
--- DROP INDEX JRUAN.TVARI_FNAME_IDX
--- GO
--- DROP INDEX JRUAN.TLABEL_STUDY_IDX
--- GO
--- DROP INDEX JRUAN.TAXON_NAME_IDX
--- GO
--- DROP INDEX JRUAN.STUDY_NAME_IDX
--- GO
--- DROP INDEX JRUAN.SPECIM_INST_IDX
--- GO
--- DROP INDEX JRUAN.TNODE_TREE_IDX
--- GO
--- DROP INDEX JRUAN.TNODE_TAXLABEL_IDX
--- GO
--- DROP INDEX JRUAN.PERSON_EMAIL_IDX
--- GO
--- DROP INDEX JRUAN.PERSON_LNAME_IDX
--- GO
--- DROP INDEX JRUAN.ROW_M_IDX
--- GO
--- DROP INDEX JRUAN.ELEMENT_COL_IDX
--- GO
--- DROP INDEX JRUAN.ELEMENT_ROW_IDX
--- GO
--- DROP INDEX JRUAN.COLUMN_M_IDX
--- GO
-/*
-DROP INDEX TVARI_NBID_IDX;
-DROP INDEX TVARI_TAXON_IDX;
-DROP INDEX TVARI_FNAME_IDX;
-DROP INDEX TLABEL_STUDY_IDX;
-DROP INDEX TAXON_NAME_IDX;
-DROP INDEX STUDY_NAME_IDX;
-DROP INDEX SPECIM_INST_IDX;
-DROP INDEX TNODE_TREE_IDX;
-DROP INDEX TNODE_TAXLABEL_IDX;
-DROP INDEX PERSON_EMAIL_IDX;
-DROP INDEX PERSON_LNAME_IDX;
-DROP INDEX ROW_M_IDX;
-DROP INDEX ELEMENT_COL_IDX;
-DROP INDEX ELEMENT_ROW_IDX;
-DROP INDEX COLUMN_M_IDX;
-*/
--- DROP TABLE JRUAN.USERTYPERRD_COLRANGE
--- GO
--- DROP TABLE JRUAN.USERTYPERECORD
--- GO
--- DROP TABLE JRUAN.USERTYPE
--- GO
--- DROP TABLE JRUAN.USERROLE
--- GO
--- DROP TABLE JRUAN.USER
--- GO
--- DROP TABLE JRUAN.TYPESET
--- GO
--- DROP TABLE JRUAN.TREETYPE
--- GO
--- DROP TABLE JRUAN.TREESET
--- GO
--- DROP TABLE JRUAN.TREESET_PHYLOTREE
--- GO
--- DROP TABLE JRUAN.TREEQUALITY
--- GO
--- DROP TABLE JRUAN.TREEPARTITION
--- GO
--- DROP TABLE JRUAN.TREENODEEDGE
--- GO
--- DROP TABLE JRUAN.TREEKIND
--- GO
--- DROP TABLE JRUAN.TREEGROUP
--- GO
--- DROP TABLE JRUAN.TREEGROUP_PHYLOTREE
--- GO
--- DROP TABLE JRUAN.TREEBLOCK
--- GO
--- DROP TABLE JRUAN.TREEATTRIBUTE
--- GO
--- DROP TABLE JRUAN.TAXONVARIANT
--- GO
--- DROP TABLE JRUAN.TAXONSET
--- GO
--- DROP TABLE JRUAN.TAXONSET_TAXON
--- GO
--- DROP TABLE JRUAN.TAXONLINK
--- GO
--- DROP TABLE JRUAN.TAXONLABELSET
--- GO
--- DROP TABLE JRUAN.TAXONLABELSET_TAXONLABEL
--- GO
--- DROP TABLE JRUAN.TAXONLABELROUP_TAXONLABEL
--- GO
--- DROP TABLE JRUAN.TAXONLABELPARTITION
--- GO
--- DROP TABLE JRUAN.TAXONLABELGROUP
--- GO
--- DROP TABLE JRUAN.TAXONLABEL
--- GO
--- DROP TABLE JRUAN.TAXONAUTHORITY
--- GO
--- DROP TABLE JRUAN.TAXON
--- GO
--- DROP TABLE JRUAN.SUBMISSION
--- GO
--- DROP TABLE JRUAN.SUB_TREEBLOCK
--- GO
--- DROP TABLE JRUAN.SUB_TAXONLABEL
--- GO
--- DROP TABLE JRUAN.SUB_MATRIX
--- GO
--- DROP TABLE JRUAN.STUDYSTATUS
--- GO
--- DROP TABLE JRUAN.STUDY
--- GO
--- DROP TABLE JRUAN.STUDY_NEXUSFILE
--- GO
--- DROP TABLE JRUAN.STEPMATRIXELEMENT
--- GO
--- DROP TABLE JRUAN.STATESET
--- GO
--- DROP TABLE JRUAN.STATEMODIFIER
--- GO
--- DROP TABLE JRUAN.STATEFORMAT
--- GO
--- DROP TABLE JRUAN.STATECHANGESET
--- GO
--- DROP TABLE JRUAN.SPECIMENLABEL
--- GO
--- DROP TABLE JRUAN.SOFTWARE
--- GO
--- DROP TABLE JRUAN.ROWSEGMENT
--- GO
--- DROP TABLE JRUAN.RIGHTCHANGESET_CHARSTATE
--- GO
--- DROP TABLE JRUAN.POLYTCOUNT
--- GO
--- DROP TABLE JRUAN.PHYLOTREENODE
--- GO
--- DROP TABLE JRUAN.PHYLOTREE
--- GO
--- DROP TABLE JRUAN.PHYLOCHAR
--- GO
--- DROP TABLE JRUAN.PERSON
--- GO
--- DROP TABLE JRUAN.NODEATTRIBUTE
--- GO
--- DROP TABLE JRUAN.MATRIXROW
--- GO
--- DROP TABLE JRUAN.MATRIXKIND
--- GO
--- DROP TABLE JRUAN.MATRIXELEMENT
--- GO
--- DROP TABLE JRUAN.MATRIXDATATYPE
--- GO
--- DROP TABLE JRUAN.MATRIXCOLUMN
--- GO
--- DROP TABLE JRUAN.MATRIXCOLUMN_ITEMDEFINITION
--- GO
--- DROP TABLE JRUAN.MATRIX
--- GO
--- DROP TABLE JRUAN.MATRIX_ITEMDEFINITION
--- GO
--- DROP TABLE JRUAN.LEFTCHANGESET_CHARSTATE
--- GO
--- DROP TABLE JRUAN.ITEMVALUE
--- GO
--- DROP TABLE JRUAN.ITEMDEFINITION
--- GO
--- DROP TABLE JRUAN.HELP
--- GO
--- DROP TABLE JRUAN.GEOSPOT
--- GO
--- DROP TABLE JRUAN.GENETICCODESET
--- GO
--- DROP TABLE JRUAN.GENETICCODERECORD
--- GO
--- DROP TABLE JRUAN.GENETICCODE
--- GO
--- DROP TABLE JRUAN.GAPMODE
--- GO
--- DROP TABLE JRUAN.EXPLAIN_STREAM
--- GO
--- DROP TABLE JRUAN.EXPLAIN_STATEMENT
--- GO
--- DROP TABLE JRUAN.EXPLAIN_PREDICATE
--- GO
--- DROP TABLE JRUAN.EXPLAIN_OPERATOR
--- GO
--- DROP TABLE JRUAN.EXPLAIN_OBJECT
--- GO
--- DROP TABLE JRUAN.EXPLAIN_INSTANCE
--- GO
--- DROP TABLE JRUAN.EXPLAIN_ARGUMENT
--- GO
--- DROP TABLE JRUAN.DISTANCEMATRIXELEMENT
--- GO
--- DROP TABLE JRUAN.DISCRETECHARSTATE
--- GO
--- DROP TABLE JRUAN.CSTREENODE
--- GO
--- DROP TABLE JRUAN.CONTANCSTATE_VALUE
--- GO
--- DROP TABLE JRUAN.COMPOUND_ELEMENT
--- GO
--- DROP TABLE JRUAN.COLUMNRANGE
--- GO
--- DROP TABLE JRUAN.CODONPOSITIONSET
--- GO
--- DROP TABLE JRUAN.CODONNONCODING_COLRANGE
--- GO
--- DROP TABLE JRUAN.CODONCHAR3_COLRANGE
--- GO
--- DROP TABLE JRUAN.CODONCHAR2_COLRANGE
--- GO
--- DROP TABLE JRUAN.CODONCHAR1_COLRANGE
--- GO
--- DROP TABLE JRUAN.CODERECORD_COLRANGE
--- GO
--- DROP TABLE JRUAN.CITATIONSTATUS
--- GO
--- DROP TABLE JRUAN.CITATION
--- GO
--- DROP TABLE JRUAN.CITATION_EDITOR
--- GO
--- DROP TABLE JRUAN.CITATION_AUTHOR
--- GO
--- DROP TABLE JRUAN.CHARWEIGHTSET
--- GO
--- DROP TABLE JRUAN.CHARWEIGHT
--- GO
--- DROP TABLE JRUAN.CHARWEIGHT_COLRANGE
--- GO
--- DROP TABLE JRUAN.CHARSET
--- GO
--- DROP TABLE JRUAN.CHARSET_COLRANGE
--- GO
--- DROP TABLE JRUAN.CHARPARTITION
--- GO
--- DROP TABLE JRUAN.CHARGROUP
--- GO
--- DROP TABLE JRUAN.CHARGROUP_COLRANGE
--- GO
--- DROP TABLE JRUAN.ANCSTATESET
--- GO
--- DROP TABLE JRUAN.ANCESTRALSTATE
--- GO
--- DROP TABLE JRUAN.ANALYZEDDATA
--- GO
--- DROP TABLE JRUAN.ANALYSISSTEP
--- GO
--- DROP TABLE JRUAN.ANALYSIS
--- GO
--- DROP TABLE JRUAN.ALGORITHM
--- GO
--- DROP TABLE JRUAN.ADVISE_WORKLOAD
--- GO
--- DROP TABLE JRUAN.ADVISE_INDEX
--- GO
-/*
-DROP TABLE USERTYPERRD_COLRANGE;
-DROP TABLE USERTYPERECORD;
-DROP TABLE USERTYPE;
-DROP TABLE USERROLE;
-DROP TABLE "user";
-DROP TABLE TYPESET;
-DROP TABLE TREETYPE;
-DROP TABLE TREESET;
-DROP TABLE TREESET_PHYLOTREE;
-DROP TABLE TREEQUALITY;
-DROP TABLE TREEPARTITION;
-DROP TABLE TREENODEEDGE;
-DROP TABLE TREEKIND;
-DROP TABLE TREEGROUP;
-DROP TABLE TREEGROUP_PHYLOTREE;
-DROP TABLE TREEBLOCK;
-DROP TABLE TREEATTRIBUTE;
-DROP TABLE TAXONVARIANT;
-DROP TABLE TAXONSET;
-DROP TABLE TAXONSET_TAXON;
-DROP TABLE TAXONLINK;
-DROP TABLE TAXONLABELSET;
-DROP TABLE TAXONLABELSET_TAXONLABEL;
-DROP TABLE TAXONLABELROUP_TAXONLABEL;
-DROP TABLE TAXONLABELPARTITION;
-DROP TABLE TAXONLABELGROUP;
-DROP TABLE TAXONLABEL;
-DROP TABLE TAXONAUTHORITY;
-DROP TABLE TAXON;
-DROP TABLE SUBMISSION;
-DROP TABLE SUB_TREEBLOCK;
-DROP TABLE SUB_TAXONLABEL;
-DROP TABLE SUB_MATRIX;
-DROP TABLE STUDYSTATUS;
-DROP TABLE STUDY;
-DROP TABLE STUDY_NEXUSFILE;
-DROP TABLE STEPMATRIXELEMENT;
-DROP TABLE STATESET;
-DROP TABLE STATEMODIFIER;
-DROP TABLE STATEFORMAT;
-DROP TABLE STATECHANGESET;
-DROP TABLE SPECIMENLABEL;
-DROP TABLE SOFTWARE;
-DROP TABLE ROWSEGMENT;
-DROP TABLE RIGHTCHANGESET_CHARSTATE;
-DROP TABLE POLYTCOUNT;
-DROP TABLE PHYLOTREENODE;
-DROP TABLE PHYLOTREE;
-DROP TABLE PHYLOCHAR;
-DROP TABLE PERSON;
-DROP TABLE NODEATTRIBUTE;
-DROP TABLE MATRIXROW;
-DROP TABLE MATRIXKIND;
-DROP TABLE MATRIXELEMENT;
-DROP TABLE MATRIXDATATYPE;
-DROP TABLE MATRIXCOLUMN;
-DROP TABLE MATRIXCOLUMN_ITEMDEFINITION;
-DROP TABLE MATRIX;
-DROP TABLE MATRIX_ITEMDEFINITION;
-DROP TABLE LEFTCHANGESET_CHARSTATE;
-DROP TABLE ITEMVALUE;
-DROP TABLE ITEMDEFINITION;
-DROP TABLE HELP;
-DROP TABLE GEOSPOT;
-DROP TABLE GENETICCODESET;
-DROP TABLE GENETICCODERECORD;
-DROP TABLE GENETICCODE;
-DROP TABLE GAPMODE;
---DROP TABLE EXPLAIN_STREAM;
---DROP TABLE EXPLAIN_STATEMENT;
---DROP TABLE EXPLAIN_PREDICATE;
---DROP TABLE EXPLAIN_OPERATOR;
---DROP TABLE EXPLAIN_OBJECT;
---DROP TABLE EXPLAIN_INSTANCE;
---DROP TABLE EXPLAIN_ARGUMENT;
-DROP TABLE DISTANCEMATRIXELEMENT;
-DROP TABLE DISCRETECHARSTATE;
-DROP TABLE CSTREENODE;
-DROP TABLE CONTANCSTATE_VALUE;
-DROP TABLE COMPOUND_ELEMENT;
-DROP TABLE COLUMNRANGE;
-DROP TABLE CODONPOSITIONSET;
-DROP TABLE CODONNONCODING_COLRANGE;
-DROP TABLE CODONCHAR3_COLRANGE;
-DROP TABLE CODONCHAR2_COLRANGE;
-DROP TABLE CODONCHAR1_COLRANGE;
-DROP TABLE CODERECORD_COLRANGE;
-DROP TABLE CITATIONSTATUS;
-DROP TABLE CITATION;
-DROP TABLE CITATION_EDITOR;
-DROP TABLE CITATION_AUTHOR;
-DROP TABLE CHARWEIGHTSET;
-DROP TABLE CHARWEIGHT;
-DROP TABLE CHARWEIGHT_COLRANGE;
-DROP TABLE CHARSET;
-DROP TABLE CHARSET_COLRANGE;
-DROP TABLE CHARPARTITION;
-DROP TABLE CHARGROUP;
-DROP TABLE CHARGROUP_COLRANGE;
-DROP TABLE ANCSTATESET;
-DROP TABLE ANCESTRALSTATE;
-DROP TABLE ANALYZEDDATA;
-DROP TABLE ANALYSISSTEP;
-DROP TABLE ANALYSIS;
-DROP TABLE ALGORITHM;
---DROP TABLE ADVISE_WORKLOAD;
---DROP TABLE ADVISE_INDEX;
-*/
--- CREATE TABLE JRUAN.ADVISE_INDEX (
--- EXPLAIN_REQUESTER VARCHAR(128) NOT NULL DEFAULT '',
--- EXPLAIN_TIME TIMESTAMP NOT NULL DEFAULT CURRENT TIMESTAMP,
--- SOURCE_NAME VARCHAR(128) NOT NULL DEFAULT '',
--- SOURCE_SCHEMA VARCHAR(128) NOT NULL DEFAULT '',
--- SOURCE_VERSION VARCHAR(64) NOT NULL DEFAULT '',
--- EXPLAIN_LEVEL CHARACTER(1) NOT NULL DEFAULT '',
--- STMTNO INTEGER NOT NULL DEFAULT 0,
--- SECTNO INTEGER NOT NULL DEFAULT 0,
--- QUERYNO INTEGER NOT NULL DEFAULT 0,
--- QUERYTAG CHARACTER(20) NOT NULL DEFAULT '',
--- NAME VARCHAR(128) NOT NULL,
--- CREATOR VARCHAR(128) NOT NULL DEFAULT '',
--- TBNAME VARCHAR(128) NOT NULL,
--- TBCREATOR VARCHAR(128) NOT NULL DEFAULT '',
--- COLNAMES CLOB(2097152) NOT NULL,
--- UNIQUERULE CHARACTER(1) NOT NULL DEFAULT '',
--- COLCOUNT SMALLINT NOT NULL DEFAULT 0,
--- IID SMALLINT NOT NULL DEFAULT 0,
--- NLEAF INTEGER NOT NULL DEFAULT 0,
--- NLEVELS SMALLINT NOT NULL DEFAULT 0,
--- FIRSTKEYCARD BIGINT NOT NULL DEFAULT 0,
--- FULLKEYCARD BIGINT NOT NULL DEFAULT 0,
--- CLUSTERRATIO SMALLINT NOT NULL DEFAULT 0,
--- CLUSTERFACTOR DOUBLE NOT NULL DEFAULT 0,
--- USERDEFINED SMALLINT NOT NULL DEFAULT 0,
--- SYSTEM_REQUIRED SMALLINT NOT NULL DEFAULT 0,
--- CREATE_TIME TIMESTAMP NOT NULL DEFAULT CURRENT TIMESTAMP,
--- STATS_TIME TIMESTAMP DEFAULT CURRENT TIMESTAMP,
--- PAGE_FETCH_PAIRS VARCHAR(254) NOT NULL DEFAULT '',
--- REMARKS VARCHAR(254) DEFAULT '',
--- DEFINER VARCHAR(128) NOT NULL DEFAULT '',
--- CONVERTED CHARACTER(1) NOT NULL DEFAULT '',
--- SEQUENTIAL_PAGES INTEGER NOT NULL DEFAULT 0,
--- DENSITY INTEGER NOT NULL DEFAULT 0,
--- FIRST2KEYCARD BIGINT NOT NULL DEFAULT 0,
--- FIRST3KEYCARD BIGINT NOT NULL DEFAULT 0,
--- FIRST4KEYCARD BIGINT NOT NULL DEFAULT 0,
--- PCTFREE SMALLINT NOT NULL DEFAULT -1,
--- UNIQUE_COLCOUNT SMALLINT NOT NULL DEFAULT -1,
--- MINPCTUSED SMALLINT NOT NULL DEFAULT 0,
--- REVERSE_SCANS CHARACTER(1) NOT NULL DEFAULT 'N',
--- USE_INDEX CHARACTER(1),
--- CREATION_TEXT CLOB(2097152) NOT NULL DEFAULT '',
--- PACKED_DESC BLOB(1048576)
--- )
--- GO
--- CREATE TABLE JRUAN.ADVISE_WORKLOAD (
--- WORKLOAD_NAME CHARACTER(128) NOT NULL DEFAULT 'WK0',
--- STATEMENT_NO INTEGER NOT NULL DEFAULT 1,
--- STATEMENT_TEXT CLOB(2097152) NOT NULL,
--- STATEMENT_TAG VARCHAR(256) NOT NULL DEFAULT '',
--- FREQUENCY INTEGER NOT NULL DEFAULT 1,
--- IMPORTANCE DOUBLE NOT NULL DEFAULT 1,
--- WEIGHT DOUBLE NOT NULL DEFAULT 1,
--- COST_BEFORE DOUBLE,
--- COST_AFTER DOUBLE,
--- COMPILABLE CHARACTER(17)
--- )
--- GO
--- CREATE TABLE JRUAN.ALGORITHM (
--- TYPE CHARACTER(1) NOT NULL,
--- ALGORITHM_ID BIGINT GENERATED BY DEFAULT AS IDENTITY (START WITH 1, INCREMENT BY 1, CACHE 20) NOT NULL,
--- VERSION INTEGER,
--- DESCRIPTION VARCHAR(2000),
--- PROPERTYNAME VARCHAR(255),
--- PROPERTYVALUE VARCHAR(255),
--- USERTYPE_ID BIGINT,
--- GAPMODE_ID BIGINT,
--- POLYTCOUNT_ID BIGINT
--- )
--- GO
CREATE TABLE algorithm
(
"type" character(1) NOT NULL,
@@ -1734,18 +14,8 @@
ALTER TABLE algorithm OWNER TO postgres;
CREATE SEQUENCE algorithm_id_sequence;
ALTER TABLE algorithm ALTER COLUMN algorithm_id SET DEFAULT nextval('algorithm_id_sequence');
--- alter sequence ancestralstate_id_sequence restart with 4519;
+-- alter sequence ancestralstate_id_sequence restart with 4885;
--- CREATE TABLE JRUAN.ANALYSIS (
--- ANALYSIS_ID BIGINT GENERATED BY DEFAULT AS IDENTITY (START WITH 1, INCREMENT BY 1, CACHE 20) NOT NULL,
--- VERSION INTEGER,
--- NAME VARCHAR(255),
--- NOTES VARCHAR(2000),
--- VALIDATED SMALLINT,
--- STUDY_ID BIGINT,
--- ANALYSIS_ORDER INTEGER
--- )
--- GO
CREATE TABLE analysis
(
analysis_id bigint NOT NULL,
@@ -1760,21 +30,8 @@
ALTER TABLE analysis OWNER TO postgres;
CREATE SEQUENCE analysis_id_sequence;
ALTER TABLE analysis ALTER COLUMN analysis_id SET DEFAULT nextval('analysis_id_sequence');
--- alter sequence analysis_id_sequence restart with 4512;
+-- alter sequence analysis_id_sequence restart with 4887;
--- CREATE TABLE JRUAN.ANALYSISSTEP (
--- ANALYSISSTEP_ID BIGINT GENERATED BY DEFAULT AS IDENTITY (START WITH 1, INCREMENT BY 1, CACHE 20) NOT NULL,
--- VERSION INTEGER,
--- COMMANDS VARCHAR(2000),
--- NAME VARCHAR(255),
--- NOTES VARCHAR(2000),
--- ALGORITHM_ID BIGINT,
--- ANALYSIS_ID BIGINT,
--- SOFTWARE_ID BIGINT,
--- STEP_ORDER INTEGER,
--- TB_ANALYSISID VARCHAR(34)
--- )
--- GO
CREATE TABLE analysisstep
(
analysisstep_id bigint NOT NULL,
@@ -1792,20 +49,8 @@
ALTER TABLE analysisstep OWNER TO postgres;
CREATE SEQUENCE analysisstep_id_sequence;
ALTER TABLE analysisstep ALTER COLUMN analysisstep_id SET DEFAULT nextval('analysisstep_id_sequence');
--- alter sequence analysisstep_id_sequence restart with 4517;
+-- alter sequence analysisstep_id_sequence restart with 4883;
--- CREATE TABLE JRUAN.ANALYZEDDATA (
--- TYPE CHARACTER(1) NOT NULL,
--- ANALYZEDDATA_ID BIGINT GENERATED BY DEFAULT AS IDENTITY (START WITH 1, INCREMENT BY 1, CACHE 20) NOT NULL,
--- VERSION INTEGER,
--- INPUT SMALLINT,
--- NOTES VARCHAR(2000),
--- TREELENGTH INTEGER,
--- ANALYSISSTEP_ID BIGINT NOT NULL,
--- MATRIX_ID BIGINT,
--- PHYLOTREE_ID BIGINT
--- )
--- GO
CREATE TABLE analyzeddata
(
"type" character(1) NOT NULL,
@@ -1822,18 +67,8 @@
ALTER TABLE analyzeddata OWNER TO postgres;
CREATE SEQUENCE analyzeddata_id_sequence;
ALTER TABLE analyzeddata ALTER COLUMN analyzeddata_id SET DEFAULT nextval('analyzeddata_id_sequence');
--- alter sequence analyzeddata_id_sequence restart with 10417;
+-- alter sequence analyzeddata_id_sequence restart with 11063;
--- CREATE TABLE JRUAN.ANCESTRALSTATE (
--- TYPE CHARACTER(1) NOT NULL,
--- ANCESTRALSTATE_ID BIGINT GENERATED BY DEFAULT AS IDENTITY (START WITH 1, INCREMENT BY 1, CACHE 20) NOT NULL,
--- VERSION INTEGER,
--- TITLE VARCHAR(255),
--- ANCVALUE VARCHAR(255),
--- DISCRETECHARSTATE_ID BIGINT,
--- ANCSTATESET_ID BIGINT
--- )
--- GO
CREATE TABLE ancestralstate
(
"type" character(1) NOT NULL,
@@ -1850,13 +85,6 @@
ALTER TABLE ancestralstate ALTER COLUMN ancestralstate_id SET DEFAULT nextval('ancestralstate_id_sequence');
-- alter sequence ancestralstate_id_sequence restart with 1;
--- CREATE TABLE JRUAN.ANCSTATESET (
--- ANCSTATESET_ID BIGINT GENERATED BY DEFAULT AS IDENTITY (START WITH 1, INCREMENT BY 1, CACHE 20) NOT NULL,
--- VERSION INTEGER,
--- TITLE VARCHAR(255),
--- MATRIX_ID BIGINT
--- )
--- GO
CREATE TABLE ancstateset
(
ancstateset_id bigint NOT NULL,
@@ -1870,11 +98,6 @@
ALTER TABLE ancstateset ALTER COLUMN ancstateset_id SET DEFAULT nextval('ancstateset_id_sequence');
-- alter sequence ancestralstate_id_sequence restart with 1;
--- CREATE TABLE JRUAN.CHARGROUP_COLRANGE (
--- CHARGROUP_ID BIGINT NOT NULL,
--- COLUMNRANGE_ID BIGINT NOT NULL
--- )
--- GO
CREATE TABLE chargroup_colrange
(
chargroup_id bigint NOT NULL,
@@ -1883,13 +106,6 @@
WITH (OIDS=FALSE);
ALTER TABLE chargroup_colrange OWNER TO postgres;
--- CREATE TABLE JRUAN.CHARGROUP (
--- CHARGROUP_ID BIGINT GENERATED BY DEFAULT AS IDENTITY (START WITH 1, INCREMENT BY 1, CACHE 20) NOT NULL,
--- VERSION INTEGER,
--- TITLE VARCHAR(255),
--- CHARPARTITION_ID BIGINT
--- )
--- GO
CREATE TABLE chargroup
(
chargroup_id bigint NOT NULL,
@@ -1901,15 +117,8 @@
ALTER TABLE chargroup OWNER TO postgres;
CREATE SEQUENCE chargroup_id_sequence;
ALTER TABLE chargroup ALTER COLUMN chargroup_id SET DEFAULT nextval('chargroup_id_sequence');
--- alter sequence ancestralstate_id_sequence restart with 913;
+-- alter sequence ancestralstate_id_sequence restart with 1011;
--- CREATE TABLE JRUAN.CHARPARTITION (
--- CHARPARTITION_ID BIGINT GENERATED BY DEFAULT AS IDENTITY (START WITH 1, INCREMENT BY 1, CACHE 20) NOT NULL,
--- VERSION INTEGER,
--- TITLE VARCHAR(255),
--- MATRIX_ID BIGINT
--- )
--- GO
CREATE TABLE charpartition
(
charpartition_id bigint NOT NULL,
@@ -1921,13 +130,8 @@
ALTER TABLE charpartition OWNER TO postgres;
CREATE SEQUENCE charpartition_id_sequence;
ALTER TABLE charpartition ALTER COLUMN charpartition_id SET DEFAULT nextval('charpartition_id_sequence');
--- alter sequence ancestralstate_id_sequence restart with 303;
+-- alter sequence charpartition_id_sequence restart with 429;
--- CREATE TABLE JRUAN.CHARSET_COLRANGE (
--- CHARSET_ID BIGINT NOT NULL,
--- COLUMNRANGE_ID BIGINT NOT NULL
--- )
--- GO
CREATE TABLE charset_colrange
(
charset_id bigint NOT NULL,
@@ -1936,14 +140,6 @@
WITH (OIDS=FALSE);
ALTER TABLE charset_colrange OWNER TO postgres;
--- CREATE TABLE JRUAN.CHARSET (
--- TYPE CHARACTER(1) NOT NULL,
--- CHARSET_ID BIGINT GENERATED BY DEFAULT AS IDENTITY (START WITH 1, INCREMENT BY 1, CACHE 20) NOT NULL,
--- VERSION INTEGER,
--- TITLE VARCHAR(255),
--- MATRIX_ID BIGINT
--- )
--- GO
CREATE TABLE charset
(
"type" character(1) NOT NULL,
@@ -1956,13 +152,8 @@
ALTER TABLE charset OWNER TO postgres;
CREATE SEQUENCE charset_id_sequence;
ALTER TABLE charset ALTER COLUMN charset_id SET DEFAULT nextval('charset_id_sequence');
--- alter sequence ancestralstate_id_sequence restart with 6190;
+-- alter sequence ancestralstate_id_sequence restart with 6335;
--- CREATE TABLE JRUAN.CHARWEIGHT_COLRANGE (
--- CHARWEIGHT_ID BIGINT NOT NULL,
--- COLUMNRANGE_ID BIGINT NOT NULL
--- )
--- GO
CREATE TABLE charweight_colrange
(
charweight_id bigint NOT NULL,
@@ -1971,15 +162,6 @@
WITH (OIDS=FALSE);
ALTER TABLE charweight_colrange OWNER TO postgres;
--- CREATE TABLE JRUAN.CHARWEIGHT (
--- TYPE CHARACTER(1) NOT NULL,
--- CHARWEIGHT_ID BIGINT GENERATED BY DEFAULT AS IDENTITY (START WITH 1, INCREMENT BY 1, CACHE 20) NOT NULL,
--- VERSION INTEGER,
--- WEIGHT INTEGER,
--- REALWEIGHT DOUBLE,
--- CHARWEIGHTSET_ID BIGINT
--- )
--- GO
CREATE TABLE charweight
(
"type" character(1) NOT NULL,
@@ -1995,13 +177,6 @@
ALTER TABLE charweight ALTER COLUMN charweight_id SET DEFAULT nextval('charweight_id_sequence');
-- alter sequence charweight_id_sequence restart with 1;
--- CREATE TABLE JRUAN.CHARWEIGHTSET (
--- CHARWEIGHTSET_ID BIGINT GENERATED BY DEFAULT AS IDENTITY (START WITH 1, INCREMENT BY 1, CACHE 20) NOT NULL,
--- VERSION INTEGER,
--- TITLE VARCHAR(255),
--- MATRIX_ID BIGINT
--- )
--- GO
CREATE TABLE charweightset
(
charweightset_id bigint NOT NULL,
@@ -2013,14 +188,8 @@
ALTER TABLE charweightset OWNER TO postgres;
CREATE SEQUENCE charweightset_id_sequence;
ALTER TABLE charweightset ALTER COLUMN charweightset_id SET DEFAULT nextval('charweightset_id_sequence');
--- alter sequence charweightset_id_sequence restart with 113;
+-- alter sequence charweightset_id_sequence restart with 208;
--- CREATE TABLE JRUAN.CITATION_AUTHOR (
--- CITATION_ID BIGINT NOT NULL,
--- AUTHORS_PERSON_ID BIGINT NOT NULL,
--- AUTHOR_ORDER INTEGER NOT NULL
--- )
--- GO
CREATE TABLE citation_author
(
citation_id bigint NOT NULL,
@@ -2030,12 +199,6 @@
WITH (OIDS=FALSE);
ALTER TABLE citation_author OWNER TO postgres;
--- CREATE TABLE JRUAN.CITATION_EDITOR (
--- CITATION_ID BIGINT NOT NULL,
--- EDITORS_PERSON_ID BIGINT NOT NULL,
--- EDITOR_ORDER INTEGER NOT NULL
--- )
--- GO
CREATE TABLE citation_editor
(
citation_id bigint NOT NULL,
@@ -2045,30 +208,6 @@
WITH (OIDS=FALSE);
ALTER TABLE citation_editor OWNER TO postgres;
--- CREATE TABLE JRUAN.CITATION (
--- TYPE CHARACTER(1) NOT NULL,
--- CITATION_ID BIGINT GENERATED BY DEFAULT AS IDENTITY (START WITH 1, INCREMENT BY 1, CACHE 20) NOT NULL,
--- VERSION INTEGER,
--- PMID VARCHAR(255),
--- URL VARCHAR(255),
--- ABSTRACT VARCHAR(10000),
--- DOI VARCHAR(255),
--- KEYWORDS VARCHAR(255),
--- PAGES VARCHAR(255),
--- PUBLISHYEAR INTEGER,
--- PUBLISHED SMALLINT,
--- TITLE VARCHAR(500),
--- ISSUE VARCHAR(255),
--- JOURNAL VARCHAR(255),
--- VOLUME VARCHAR(255),
--- ISBN VARCHAR(255),
--- BOOKTITLE VARCHAR(255),
--- CITY VARCHAR(255),
--- PUBLISHER VARCHAR(255),
--- CITATIONSTATUS_ID BIGINT,
--- TB_STUDYID VARCHAR(30)
--- )
--- GO
CREATE TABLE citation
(
"type" character(1) NOT NULL,
@@ -2097,14 +236,8 @@
ALTER TABLE citation OWNER TO postgres;
CREATE SEQUENCE citation_id_sequence;
ALTER TABLE citation ALTER COLUMN citation_id SET DEFAULT nextval('citation_id_sequence');
--- alter sequence citation_id_sequence restart with 2045;
+-- alter sequence citation_id_sequence restart with 18422;
--- CREATE TABLE JRUAN.CITATIONSTATUS (
--- CITATIONSTATUS_ID BIGINT GENERATED BY DEFAULT AS IDENTITY (START WITH 1, INCREMENT BY 1, CACHE 20) NOT NULL,
--- VERSION INTEGER,
--- DESCRIPTION VARCHAR(50)
--- )
--- GO
CREATE TABLE citationstatus
(
citationstatus_id bigint NOT NULL,
@@ -2117,11 +250,6 @@
ALTER TABL...
[truncated message content] |
|
From: <rv...@us...> - 2009-11-25 17:15:54
|
Revision: 329
http://treebase.svn.sourceforge.net/treebase/?rev=329&view=rev
Author: rvos
Date: 2009-11-25 17:15:46 +0000 (Wed, 25 Nov 2009)
Log Message:
-----------
Added taxon label set reverse lookup to taxon label
Modified Paths:
--------------
trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/TreeBaseObjects.pm
Modified: trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/TreeBaseObjects.pm
===================================================================
--- trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/TreeBaseObjects.pm 2009-11-25 12:41:19 UTC (rev 328)
+++ trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/TreeBaseObjects.pm 2009-11-25 17:15:46 UTC (rev 329)
@@ -1288,7 +1288,9 @@
CIPRES::TreeBase::VeryBadORM->register();
our %subobject = ( 'taxonvariant' => 'TaxonVariant' );
our %r_attr = ('treenodes' => 'PhyloTreeNode', 'rows' => 'MatrixRow');
-our %r2_attr = ('taxonlabelsets' => ['taxonlabelset_taxonlabel', 'TaxonLabelSet']);
+our %r2_attr = (
+ 'taxonlabelsets' => ['taxonlabelset_taxonlabel', 'TaxonLabelSet'],
+);
=head2 TaxonLabel
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rv...@us...> - 2009-11-25 12:41:26
|
Revision: 328
http://treebase.svn.sourceforge.net/treebase/?rev=328&view=rev
Author: rvos
Date: 2009-11-25 12:41:19 +0000 (Wed, 25 Nov 2009)
Log Message:
-----------
Added section explaining warning messages
Modified Paths:
--------------
trunk/treebase-core/src/main/perl/check/check
Modified: trunk/treebase-core/src/main/perl/check/check
===================================================================
--- trunk/treebase-core/src/main/perl/check/check 2009-11-25 12:36:02 UTC (rev 327)
+++ trunk/treebase-core/src/main/perl/check/check 2009-11-25 12:41:19 UTC (rev 328)
@@ -62,6 +62,97 @@
specified class. For example, "check Study 1234" prints out study #1234
and all of its trees, matrices, analyses, etc., and their contents.
+=head1 WARNING MESSAGES
+
+=head2 *** Analysis # contains data with the following taxonlabelsets: ##
+
+This means that the taxonlables in one analysis belong to more than
+one taxonlabelset. I had an idea at one point tha teach analysis's
+taxonlabels should belong to only one TLS. I think Bill explained to
+me that this was mistaken. Better double-check.
+
+=head2 *** Analysis # contains no matrices
+
+=head2 *** Analysis # contains no taxonlabelsets
+
+=head2 *** Analysis # contains no trees
+
+An analysis consists of a step that turns a matrix into one or more
+trees. An analysis with no matrices is missing its matrix. I believe
+that an analysis with no trees is similarly defective. The
+taxonlabels in the matrices and trees should be organized into
+taxonlabelsets.
+
+=head2 *** Matrix # has # rows but nchar=
+
+The actual number of columns doesn't match the NCHAR in the matrix
+table. ("Rows" should be "columns".)
+
+=head2 *** Matrix # has # rows but ntax=
+
+The actual number of rows doesn't match the NTAX in the matrix
+table.
+
+=head2 *** Object Matrix ## should have Study = #, but it is missing.
+
+The study contains an analysis which involces the specified matrix,
+but the matrix's STUDY field doesn't point back.
+
+=head2 *** Object TaxonLabel ## should have Study = #, but instead has #
+
+=head2 *** Study # has analyzed data with taxon label # which doesn't point back.
+
+Similarly, this taxonlabel is included in some tree or matrix that is
+part of the indicated study, but its STUDY field doesn't point back to
+the study. I think these are essentially the same, but I'm not
+certain; I'll try to remember to double-check.
+
+=head2 *** PhyloTree # has null title
+
+=head2 *** PhyloTree # has null tree_kind
+
+=head2 *** PhyloTree # has null tree_quality
+
+=head2 *** PhyloTree # has null tree_type
+
+Self-explanatory, I think.
+
+=head2 *** PhyloTreeNode # is a leaf but has no TaxonLabel
+
+Leaf nodes represent taxa and should have labels. Internal nodes do
+not necessarily.
+
+=head2 *** Study # has no citation
+
+Should be clear.
+
+=head2 *** Study # in # submissions.
+
+Each study should belong to exactly one submission.
+
+=head2 *** Submission # refers to matrix # which has no study.
+
+=head2 *** Submission # refers to taxonlabel # which doesn't refer back.
+
+=head2 *** Submission # refers to tree # which has no study.
+
+Submissions are linked to matrices, TLs, and trees via the
+submission_matrix table, etc. But if the submission is linked to a
+matrix, then the matrix should also point back to the study with which
+the submission is associated. That is,
+
+ for all submissions s,
+ for all m in s.matrices,
+ m.study.submission should be equal to s
+
+Similarly for trees and TLs.
+
+=head2 *** tree # references TLS #, but its node # contains TL # which is not in the set.
+
+"TLS" is taxonlabelset. The tree is associated with a TLS, which
+ought to contain all the taxonlabels that are attached to nodes in the
+tree. But the tree has a node with a taxonlabel that is not in the TLS.
+
=head1 AUTHOR
Mark Jason Dominus (mj...@pl...)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rv...@us...> - 2009-11-25 12:36:13
|
Revision: 327
http://treebase.svn.sourceforge.net/treebase/?rev=327&view=rev
Author: rvos
Date: 2009-11-25 12:36:02 +0000 (Wed, 25 Nov 2009)
Log Message:
-----------
POD syntax fixes
Modified Paths:
--------------
trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/VeryBadORM.pm
Modified: trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/VeryBadORM.pm
===================================================================
--- trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/VeryBadORM.pm 2009-11-25 06:21:22 UTC (rev 326)
+++ trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/VeryBadORM.pm 2009-11-25 12:36:02 UTC (rev 327)
@@ -70,8 +70,6 @@
method. The name of the joined table may be overridden by redefining the C<table> method
for the instantiated class. See the descriptions of those methods below for details.
-=back
-
=item 3. Reverse subobjects.
If the object's package contains an C<%r_attr> hash with key C<foo>, the value is taken to
@@ -132,7 +130,6 @@
The link table is C<study_author>, and the foreign table is C<person>. Then
C< Study->new(4)->authors > will return C<Person> objects 101 and 103.
-
=back
=head1 CLASS METHODS
@@ -161,8 +158,12 @@
return $DBH->prepare_cached($q);
}
+=back
+
=head1 INSTANCE METHODS
+=over
+
=item new()
Instantiates an instance of one of the classes defined in TreeBaseObjects. This
@@ -381,7 +382,13 @@
sub reified { $_[0]{'reified'} }
-# Flags that the invocant object has been reified.
+
+=item set_reified()
+
+Flags that the invocant object has been reified.
+
+=cut
+
sub set_reified { $_[0]{'reified'} = 1 }
=item get()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mjd...@us...> - 2009-11-25 06:21:56
|
Revision: 326
http://treebase.svn.sourceforge.net/treebase/?rev=326&view=rev
Author: mjdominus
Date: 2009-11-25 06:21:22 +0000 (Wed, 25 Nov 2009)
Log Message:
-----------
more docs; make some methods private and undocmuented
Modified Paths:
--------------
trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/VeryBadORM.pm
Modified: trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/VeryBadORM.pm
===================================================================
--- trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/VeryBadORM.pm 2009-11-25 06:01:41 UTC (rev 325)
+++ trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/VeryBadORM.pm 2009-11-25 06:21:22 UTC (rev 326)
@@ -62,12 +62,14 @@
the joined table, and an object of class C<Foo> will be constructed and returned.
Technical details: Whether an attribute is considered to be a subobject name is determined
-by the return value of the C<has_subobject> method. The foreign key column name may be
-overridden by redefining the C<foreign_key> method. The name of the instantiated class
-may be overridden by redefining the C<subobject_class> method. The name of the joined
-table may be overridden by redefining the C<table> method for the instantiated class. See
-the descriptions of those methods below for details.
+by the return value of the C<has_subobject> method. If so, the method
+C<get_subobject_no_check> is called to instantiate and return the subobject.
+The foreign key column name may be overridden by redefining the C<foreign_key> method.
+The name of the instantiated class may be overridden by redefining the C<subobject_class>
+method. The name of the joined table may be overridden by redefining the C<table> method
+for the instantiated class. See the descriptions of those methods below for details.
+
=back
=item 3. Reverse subobjects.
@@ -77,12 +79,14 @@
joined and all foreign objects linking to the invocant are returned.
Technical details: An attribute name is considered to designate a reverse subobject when
-the C<has_r_attr> method returns true. If so, the C<r_class> method is called to
-determine the class from which the subobjects will be instantiated, that class's C<table>
-method will determine the table joined, and that class's C<foreign_key> method will be
-called to determine the foreign key column for the join. See the descriptions of those
-methods below for details.
+the C<has_r_attr> method returns true. If so, C<get_r_subobject_no_check> is called to
+instantiate and return the corresponding subobjects.
+The C<r_class> method is called to determine the class from which the subobjects will be
+instantiated, that class's C<table> method will determine the table joined, and that
+class's C<foreign_key> method will be called to determine the foreign key column for the
+join. See the descriptions of those methods below for details.
+
=item 4. Linked objects.
If the invocant's package contains an C<%r2_attr> hash with key C<foo>, the value should be
@@ -99,13 +103,15 @@
C<id_attr> method is used.
Technical details: An attribute name is considered to designate a linked object when the
-C<has_r2_attr> method returns true. The C<r2_table> method is called to determine the
-name of the link table. The invocant's ID is looked up in the column of the link table
-named by the invocant's C<id_field> method, and the corresponding values of the column
-named by the C<r2_id_attr> method are gathered. An object is allocated for each resulting
-foreign id, in the class named by the C<r2_class> method. See the descriptions of those
-methods below for details.
+C<has_r2_attr> method returns true. Then C<get_r2_subobject_no_check> is called to
+instantiate and return the subobjects.
+The C<r2_table> method is called to determine the name of the link table. The invocant's
+ID is looked up in the column of the link table named by the invocant's C<id_field>
+method, and the corresponding values of the column named by the C<r2_id_attr> method are
+gathered. An object is allocated for each resulting foreign id, in the class named by the
+C<r2_class> method. See the descriptions of those methods below for details.
+
For example, consider the following tables:
study study_author person
@@ -260,7 +266,7 @@
=item foreign_key()
Given an attribute name, return the name of the field that stores foreign keys for that
-attribute.
+attribute. By default, this is just the attribute name with C<"_id"> appended.
=cut
@@ -272,12 +278,15 @@
=item attr_hash()
-Returns a hash reference of all available attributes for the invocant. It does this by first
-checking to see if there is an %attr hash defined in the invocant's class (and returns
-a reference to that if it's there). Otherwise it calls attr_list, uses its contents as keys
-(values are 1) and adds the class name . '_id', i.e. a lookup of the primary key. On subsequent
-calls the output is cached due to the autovivification of the package hash.
+Returns a reference to a hash whose keys are attribute names and whose values indicate
+whether the invocant possesses those attributes.
+If the invocant's package contains a hash named C<%attr>, a reference to that hash is
+returned immediately.
+
+Otherwise, C<attr_list> is called to produce a list of attributes, the list is
+converted to a hash, which is cached in C<%attr>, and a reference to C<%attr> is returned.
+
=cut
sub attr_hash {
@@ -297,11 +306,12 @@
=item attr_list()
-Returns an array reference of available attributes. It does this by checking if there is an
-array ref $attr available in the invocant's class (and returns that). Otherwise it checks
-the invocant's mapped database table and collects the returned column names and returns those.
-On subsequent calls the output is cached due to the autovivification of the package array.
+Returns a reference to an array of available attributes.
+If the invocant's package contains an array C<@attr>, a reference to this array is
+returned. Otherwise, the method queries the invocant's mapped database table, collects
+the returned column names, caches them in C<@attr>, and returns a reference to that array.
+
=cut
sub attr_list {
@@ -323,27 +333,15 @@
return $attr_list;
}
-=item r_attr_hash()
-
-Returns the %r_attr hash defined in the invocant's class (see TreeBaseObjects for a description
-of what that hash is for).
-
-=cut
-
-sub r_attr_hash {
+# Returns the %r_attr hash defined in the invocant's class
+sub _r_attr_hash {
my $base = shift;
my $class = ref($base) || $base;
return my $r_attr_hash = \%{"$class\::r_attr"};
}
-=item r2_attr_hash()
-
-Returns the %r2_attr hash defined in the invocant's class (see TreeBaseObjects for a description
-of what that hash is for).
-
-=cut
-
-sub r2_attr_hash {
+# Returns the %r2_attr hash defined in the invocant's class
+sub _r2_attr_hash {
my $base = shift;
my $class = ref($base) || $base;
return my $r_attr_hash = \%{"$class\::r2_attr"};
@@ -351,7 +349,7 @@
=item reify()
-Populates the invocant object's attributes from the database.
+Populates the invocant object's direct attributes from the database.
=cut
@@ -383,19 +381,14 @@
sub reified { $_[0]{'reified'} }
-=item set_reified()
-
-Flags that the invocant object has been reified.
-
-=cut
-
+# Flags that the invocant object has been reified.
sub set_reified { $_[0]{'reified'} = 1 }
=item get()
Given an invocant and an attribute name, returns the attribute value.
-See the section L<> for details of how attribute names are resolved.
+See the section L<OBJECT ATTRIBUTES> for details of how attribute names are resolved.
=cut
@@ -417,8 +410,8 @@
=item get_no_check()
-Returns the value of the supplied attribute name as applies to the invocant object. This will
-most likely just return scalar, non-reference values such as titles and labels.
+Given the name of a direct attribute, return the value of that attribute in the invoking
+object. Does not check that the attribute name is valid.
=cut
@@ -431,14 +424,15 @@
=item get_subobject_no_check()
-Treats the supplied attribute name as either a true attribute or name from which a subobject
-(in one-to-one relation) is instantiated. See description of %subobject hash in TreeBaseObjects.
+Given the name of a subobject attribute, instantiate and return the subobject. Does not
+check that the attribute name is valid.
=cut
sub get_subobject_no_check {
my ($self, $attr) = @_;
return $self->{$attr} if exists $self->{$attr};
+ # XXX what if the foreign key returned here is misspelled?
my $id = $self->get($self->foreign_key($attr));
return unless defined $id;
return $self->{$attr} = $self->subobject_class($attr)->new($id);
@@ -446,9 +440,14 @@
=item get_r_subobject_no_check()
-Treats the supplied attribute name as either a true attribute or name from which a subobject
-(in many-to-one relation) is instantiated. See description of %r_attr hash in TreeBaseObjects.
+Given the name of a reverse subobject attribute, instantiate and return the subobjects.
+Does not check that the attribute name is valid.
+The C<r_class> method is called to determine the class from which the subobjects will be
+instantiated, that class's C<table> method will determine the table joined, and that
+class's C<foreign_key> method will be called to determine the foreign key column for the
+join.
+
=cut
# Example: Studies have analyses as a subobject
@@ -474,9 +473,15 @@
=item get_r2_subobject_no_check()
-Treats the supplied attribute name as either a true attribute or name from which a subobject
-(in many-to-one relation) is instantiated. See description of %r2_attr hash in TreeBaseObjects.
+Given the name of a linked subobject attribute, instantiate and return the linked
+subobjects. Does not check that the attribute name is valid.
+The C<r2_table> method is called to determine the name of the link table. The invocant's
+ID is looked up in the column of the link table named by the invocant's C<id_field>
+method, and the corresponding values of the column named by the C<r2_id_attr> method are
+gathered. An object is allocated for each resulting foreign ID, in the class named by the
+C<r2_class> method.
+
=cut
# Example: Treeblocks have submissions as subobjects
@@ -488,7 +493,7 @@
sub get_r2_subobject_no_check {
my ($self, $attr) = @_;
# $attr = uc $attr;
- my $q = $self->r2_subobject_query($attr);
+ my $q = $self->_r2_subobject_query($attr);
my $target_class = $self->r2_class($attr);
my $sth = $self->_prepare_cached($q);
$sth->execute($self->id);
@@ -499,19 +504,13 @@
return @results;
}
-=item r2_subobject_query()
+# Creates a SQL statement to resolve the many-to-many relationship (through intersection table)
+# between the invocant object and the supplied attribute. It does this by looking up the class
+# name to instantiate from (by calling r2_class()), the intersection table to look up the relation
+# (by calling r2_table()) and the field name of the id column in the intersection table (by calling
+# r2_id_attr()).
-Creates a SQL statement to resolve the many-to-many relationship (through intersection table)
-between the invocant object and the supplied attribute. It does this by looking up the class
-name to instantiate from (by calling r2_class()), the intersection table to look up the relation
-(by calling r2_table()) and the field name of the id column in the intersection table (by calling
-r2_id_attr()).
-
-See description of %r2_attr hash in TreeBaseObjects.
-
-=cut
-
-sub r2_subobject_query {
+sub _r2_subobject_query {
my ($self, $attr) = @_;
my $target_class = $self->r2_class($attr);
@@ -547,7 +546,7 @@
my ($self, $attr) = @_;
# Would it make more sense to use $self->foreign_key($attr) as the fallback here?
# 20091125 MJD
- $self->r2_attr_hash()->{$attr}->[2] || $self->r2_class($attr)->id_attr;
+ $self->_r2_attr_hash()->{$attr}->[2] || $self->r2_class($attr)->id_attr;
}
=item to_str()
@@ -692,7 +691,7 @@
sub r_class {
my ($self, $r_attr) = @_;
- return $self->r_attr_hash()->{$r_attr};
+ return $self->_r_attr_hash()->{$r_attr};
}
=item r2_table()
@@ -707,7 +706,7 @@
sub r2_table {
my ($self, $r_attr) = @_;
- return $self->r2_attr_hash()->{$r_attr}->[0];
+ return $self->_r2_attr_hash()->{$r_attr}->[0];
}
=item r2_class()
@@ -722,7 +721,7 @@
sub r2_class {
my ($self, $r_attr) = @_;
- return $self->r2_attr_hash()->{$r_attr}->[1];
+ return $self->_r2_attr_hash()->{$r_attr}->[1];
}
=item dump()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mjd...@us...> - 2009-11-25 06:02:58
|
Revision: 325
http://treebase.svn.sourceforge.net/treebase/?rev=325&view=rev
Author: mjdominus
Date: 2009-11-25 06:01:41 +0000 (Wed, 25 Nov 2009)
Log Message:
-----------
bug fix in has_subobject, plus regression test
Modified Paths:
--------------
trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/VeryBadORM.pm
Added Paths:
-----------
trunk/treebase-core/src/main/perl/t/80_regression.t
Modified: trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/VeryBadORM.pm
===================================================================
--- trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/VeryBadORM.pm 2009-11-25 05:58:49 UTC (rev 324)
+++ trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/VeryBadORM.pm 2009-11-25 06:01:41 UTC (rev 325)
@@ -253,7 +253,8 @@
sub has_subobject {
my $base = shift;
my $subobj = shift;
- return $base->has_attr($base->foreign_key($subobj));
+ my $fk = $base->foreign_key($subobj) or return;
+ return $base->has_attr($fk);
}
=item foreign_key()
Added: trunk/treebase-core/src/main/perl/t/80_regression.t
===================================================================
--- trunk/treebase-core/src/main/perl/t/80_regression.t (rev 0)
+++ trunk/treebase-core/src/main/perl/t/80_regression.t 2009-11-25 06:01:41 UTC (rev 325)
@@ -0,0 +1,21 @@
+
+use Test::More tests => 1;
+
+BEGIN {
+ require CIPRES::TreeBase::VeryBadORM;
+
+ package TestObject;
+ CIPRES::TreeBase::VeryBadORM->register;
+ sub table { "study" }
+ sub foreign_key { return undef; }
+}
+
+# Regression test for bug in has_subobject: if ->foreign_key indicates that the attribute is
+# unknown, don't try to call has_attr on the failed result value
+# 20091125 MJD
+use DBI;
+my $dbh = DBI->connect("DBI:CSV:f_dir=test_db;csv_eol=\n");
+CIPRES::TreeBase::VeryBadORM->set_db_connection($dbh);
+
+ok(! TestObject->has_subobject("poo"), "foreign_key method failure");
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mjd...@us...> - 2009-11-25 05:59:46
|
Revision: 324
http://treebase.svn.sourceforge.net/treebase/?rev=324&view=rev
Author: mjdominus
Date: 2009-11-25 05:58:49 +0000 (Wed, 25 Nov 2009)
Log Message:
-----------
lots more documentation
Modified Paths:
--------------
trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/TreeBaseObjects.pm
trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/VeryBadORM.pm
Modified: trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/TreeBaseObjects.pm
===================================================================
--- trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/TreeBaseObjects.pm 2009-11-25 04:21:49 UTC (rev 323)
+++ trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/TreeBaseObjects.pm 2009-11-25 05:58:49 UTC (rev 324)
@@ -16,77 +16,6 @@
on.
-=head1 OBJECT ATTRIBUTES
-
-In general, if a database object, represented by C<$X>, has an attribute named C<foo>, then
-C< $X->foo > retrieves the value of the attribute. If the attribute is a scalar, the value is
-returned as a Perl scalar; if the attribute is a reference to another database object, a
-Perl object is returned.
-
-Each object is assumed to correspond to a single table in the database. If the object class is
-C<ObjectClass>, the corresponding table name is assumed to be C<objectclass>. This can be
-overridden by defining the C<ObjectClass::table> method, which should return the correct table
-name.
-
-Each object from class C<ObjectClass> is assumed to have a unique ID attribute which is stored
-in the table in a field whose name is returned by C<ObjectClass::id_attr>. This defaults to
-C<objectclass_id> if the method is not overridden.
-
-C<ObjectClass::new(C<$id>)> will create an object with the specified ID number. Objects are
-created lazily: the database is not consulted until some
-
-We will consider a running example, a database which contains studies, trees, and matrices.
-Each tree and each matrix is contained in exactly one study, but each study may have multiple
-trees and matrices.
-
-Each tree contains zero or more treenodes, and each matrix contains zero or more matrixrows.
-
-Suppose the C<tree> table contains a field, C<study_id>, which contains the foreign key of the
-
-=over
-
-=item %r_attr
-
-This hash specifies which other classes refer to the specifying class in a many-to-one relationship.
-For example:
-
- %Analysis::r_attr = ( 'analysissteps' => 'AnalysisStep' );
-
-Specifies that multiple AnalysisStep objects may refer to an invocant Analysis object, and that
-these AnalysisStep objects can be instantiated by calling the Analysis::analysissteps() method.
-
-=item %r2_attr
-
-This hash specifies associated objects which are linked to instances of the specifying class
-through an intersection table. For example:
-
- %Citation::r2_attr = (
- 'authors' => ['citation_author', 'Person', 'authors_person_id']
- );
-
-Specifies that associated instances of the Person class can be fetched by calling the
-Citation::authors() method which will look in the citation_author table and instantiate
-Person objects passing the values in the authors_person_id column to the Person
-constructor.
-
-=item %subobject
-
-This hash specifies associated classes which are identified by foreign keys in the table that is
-mapped onto the specifying class. For example:
-
- %PhyloTree::subobject = (
- 'rootnode' => 'PhyloTreeNode',
- 'treetype' => 'TreeType'
- );
-
-Specifies that an associated instance (one-to-one) of the PhyloTree's root node (instantiated
-as a PhyloTreeNode) and of the tree type (instantiates as a TreeType object) can be
-created by calling the rootnode() and treetype() methods, respectively. Calls to those methods
-will look in phylotree.rootnode_id and phylotree.treetype_id in the row of the invocant object
-and create the right associated objects.
-
-=back
-
=head1 PACKAGE METHODS
=over
Modified: trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/VeryBadORM.pm
===================================================================
--- trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/VeryBadORM.pm 2009-11-25 04:21:49 UTC (rev 323)
+++ trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/VeryBadORM.pm 2009-11-25 05:58:49 UTC (rev 324)
@@ -20,22 +20,117 @@
This module maps relations in a relational database to objects in Perl. It avoids all difficult
implementation problems by providing only read-only access.
-=head1 PACKAGE VARIABLES
+=head1 OBJECT ATTRIBUTES
-=over
+In general, if a database object, represented by C<$X>, has an attribute named C<foo>,
+then C< $X->foo > or C< $x->get('foo') > retrieves the value of the attribute. If the
+attribute is a scalar, the value is returned as a Perl scalar; if the attribute is a
+reference to another database object, a Perl object is returned.
-=item %dbh
+Each object is assumed to correspond to a single table in the database. If the object
+class is C<ObjectClass>, the corresponding table name is assumed to be C<objectclass>.
+This can be overridden by defining the C<ObjectClass::table> method, which should return
+the correct table name.
-This hash holds cached database handles keyed on class names.
+Each object from class C<ObjectClass> is assumed to have a unique ID attribute which is stored
+in the table in a field whose name is returned by C<ObjectClass::id_attr>. This defaults to
+C<objectclass_id> if the method is not overridden.
-=item $DBH
+C<ObjectClass::new(C<$id>)> will create an object with the specified ID number. Objects
+are created lazily: the database is not consulted until some other attribute of the object
+is read.
-Holds a singleton database handle
+Attributes are of four types. The call C< $Object->foo > will be resolved in the
+following order:
+=over 4
+
+=item 1. Direct attributes.
+
+If the object's table has a column whose name is exactly C<foo>, the value from that
+column will be returned directly. SQL C<NULL> values are returned as Perl C<undef>.
+
+Technical details: Whether an attribute name is considered a direct attribute is
+determined by the return value of the C<has_attr> method. If C<has_attr> returns true,
+C<get_no_check> is called to produce the attribute value. See the descriptions of those
+methods below for details.
+
+=item 2. Subobjects.
+
+If the object's table has a column whose name is C<foo_id>, its value is taken to be a
+foreign key, joining to a table named C<foo>. The corresponding record is looked up in
+the joined table, and an object of class C<Foo> will be constructed and returned.
+
+Technical details: Whether an attribute is considered to be a subobject name is determined
+by the return value of the C<has_subobject> method. The foreign key column name may be
+overridden by redefining the C<foreign_key> method. The name of the instantiated class
+may be overridden by redefining the C<subobject_class> method. The name of the joined
+table may be overridden by redefining the C<table> method for the instantiated class. See
+the descriptions of those methods below for details.
+
=back
-=head1 PACKAGE METHODS
+=item 3. Reverse subobjects.
+If the object's package contains an C<%r_attr> hash with key C<foo>, the value is taken to
+be a class that contains a foreign key linking to the invocant's table. The tables are
+joined and all foreign objects linking to the invocant are returned.
+
+Technical details: An attribute name is considered to designate a reverse subobject when
+the C<has_r_attr> method returns true. If so, the C<r_class> method is called to
+determine the class from which the subobjects will be instantiated, that class's C<table>
+method will determine the table joined, and that class's C<foreign_key> method will be
+called to determine the foreign key column for the join. See the descriptions of those
+methods below for details.
+
+=item 4. Linked objects.
+
+If the invocant's package contains an C<%r2_attr> hash with key C<foo>, the value should be
+an array whose first element is the name of a link table that contains keys for both the
+invocant's table and a foreign table. The three tables are joined, and the objects from
+the foreign table that link through to the invocant are returned. The value
+C<$r2_attr{foo}> has the following format:
+
+ [ link table name,
+ class in which foreign objects are instantiated,
+ column of link table with foreign keys ]
+
+The third of these is optional; if omitted, the name returned by the foreign class's
+C<id_attr> method is used.
+
+Technical details: An attribute name is considered to designate a linked object when the
+C<has_r2_attr> method returns true. The C<r2_table> method is called to determine the
+name of the link table. The invocant's ID is looked up in the column of the link table
+named by the invocant's C<id_field> method, and the corresponding values of the column
+named by the C<r2_id_attr> method are gathered. An object is allocated for each resulting
+foreign id, in the class named by the C<r2_class> method. See the descriptions of those
+methods below for details.
+
+For example, consider the following tables:
+
+ study study_author person
+
+ study_id study_id person_id person_id
+ 1 1 100 100
+ 2 2 101 101
+ 3 2 102 102
+ 4 2 103 103
+ 3 102
+ 4 101
+ 4 103
+
+Suppose that C<%study::r2_attr> contains:
+
+ authors => [ 'study_author', 'Person', 'person_id' ]
+
+The link table is C<study_author>, and the foreign table is C<person>. Then
+C< Study->new(4)->authors > will return C<Person> objects 101 and 103.
+
+
+=back
+
+=head1 CLASS METHODS
+
=over
=item set_db_connection()
@@ -54,30 +149,19 @@
sub get_db_connection { my $class = shift; return $dbh{$class}; }
-=back
-
-=head1 INSTANCE METHODS
-
-=over
-
-=item prepare_cached()
-
-Prepares a query on the singleton database handle, returns statement handler.
-
-=cut
-
-sub prepare_cached {
+# Private; should remain undocumented
+sub _prepare_cached {
my ($self, $q) = @_;
return $DBH->prepare_cached($q);
}
+=head1 INSTANCE METHODS
+
=item new()
-Instantiates an instance of one of the classes defined in TreeBaseObjects. This constructor
-requires that the singleton database handle $CIPRES::TreeBase::VeryBadORM::DBH has been defined
-and that a valid ID is supplied as argument. Instantiated objects are cached in the private
-%cache hash as $cache{$class}{$id}. Returned objects are simply blessed hash references that
-contain the ID as { 'id' => $id }
+Instantiates an instance of one of the classes defined in TreeBaseObjects. This
+constructor requires that the singleton database handle $CIPRES::TreeBase::VeryBadORM::DBH
+has been defined and that a valid ID is supplied as argument.
=cut
@@ -97,20 +181,9 @@
return $obj;
}
-=item AUTOLOAD
-
-Provides the magical methods available in the child classes. It does this by checking which of
-has_attr(), has_subobject(), has_r_attr() or has_r2_attr() applies and invokes one of
-get_no_check(), get_subobject_no_check(), get_r_subobject_no_check() or get_r2_subobject_no_check()
-respectively. Croaks otherwise.
-
-=cut
-
# Maybe add some caching here at some point
#
-# This should dispatch off to ->get because the code in the
-# two places is almost the same and we've already had one bug
-# occur when they didn't stay in sync. mjd 20091123
+# Do not document this; it's private
sub AUTOLOAD {
our $AUTOLOAD;
my ($package, $method) = $AUTOLOAD =~ /(.*)::(.*)/;
@@ -121,9 +194,12 @@
=item has_attr()
-Checks to see if the invocant's class defines the supplied attribute. It does this by calling
-attr_hash() and doing a lookup for the supplied attribute in the returned hash.
+Given an attribute name, check to see if the invocant's class has a direct attribute with
+that name, and return true or false.
+By default, it looks for the attribute name as a key in the hash returned by the
+C<attr_hash()> method.
+
=cut
sub has_attr {
@@ -134,10 +210,12 @@
=item has_r_attr()
-Checks to see if the invocant's class defines the supplied "reverse attribute" (see
-L<TreeBaseObjects> for the description of the %r_attr hash). It does this by returning whatever
-is returned by r_class() whilst passing it the supplied "reverse attribute"'s name.
+Given an attribute name, check to see if the invocant's class has a reverse attribute with
+that name, and return true or false.
+By default, this just passes the attribute name to the C<r_class> method to see if an
+instantiating class is known for the reverse attribute.
+
=cut
sub has_r_attr {
@@ -148,11 +226,12 @@
=item has_r2_attr()
-Checks to see if the invocant's class defines the supplied "reverse attribute through
-intersection table" (see L<TreeBaseObjects> for the description of the %r2_attr hash). It does this
-by returning whatever is returned by r2_class() whilst passing it the supplied "reverse
-attribute through intersection table"'s name.
+Given an attribute name, check to see if the invocant's class has a link attribute with
+that name, and return true or false.
+By default, this just passes the attribute name to the C<r2_class> method to see if an
+instantiating class is known for the link attribute.
+
=cut
sub has_r2_attr {
@@ -163,10 +242,12 @@
=item has_subobject()
-Checks to see if the invocant is associated with the supplied subobject. It does this by
-first turning the subobject's name into a foreign key column (by calling foreign_key()) and then
-checking whether that column is available as an attribute (by calling has_attr()).
+Given an attribute name, check to see if the invocant's class has a subobject attribute with
+that name, and return true or false.
+By default, this method first obtains the name of the foreign key field used for this
+attribute, and then checks to see if the invocant has a direct attribute with that name.
+
=cut
sub has_subobject {
@@ -177,8 +258,8 @@
=item foreign_key()
-Turns the supplied argument into a foreign key column. It does this by lower casing the
-argument string and appending '_id'.
+Given an attribute name, return the name of the field that stores foreign keys for that
+attribute.
=cut
@@ -311,11 +392,10 @@
=item get()
-Given an invocant and a supplied attribute name, returns the attribute value. What the attribute
-actually is, is decided by first checking has_attr(), has_subobject(), has_r_attr() and returns
-the output of either get_no_check(), get_subobject_no_check() or get_r_subobject_no_check()
-respectively. B<This method is probably never used and therefore probably buggy.>
+Given an invocant and an attribute name, returns the attribute value.
+See the section L<> for details of how attribute names are resolved.
+
=cut
sub get {
@@ -409,7 +489,7 @@
# $attr = uc $attr;
my $q = $self->r2_subobject_query($attr);
my $target_class = $self->r2_class($attr);
- my $sth = $self->prepare_cached($q);
+ my $sth = $self->_prepare_cached($q);
$sth->execute($self->id);
my @results;
while (my ($target_id) = $sth->fetchrow) {
@@ -464,6 +544,8 @@
sub r2_id_attr {
my ($self, $attr) = @_;
+# Would it make more sense to use $self->foreign_key($attr) as the fallback here?
+# 20091125 MJD
$self->r2_attr_hash()->{$attr}->[2] || $self->r2_class($attr)->id_attr;
}
@@ -544,18 +626,24 @@
=item subobject_class()
-Returns the class name for the supplied attribute name. The default is the name of the attribute,
-lowercase with initial capital. This may be overridden by an entry in the C<%subobject> hash in the
-invocant's class. For example, suppose there are C<Dessert> objects and C<Flavor> objects. Suppose
-each C<Dessert> has a C<flavor> and an C<alternate_flavor> attribute, which are C<Flavor> objects.
-One could represent this by defining:
+Given an attribute name, return the name of the class that represents that attribute.
+The default version looks up the attribute name as a key in the hash C<%subobject>, and,
+returns the associated value, if there is one.
+
+If not, it converts the attribute name to all-lowercase, uppercases the first character,
+and uses the result. For example, the default class for the C<potato> attribute is C<Potato>.
+
+For example, suppose there are C<Dessert> objects and C<Flavor> objects. Suppose each
+C<Dessert> has a C<flavor> and an C<alternate_flavor> attribute, which are C<Flavor>
+objects. One could represent this by defining:
+
%Dessert::subobject = (flavor => 'Flavor',
alternate_flavor => 'Flavor',
);
-which says that whenever a C<Dessert> object's C<flavor> or C<alternate_flavor> attributes are
-accessed, C<VeryBadORM> should instantiate them as C<Flavor> objects.
+which says that whenever a C<Dessert> object's C<flavor> or C<alternate_flavor> attributes
+are accessed, C<VeryBadORM> should instantiate them as C<Flavor> objects.
But one could omit the first entry from the hash:
@@ -566,7 +654,6 @@
One may, of course, override this method to implement any mapping of attribute to class names that
is desired.
-
=cut
sub subobject_class {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mjd...@us...> - 2009-11-25 04:21:56
|
Revision: 323
http://treebase.svn.sourceforge.net/treebase/?rev=323&view=rev
Author: mjdominus
Date: 2009-11-25 04:21:49 +0000 (Wed, 25 Nov 2009)
Log Message:
-----------
eliminate duplicate code; make action of AUTOLOAD clearer
Modified Paths:
--------------
trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/VeryBadORM.pm
Modified: trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/VeryBadORM.pm
===================================================================
--- trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/VeryBadORM.pm 2009-11-24 21:28:47 UTC (rev 322)
+++ trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/VeryBadORM.pm 2009-11-25 04:21:49 UTC (rev 323)
@@ -112,22 +112,11 @@
# two places is almost the same and we've already had one bug
# occur when they didn't stay in sync. mjd 20091123
sub AUTOLOAD {
- my $obj = shift;
our $AUTOLOAD;
my ($package, $method) = $AUTOLOAD =~ /(.*)::(.*)/;
- if ($package->has_attr($method)) {
- return $obj->get_no_check($method, @_);
- } elsif ($package->has_subobject($method)) {
- return $obj->get_subobject_no_check($method, @_);
- } elsif ($package->has_r_attr($method)) {
- return $obj->get_r_subobject_no_check($method, @_);
- } elsif ($package->has_r2_attr($method)) {
- return $obj->get_r2_subobject_no_check($method, @_);
- } else {
-# my $trace = Devel::StackTrace->new;
-# print $trace->as_string; # like carp
- croak("Unknown attribute '$method' in class '$package'");
- }
+ @_ = ($_[0], $method);
+ my $get = $package->can("get");
+ goto &$get;
}
=item has_attr()
@@ -337,6 +326,8 @@
return $self->get_subobject_no_check($attr, @_);
} elsif ($self->has_r_attr($attr)) {
return $self->get_r_subobject_no_check($attr, @_);
+ } elsif ($self->has_r2_attr($attr)) {
+ return $self->get_r2_subobject_no_check($attr, @_);
}
# my $trace = Devel::StackTrace->new;
# print $trace->as_string; # like carp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mjd...@us...> - 2009-11-24 21:29:43
|
Revision: 322
http://treebase.svn.sourceforge.net/treebase/?rev=322&view=rev
Author: mjdominus
Date: 2009-11-24 21:28:47 +0000 (Tue, 24 Nov 2009)
Log Message:
-----------
add another link table test
Modified Paths:
--------------
trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/TestObjects.pm
trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/VeryBadORM.pm
trunk/treebase-core/src/main/perl/t/23_link.t
Modified: trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/TestObjects.pm
===================================================================
--- trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/TestObjects.pm 2009-11-24 19:47:39 UTC (rev 321)
+++ trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/TestObjects.pm 2009-11-24 21:28:47 UTC (rev 322)
@@ -10,11 +10,12 @@
package Person;
CIPRES::TreeBase::VeryBadORM->register();
+%r2_attr = (studies => ['study_author', 'Study']);
package Study;
CIPRES::TreeBase::VeryBadORM->register();
%r_attr = (matrices => 'Matrix');
-%r2_attr = (people => ['study_author', 'Person']);
+%r2_attr = (people => ['study_author', 'Person', 'person_id']);
package Tree;
CIPRES::TreeBase::VeryBadORM->register();
Modified: trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/VeryBadORM.pm
===================================================================
--- trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/VeryBadORM.pm 2009-11-24 19:47:39 UTC (rev 321)
+++ trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/VeryBadORM.pm 2009-11-24 21:28:47 UTC (rev 322)
@@ -453,13 +453,22 @@
=item r2_id_attr()
Returns name of the foreign key column in the intersection table of the referenced objects
-(as opposed to instances of the invocant column) in a many-to-many relation. By default, it
-consults %r2_attr first. And if that doesn't work, it consults the foreign class's %r2 instead,
-to see if the relationship was defined in the other direction.
+(as opposed to instances of the invocant column) in a many-to-many relation.
-See description of %r2_attr hash in TreeBaseObjects. This method returns the 3rd element (index 2)
-in the value array ref.
+If C<%r2_attr> lists a target class for the referenced object,
+C<r2_id_attr> uses that class's default C<id_attr>, unless that us
+overriden by C<%r2_attr>. For example, if C<Study> has:
+ %Study::r2_attr = (nexusfiles => ['study_nexus', 'Nexus'])
+
+then the C<nexus_id> column will be consulted, unless
+C<Nexus->id_attr> returns something else. But if the attribute is
+given explicitly, like this:
+
+ %Study::r2_attr = (nexusfiles => ['study_nexus', 'Nexus', 'nexusfileID'])
+
+then the C<nexusfileID> column of the C<study_nexus> table will be consulted.
+
=cut
sub r2_id_attr {
Modified: trunk/treebase-core/src/main/perl/t/23_link.t
===================================================================
--- trunk/treebase-core/src/main/perl/t/23_link.t 2009-11-24 19:47:39 UTC (rev 321)
+++ trunk/treebase-core/src/main/perl/t/23_link.t 2009-11-24 21:28:47 UTC (rev 322)
@@ -1,9 +1,9 @@
-use Test::More tests => 2;
+use Test::More tests => 5;
#
# Tests for link attributes (%r2_attr)
#
-
+use lib '../lib';
use_ok('CIPRES::TreeBase::TestObjects');
use DBI;
my $dbh = DBI->connect("DBI:CSV:f_dir=test_db;csv_eol=\n");
@@ -25,3 +25,14 @@
}
ok($FAIL eq "", $FAIL || "check study 5 people");
+
+# ----------------------------------------------------------------
+# This is to test that reverse attributes are inferred automatically,
+# without requiring a separate r2_attr declaration
+
+my @p7_studies = sort { $a->id <=> $b->id } Person->new(7)->studies;
+
+is(scalar @p7_studies, 2, "Septimus is involved in 2 studies");
+is($p7_studies[0]->id, 5, "Septimus in study 5");
+is($p7_studies[1]->id, 7, "Septimus in study 7");
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mjd...@us...> - 2009-11-24 19:47:48
|
Revision: 321
http://treebase.svn.sourceforge.net/treebase/?rev=321&view=rev
Author: mjdominus
Date: 2009-11-24 19:47:39 +0000 (Tue, 24 Nov 2009)
Log Message:
-----------
Remove owner field from study
Add link tests study -> study_author -> person
Modified Paths:
--------------
trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/TestObjects.pm
trunk/treebase-core/src/main/perl/t/01_basic.t
trunk/treebase-core/src/main/perl/t/20_scalar.t
trunk/treebase-core/src/main/perl/test_db/study
Added Paths:
-----------
trunk/treebase-core/src/main/perl/t/23_link.t
Removed Paths:
-------------
trunk/treebase-core/src/main/perl/23_link.t
Deleted: trunk/treebase-core/src/main/perl/23_link.t
===================================================================
--- trunk/treebase-core/src/main/perl/23_link.t 2009-11-24 19:33:56 UTC (rev 320)
+++ trunk/treebase-core/src/main/perl/23_link.t 2009-11-24 19:47:39 UTC (rev 321)
@@ -1,12 +0,0 @@
-use Test::More tests => 1;
-
-#
-# Tests for link attributes (%r2_attr)
-#
-
-use_ok('CIPRES::TreeBase::TestObjects');
-use DBI;
-my $dbh = DBI->connect("DBI:CSV:f_dir=test_db;csv_eol=\n");
-CIPRES::TreeBase::VeryBadORM->set_db_connection($dbh);
-
-ok(1);
Modified: trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/TestObjects.pm
===================================================================
--- trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/TestObjects.pm 2009-11-24 19:33:56 UTC (rev 320)
+++ trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/TestObjects.pm 2009-11-24 19:47:39 UTC (rev 321)
@@ -3,9 +3,18 @@
require CIPRES::TreeBase::VeryBadORM;
+package Matrix;
+CIPRES::TreeBase::VeryBadORM->register();
+
+sub table { "matrices" }
+
+package Person;
+CIPRES::TreeBase::VeryBadORM->register();
+
package Study;
CIPRES::TreeBase::VeryBadORM->register();
%r_attr = (matrices => 'Matrix');
+%r2_attr = (people => ['study_author', 'Person']);
package Tree;
CIPRES::TreeBase::VeryBadORM->register();
@@ -16,11 +25,6 @@
sub table { "TREE" }
sub id_attr { "TreeId" }
-package Matrix;
-CIPRES::TreeBase::VeryBadORM->register();
-
-sub table { "matrices" }
-
package TreeNode;
CIPRES::TreeBase::VeryBadORM->register();
Modified: trunk/treebase-core/src/main/perl/t/01_basic.t
===================================================================
--- trunk/treebase-core/src/main/perl/t/01_basic.t 2009-11-24 19:33:56 UTC (rev 320)
+++ trunk/treebase-core/src/main/perl/t/01_basic.t 2009-11-24 19:47:39 UTC (rev 321)
@@ -1,12 +1,12 @@
-use Test::More tests => 50;
+use Test::More tests => 49;
use_ok('DBI');
use_ok('DBD::CSV');
ok(my $dbh = DBI->connect("DBI:CSV:f_dir=test_db;csv_eol=\n"));
-check_table('study', qw(name study_id owner tree_id));
+check_table('study', qw(name study_id tree_id));
check_table('matrices', qw(matrix_id name n_rows study_id));
check_table('TREE', qw(TreeId name root_node_id));
check_table('node', qw(treenode_id tree_id left_child right_child data));
Modified: trunk/treebase-core/src/main/perl/t/20_scalar.t
===================================================================
--- trunk/treebase-core/src/main/perl/t/20_scalar.t 2009-11-24 19:33:56 UTC (rev 320)
+++ trunk/treebase-core/src/main/perl/t/20_scalar.t 2009-11-24 19:47:39 UTC (rev 321)
@@ -8,8 +8,8 @@
ok(my $s1 = Study->new(1));
is($s1->name, 'study one');
-ok(my $s8 = Study->new(8));
-is($s8->owner, 'Otto');
+ok(my $person = Person->new(8));
+is($person->first, 'Otto');
is(Tree->new(120)->name, "tree cxx");
is(Matrix->new(25)->n_rows, 26);
\ No newline at end of file
Added: trunk/treebase-core/src/main/perl/t/23_link.t
===================================================================
--- trunk/treebase-core/src/main/perl/t/23_link.t (rev 0)
+++ trunk/treebase-core/src/main/perl/t/23_link.t 2009-11-24 19:47:39 UTC (rev 321)
@@ -0,0 +1,27 @@
+use Test::More tests => 2;
+
+#
+# Tests for link attributes (%r2_attr)
+#
+
+use_ok('CIPRES::TreeBase::TestObjects');
+use DBI;
+my $dbh = DBI->connect("DBI:CSV:f_dir=test_db;csv_eol=\n");
+CIPRES::TreeBase::VeryBadORM->set_db_connection($dbh);
+
+my $FAIL = "";
+my @s5_people = Study->new(5)->people;
+my %x_people = map {$_ => 1} qw(Quincunx Sax Sargent);
+for my $p (@s5_people) {
+ my $ln = $p->last;
+ if ($x_people{$ln}) {
+ delete $x_people{$ln};
+ } else {
+ $FAIL = "unexpected person '$ln' associated with study 5";
+ }
+}
+if (%x_people) {
+ $FAIL = "missing persons " . join(", ", keys %x_people) . " not associated with study 5";
+}
+ok($FAIL eq "", $FAIL || "check study 5 people");
+
Modified: trunk/treebase-core/src/main/perl/test_db/study
===================================================================
--- trunk/treebase-core/src/main/perl/test_db/study 2009-11-24 19:33:56 UTC (rev 320)
+++ trunk/treebase-core/src/main/perl/test_db/study 2009-11-24 19:47:39 UTC (rev 321)
@@ -1,7 +1,7 @@
-study_id,name,owner,tree_id
-1,study one,Juan,1
-4,study four,Balfour,24
-2,study two,Thieu,2
-8,study eight,Otto,40320
-5,study five,Quentin,120
-7,study seven,Septimus,5040
+study_id,name,tree_id
+1,study one,1
+4,study four,24
+2,study two,2
+8,study eight,40320
+5,study five,120
+7,study seven,5040
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mjd...@us...> - 2009-11-24 19:34:54
|
Revision: 320
http://treebase.svn.sourceforge.net/treebase/?rev=320&view=rev
Author: mjdominus
Date: 2009-11-24 19:33:56 +0000 (Tue, 24 Nov 2009)
Log Message:
-----------
add a link table for link-attribute tests
Modified Paths:
--------------
trunk/treebase-core/src/main/perl/t/01_basic.t
Added Paths:
-----------
trunk/treebase-core/src/main/perl/23_link.t
trunk/treebase-core/src/main/perl/test_db/person
trunk/treebase-core/src/main/perl/test_db/study_author
Added: trunk/treebase-core/src/main/perl/23_link.t
===================================================================
--- trunk/treebase-core/src/main/perl/23_link.t (rev 0)
+++ trunk/treebase-core/src/main/perl/23_link.t 2009-11-24 19:33:56 UTC (rev 320)
@@ -0,0 +1,12 @@
+use Test::More tests => 1;
+
+#
+# Tests for link attributes (%r2_attr)
+#
+
+use_ok('CIPRES::TreeBase::TestObjects');
+use DBI;
+my $dbh = DBI->connect("DBI:CSV:f_dir=test_db;csv_eol=\n");
+CIPRES::TreeBase::VeryBadORM->set_db_connection($dbh);
+
+ok(1);
Modified: trunk/treebase-core/src/main/perl/t/01_basic.t
===================================================================
--- trunk/treebase-core/src/main/perl/t/01_basic.t 2009-11-24 19:21:44 UTC (rev 319)
+++ trunk/treebase-core/src/main/perl/t/01_basic.t 2009-11-24 19:33:56 UTC (rev 320)
@@ -1,5 +1,5 @@
-use Test::More tests => 36;
+use Test::More tests => 50;
use_ok('DBI');
use_ok('DBD::CSV');
@@ -10,6 +10,8 @@
check_table('matrices', qw(matrix_id name n_rows study_id));
check_table('TREE', qw(TreeId name root_node_id));
check_table('node', qw(treenode_id tree_id left_child right_child data));
+check_table('person', qw(person_id last first));
+check_table('study_author', qw(study_id person_id role));
use_ok('CIPRES::TreeBase::TestObjects');
Added: trunk/treebase-core/src/main/perl/test_db/person
===================================================================
--- trunk/treebase-core/src/main/perl/test_db/person (rev 0)
+++ trunk/treebase-core/src/main/perl/test_db/person 2009-11-24 19:33:56 UTC (rev 320)
@@ -0,0 +1,11 @@
+person_id,last,first
+1,Aguilar,Juan
+2,Tuc,Thieu
+3,Coquand,Thierry
+4,Balfour,Todd
+5,Quincunx,Quentin
+6,Sax,Sixto
+7,Sargent,Septimus
+8,Octavian,Otto
+9,Nonne,Ian
+10,Ten Eyck,Rutger
Added: trunk/treebase-core/src/main/perl/test_db/study_author
===================================================================
--- trunk/treebase-core/src/main/perl/test_db/study_author (rev 0)
+++ trunk/treebase-core/src/main/perl/test_db/study_author 2009-11-24 19:33:56 UTC (rev 320)
@@ -0,0 +1,14 @@
+study_id,person_id,role
+1,1,Author
+1,2,Editor
+2,2,Author
+2,3,Author
+4,4,Author
+5,5,Author
+5,6,Author
+5,7,Editor
+7,7,Author
+7,8,Editor
+8,10,Author
+8,8,Author
+8,9,Author
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mjd...@us...> - 2009-11-24 19:21:54
|
Revision: 319
http://treebase.svn.sourceforge.net/treebase/?rev=319&view=rev
Author: mjdominus
Date: 2009-11-24 19:21:44 +0000 (Tue, 24 Nov 2009)
Log Message:
-----------
reverse attributes test for Study->matrices
Modified Paths:
--------------
trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/TestObjects.pm
trunk/treebase-core/src/main/perl/t/22_reverse.t
trunk/treebase-core/src/main/perl/test_db/matrices
Modified: trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/TestObjects.pm
===================================================================
--- trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/TestObjects.pm 2009-11-24 16:09:20 UTC (rev 318)
+++ trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/TestObjects.pm 2009-11-24 19:21:44 UTC (rev 319)
@@ -5,6 +5,7 @@
package Study;
CIPRES::TreeBase::VeryBadORM->register();
+%r_attr = (matrices => 'Matrix');
package Tree;
CIPRES::TreeBase::VeryBadORM->register();
Modified: trunk/treebase-core/src/main/perl/t/22_reverse.t
===================================================================
--- trunk/treebase-core/src/main/perl/t/22_reverse.t 2009-11-24 16:09:20 UTC (rev 318)
+++ trunk/treebase-core/src/main/perl/t/22_reverse.t 2009-11-24 19:21:44 UTC (rev 319)
@@ -1,6 +1,9 @@
-use Test::More tests => 3;
+use Test::More tests => 9;
-use lib '../lib';
+#
+# Tests for reverse attributes (%r_attr)
+#
+
use_ok('CIPRES::TreeBase::TestObjects');
use DBI;
my $dbh = DBI->connect("DBI:CSV:f_dir=test_db;csv_eol=\n");
@@ -8,21 +11,31 @@
my %x_names = map {$_ => 1} ('R' .. 'W');
-my @nodes_5040 = Tree->new(5040)->nodes;
-is (scalar(@nodes_5040), 6);
-{ my $RESULT = "";
- for my $node (@nodes_5040) {
- if ($node->tree_id != 5040) {
- my $nid = $node->id; my $tid = $node->tree_id;
- $RESULT = "Node $nid has treeid = $tid; s/b 5040";
- last;
+{
+ my @nodes_5040 = Tree->new(5040)->nodes;
+ is (scalar(@nodes_5040), 6);
+ { my $RESULT = "";
+ for my $node (@nodes_5040) {
+ if ($node->tree_id != 5040) {
+ my $nid = $node->id; my $tid = $node->tree_id;
+ $RESULT = "Node $nid has treeid = $tid; s/b 5040";
+ last;
+ }
+ delete $x_names{$node->data};
}
- delete $x_names{$node->data};
+ if (%x_names) {
+ my $missing = each %x_names;
+ $RESULT = "Where is node '$missing'?";
+ }
+ ok($RESULT eq "", $RESULT || "Tested nodes of tree 5040");
}
- if (%x_names) {
- my $missing = each %x_names;
- $RESULT = "Where is node '$missing'?";
- }
- ok($RESULT eq "", $RESULT || "Tested nodes of tree 5040");
}
+
+my %x_num_matrices = (1 => 1, 2 => 1, 4 => 2, 5 => 1, 7 => 1, 8 => 1);
+for my $sid (1, 2, 4, 5, 7, 8) {
+ my $num_matrices = my @matrices = Study->new($sid)->matrices;
+ my $matrices = $x_num_matrices{$sid} == 1 ? "matrix" : "matrices";
+ is ($num_matrices, $x_num_matrices{$sid}, "count study $sid matrices");
+}
+
Modified: trunk/treebase-core/src/main/perl/test_db/matrices
===================================================================
--- trunk/treebase-core/src/main/perl/test_db/matrices 2009-11-24 16:09:20 UTC (rev 318)
+++ trunk/treebase-core/src/main/perl/test_db/matrices 2009-11-24 19:21:44 UTC (rev 319)
@@ -1,7 +1,8 @@
matrix_id,name,n_rows,study_id
-1,matrix I,2,2
+1,matrix I,2,1
16,matrix XVI,17,4
4,matrix IV,5,2
64,matrix LXIV,65,8
25,matrix XXV,26,5
49,matrix XLIX,50,7
+17,matrix XVII,18,4
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: SourceForge.net <no...@so...> - 2009-11-24 17:52:57
|
Bugs item #2712095, was opened at 2009-03-25 16:19 Message generated for change (Settings changed) made by rvos You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2712095&group_id=248804 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: ui Group: piel Status: Open >Priority: 8 Private: No Submitted By: Mark Dominus (mjdominus) Assigned to: Nobody/Anonymous (nobody) Summary: Admin summary search has no search by study id Initial Comment: Says BP: > - while the search page lets users search by either study_id or > legacy_study_id, the "Search Submission" Admin access page only lets the > admin person search by legacy_study_id. ---------------------------------------------------------------------- Comment By: William Piel (sfrgpiel) Date: 2009-11-24 17:25 Message: I just realized that the inability for an admin person to search by study_id (currently they can only search on legacy_study_id) means that no new submissions can be edited by the admin person. This is a fairly critical task, so I'm elevating it to level 9. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2712095&group_id=248804 |
|
From: SourceForge.net <no...@so...> - 2009-11-24 17:52:24
|
Bugs item #2797430, was opened at 2009-05-27 15:08 Message generated for change (Settings changed) made by rvos You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2797430&group_id=248804 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: None Group: None Status: Open >Priority: 8 Private: No Submitted By: Mark Dominus (mjdominus) Assigned to: Nobody/Anonymous (nobody) Summary: Password hashing Initial Comment: Passwords are stored in the USER table of the database in plain text. They should be hashed instead. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2797430&group_id=248804 |
|
From: SourceForge.net <no...@so...> - 2009-11-24 17:51:53
|
Bugs item #2903251, was opened at 2009-11-24 17:34 Message generated for change (Settings changed) made by rvos You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2903251&group_id=248804 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: ui Group: None Status: Open >Priority: 8 Private: No Submitted By: William Piel (sfrgpiel) Assigned to: Nobody/Anonymous (nobody) Summary: Exception when uploading nexus to a new submission Initial Comment: When I log in as a normal user (user: pieltest, password: pieltest) and I try to upload a nexus file to a new submission, I get the following error. bp Uncaught Exception Encountered java.lang.ExceptionInInitializerError at mesquite.Mesquite.main(Mesquite.java:2261) at org.cipres.treebase.domain.nexus.mesquite.MesquiteConverter.parseOneFile(MesquiteConverter.java:232) at org.cipres.treebase.service.nexus.NexusServiceMesquite.parseNexus(NexusServiceMesquite.java:121) at org.cipres.treebase.service.study.SubmissionServiceImpl.addNexusFile(SubmissionServiceImpl.java:657) at ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2903251&group_id=248804 |
|
From: SourceForge.net <no...@so...> - 2009-11-24 17:51:23
|
Bugs item #2826165, was opened at 2009-07-23 19:36 Message generated for change (Settings changed) made by rvos You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2826165&group_id=248804 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: ui Group: None Status: Open >Priority: 8 Private: No Submitted By: William Piel (sfrgpiel) Assigned to: Nobody/Anonymous (nobody) Summary: Reviewer/Referee Access Initial Comment: I'm making this a priority of 9 only because it is needed before TreeBASE2 can be made public. We need to make sure that reviewers or referees can have access to datasets that are "in progress" and associated with a manuscript that is in the review process of a journal. Jin Ruan initially created a user role called "reviewer" which gives someone read-only access to the private sections of the database. We decided that this is a bad solution because it requires that each reviewer get a login name and password, which implies a huge amount of admin overhead. A better solution is to auto-generate a long random string which can be used in an URL to give someone a read-only access to the submission page. But however which way we do this, it is needed because some journals depend on this as part of their review process. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2826165&group_id=248804 |
|
From: SourceForge.net <no...@so...> - 2009-11-24 17:49:12
|
Bugs item #2903259, was opened at 2009-11-24 17:49 Message generated for change (Tracker Item Submitted) made by rvos You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2903259&group_id=248804 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: ui Group: None Status: Open Priority: 9 Private: No Submitted By: Rutger Vos (rvos) Assigned to: Rutger Vos (rvos) Summary: Turn off login functionality for BETA Initial Comment: To launch a read-only beta version at NESCent, turn off user registration and access to the submission area. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2903259&group_id=248804 |
|
From: SourceForge.net <no...@so...> - 2009-11-24 17:34:30
|
Bugs item #2903251, was opened at 2009-11-24 12:34 Message generated for change (Tracker Item Submitted) made by sfrgpiel You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2903251&group_id=248804 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: ui Group: None Status: Open Priority: 9 Private: No Submitted By: William Piel (sfrgpiel) Assigned to: Nobody/Anonymous (nobody) Summary: Exception when uploading nexus to a new submission Initial Comment: When I log in as a normal user (user: pieltest, password: pieltest) and I try to upload a nexus file to a new submission, I get the following error. bp Uncaught Exception Encountered java.lang.ExceptionInInitializerError at mesquite.Mesquite.main(Mesquite.java:2261) at org.cipres.treebase.domain.nexus.mesquite.MesquiteConverter.parseOneFile(MesquiteConverter.java:232) at org.cipres.treebase.service.nexus.NexusServiceMesquite.parseNexus(NexusServiceMesquite.java:121) at org.cipres.treebase.service.study.SubmissionServiceImpl.addNexusFile(SubmissionServiceImpl.java:657) at ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2903251&group_id=248804 |
|
From: SourceForge.net <no...@so...> - 2009-11-24 17:32:23
|
Bugs item #2899240, was opened at 2009-11-17 17:17 Message generated for change (Comment added) made by rvos You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2899240&group_id=248804 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: data Group: None Status: Open Priority: 9 Private: No Submitted By: Rutger Vos (rvos) Assigned to: Rutger Vos (rvos) Summary: Data consistency checking Initial Comment: Goal: to develop, implement and execute a strategy for ascertaining that all old data has been imported and is consistent. ---------------------------------------------------------------------- >Comment By: Rutger Vos (rvos) Date: 2009-11-24 17:32 Message: This issue subsumes issue #2717395 which refers to old consistency checker logs. New logs have been produced that need to be resolved. These new logs were created using the perl API that has been ported to postgres. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2899240&group_id=248804 |
|
From: SourceForge.net <no...@so...> - 2009-11-24 17:30:52
|
Bugs item #2717395, was opened at 2009-03-27 20:10 Message generated for change (Settings changed) made by rvos You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2717395&group_id=248804 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: data Group: None >Status: Closed Priority: 9 Private: No Submitted By: Mark Dominus (mjdominus) Assigned to: Nobody/Anonymous (nobody) Summary: Finish analyzing Consistency checker reports Initial Comment: The consistency checker last ran starting 20090327 and produced about 1000 reports of inconsistencies. These must all be resolved one way or another. ---------------------------------------------------------------------- >Comment By: Rutger Vos (rvos) Date: 2009-11-24 17:30 Message: This task is now subsumed by issue #2899240 because new inconsistency reports have been produced for postgres. ---------------------------------------------------------------------- Comment By: Mark Dominus (mjdominus) Date: 2009-03-30 18:15 Message: Complete report from run of 20090325-2009-0328 is now attached. The numbers in the previous comment are based on an incomplete version of this report. ---------------------------------------------------------------------- Comment By: Mark Dominus (mjdominus) Date: 2009-03-27 20:56 Message: Most of the reports are spurious: 821/945 concern analyses which contain more than one taxonlabelset. But this is not erroneous. Around 124 of the reports are legitimate. Of these, most are of the form: ** PhyloTreeNode 287115 is a leaf but has no TaxonLabel These are probably manifestations of bug #2692361. 25 further messages concern analyses with no trees, no matrices, or no taxonlabelsets. I have asked Bill about these. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2717395&group_id=248804 |
|
From: SourceForge.net <no...@so...> - 2009-11-24 17:25:11
|
Bugs item #2712095, was opened at 2009-03-25 12:19 Message generated for change (Settings changed) made by sfrgpiel You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2712095&group_id=248804 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. >Category: ui Group: piel Status: Open >Priority: 9 Private: No Submitted By: Mark Dominus (mjdominus) Assigned to: Nobody/Anonymous (nobody) Summary: Admin summary search has no search by study id Initial Comment: Says BP: > - while the search page lets users search by either study_id or > legacy_study_id, the "Search Submission" Admin access page only lets the > admin person search by legacy_study_id. ---------------------------------------------------------------------- >Comment By: William Piel (sfrgpiel) Date: 2009-11-24 12:25 Message: I just realized that the inability for an admin person to search by study_id (currently they can only search on legacy_study_id) means that no new submissions can be edited by the admin person. This is a fairly critical task, so I'm elevating it to level 9. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2712095&group_id=248804 |
|
From: <yo...@us...> - 2009-11-24 16:09:30
|
Revision: 318
http://treebase.svn.sourceforge.net/treebase/?rev=318&view=rev
Author: youjun
Date: 2009-11-24 16:09:20 +0000 (Tue, 24 Nov 2009)
Log Message:
-----------
change treebase to TreeBASE
Modified Paths:
--------------
trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java 2009-11-24 15:14:37 UTC (rev 317)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java 2009-11-24 16:09:20 UTC (rev 318)
@@ -242,7 +242,7 @@
map.put("description",study.getNotes());
map.put("publisher", publisher);
map.put("date", "published on "+citation.getPublishYear());
- map.put("identifier", "treebase.org/study/TB2:s"+study.getId());
+ map.put("identifier", "TreeBASE.org/study/TB2:s"+study.getId());
map.put("datestamp", study.getReleaseDate());
}catch(NullPointerException e){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: SourceForge.net <no...@so...> - 2009-11-24 15:24:59
|
Bugs item #2903172, was opened at 2009-11-24 10:24 Message generated for change (Tracker Item Submitted) made by sfrgpiel You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2903172&group_id=248804 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: ui Group: None Status: Open Priority: 7 Private: No Submitted By: William Piel (sfrgpiel) Assigned to: Nobody/Anonymous (nobody) Summary: Book citation does not appear in submission Initial Comment: When creating a new submission that has a book as the citation, the "Summary for Current Study" page (e.g.: go here after logging in as a Admin person: http://treebasedb-dev.nescent.org:6666/treebase-web/user/summary.html?id=253) says "Citation information not yet entered. Click the Citation menu item on the right" even though the citation has already been entered. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2903172&group_id=248804 |
|
From: <yo...@us...> - 2009-11-24 15:14:57
|
Revision: 317
http://treebase.svn.sourceforge.net/treebase/?rev=317&view=rev
Author: youjun
Date: 2009-11-24 15:14:37 +0000 (Tue, 24 Nov 2009)
Log Message:
-----------
bug fixing on controller unpublished data will be fill out
Modified Paths:
--------------
trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java
trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/identify.properties
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java 2009-11-24 14:02:09 UTC (rev 316)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java 2009-11-24 15:14:37 UTC (rev 317)
@@ -219,6 +219,7 @@
Study study=submission.getStudy();
Citation citation=study.getCitation();
String publisher=null;
+ if(!study.isPublished())return null;
//System.out.println("ctype: "+citation.getCitationType());
try{
@@ -248,8 +249,7 @@
//study 253 citation= null, data should be fixed
System.err.println("study "+study.getId()+
" citation= "+e.getMessage());
- map.put("identifier", "treebase.org/study/TB2:s"+study.getId());
- map.put("datestamp", study.getReleaseDate());
+ return null;
}
//map.put("type", "text");
@@ -266,9 +266,10 @@
{
List recordList=new ArrayList<Map>();
- for(int i =0; i< sList.size(); i++)
- recordList.add(getRecordMap(sList.get(i)));
-
+ for(int i =0; i< sList.size(); i++){
+ Map map=getRecordMap(sList.get(i));
+ if(map!=null)recordList.add(map);
+ }
return recordList;
}
}
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/identify.properties
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/identify.properties 2009-11-24 14:02:09 UTC (rev 316)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/identify.properties 2009-11-24 15:14:37 UTC (rev 317)
@@ -1,13 +1,13 @@
identify.baseURL=www.***.***:port/top
-identify.repositoryName=treebase repository
+identify.repositoryName=TreeBASE repository
identify.protocolVersion=2.0
identify.adminEmail=you...@ya...
identify.earliestDatestamp=1995-11-04T00:00:00Z
identify.deletedRecord=transient
identify.granularity=YYYY-MM-DDThh:mm:ssZ
identify.granularityPattern=yyyy-MM-dd'T'hh:mm:ss'Z'
-identify.sampleIdentifier=treebase.org/study/TB2:s6705
-identify.repositoryIdentifier=treebase.org
+identify.sampleIdentifier=TreeBASE.org/study/TB2:s6705
+identify.repositoryIdentifier=TreeBASE.org
identify.identifierDelimiter=:
identify.dublinPerfix=oai_dc
identify.dryadPerfix=dryad
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1 message has been excluded from this view by a project administrator.
