Update of /cvsroot/monetdb/sql/src/test/Skyserver
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20742/src/test/Skyserver
Modified Files:
Skyserver_constraints_v6.sql Skyserver_dropConstraints_v6.sql
Skyserver_dropTables_v6.sql Skyserver_dropViews_v6.sql
Skyserver_tables_v6.sql Skyserver_views_v6.sql
Log Message:
propagated changes of Thursday Jun 12 2008 - Friday Jun 13 2008
from the SQL_2-24 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/12 - nielsnes:
src/test/copy/Tests/null_as_string_errors.stable.err.Five,1.1.2.2
approve stable error output
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/12 - romulog: src/test/Skyserver/Skyserver_tables_v6.sql,1.1.2.4
src/test/Skyserver/Skyserver_views_v6.sql,1.1.2.3
synchronize with the skyserver module..
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/12 - romulog: src/test/Skyserver/Skyserver_constraints_v6.sql,1.1.2.2
src/test/Skyserver/Skyserver_dropConstraints_v6.sql,1.1.2.2
src/test/Skyserver/Skyserver_dropTables_v6.sql,1.1.2.3
src/test/Skyserver/Skyserver_dropViews_v6.sql,1.1.2.4
Synchronize with skyserver module...
PhotoTag is a view and not a table..
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/12 - sjoerd: NT/MonetDB4-SQL64/MonetDB4-SQL-Installer.vdproj,1.6.2.4
NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj,1.9.2.3
Updated installer version number.
Make sure the 64 bit version and the 32 bit version have different "Upgrade
Codes" so that they can be installed at the same time.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/12 - sjoerd: NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj,1.19.2.3
Updated installer version number.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/13 - romulog: src/test/Skyserver/Skyserver_dropViews_v6.sql,1.1.2.5
src/test/Skyserver/Skyserver_views_v6.sql,1.1.2.4
Create once 2 views
and drop correctly to avoid dependencies problems...
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: Skyserver_constraints_v6.sql
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/Skyserver/Skyserver_constraints_v6.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Skyserver_constraints_v6.sql 27 May 2008 14:59:24 -0000 1.2
+++ Skyserver_constraints_v6.sql 13 Jun 2008 12:49:02 -0000 1.3
@@ -79,12 +79,6 @@
ALTER TABLE PhotoProfile ADD CONSTRAINT fk_PhotoProfile_objID_PhotoObjAl
FOREIGN KEY(objID)
REFERENCES PhotoObjAll (objID)
;
-ALTER TABLE PhotoTag ADD CONSTRAINT fk_PhotoTag_fieldID_Field_fieldI FOREIGN
KEY(fieldID)
-REFERENCES Field (fieldID)
-;
-ALTER TABLE PhotoTag ADD CONSTRAINT fk_PhotoTag_objID_PhotoObjAll_ob FOREIGN
KEY(objID)
-REFERENCES PhotoObjAll (objID)
-;
ALTER TABLE Photoz ADD CONSTRAINT fk_Photoz_objID_PhotoObjAll_objI FOREIGN
KEY(objID)
REFERENCES PhotoObjAll (objID)
;
Index: Skyserver_dropConstraints_v6.sql
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/test/Skyserver/Skyserver_dropConstraints_v6.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Skyserver_dropConstraints_v6.sql 27 May 2008 14:59:26 -0000 1.2
+++ Skyserver_dropConstraints_v6.sql 13 Jun 2008 12:49:04 -0000 1.3
@@ -52,10 +52,6 @@
;
ALTER TABLE PhotoProfile DROP CONSTRAINT fk_PhotoProfile_objID_PhotoObjAl
;
-ALTER TABLE PhotoTag DROP CONSTRAINT fk_PhotoTag_fieldID_Field_fieldI
-;
-ALTER TABLE PhotoTag DROP CONSTRAINT fk_PhotoTag_objID_PhotoObjAll_ob
-;
ALTER TABLE Photoz DROP CONSTRAINT fk_Photoz_objID_PhotoObjAll_objI
;
ALTER TABLE Photoz2 DROP CONSTRAINT fk_Photoz2_objID_PhotoObjAll_obj
Index: Skyserver_views_v6.sql
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/Skyserver/Skyserver_views_v6.sql,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Skyserver_views_v6.sql 31 May 2008 05:26:42 -0000 1.3
+++ Skyserver_views_v6.sql 13 Jun 2008 12:49:06 -0000 1.4
@@ -36,12 +36,6 @@
FROM DataConstants
WHERE field='FramesStatus'
;
-CREATE VIEW GalaxyTag
-AS
-SELECT *
- FROM PhotoTag g
- WHERE type = 3 and mode=1
-;
CREATE VIEW HoleType
AS
SELECT name,
@@ -305,12 +299,6 @@
FROM PhotoPrimary
WHERE type = 6
;
-CREATE VIEW StarTag
-AS
-SELECT *
- FROM PhotoTag g
- WHERE type = 6 and mode=1
-;
CREATE VIEW TargPhotoObj
AS
SELECT * FROM TargPhotoObjAll g
@@ -372,3 +360,88 @@
FROM PhotoPrimary
WHERE type not in (3,6,8)
;
+
+CREATE VIEW PhotoTag
+AS
+SELECT objID,
+ skyVersion,
+ run,
+ rerun,
+ camcol,
+ field,
+ obj,
+ "mode",
+ nChild,
+ "type",
+ probPSF,
+ insideMask,
+ flags,
+ psfMag_u,
+ psfMag_g,
+ psfMag_r,
+ psfMag_i,
+ psfMag_z,
+ psfMagErr_u,
+ psfMagErr_g,
+ psfMagErr_r,
+ psfMagErr_i,
+ psfMagErr_z,
+ petroMag_u,
+ petroMag_g,
+ petroMag_r,
+ petroMag_i,
+ petroMag_z,
+ petroMagErr_u,
+ petroMagErr_g,
+ petroMagErr_r,
+ petroMagErr_i,
+ petroMagErr_z,
+ petroR50_r,
+ petroR90_r,
+ modelMag_u,
+ modelMag_g,
+ modelMag_r,
+ modelMag_i,
+ modelMag_z,
+ modelMagErr_u,
+ modelMagErr_g,
+ modelMagErr_r,
+ modelMagErr_i,
+ modelMagErr_z,
+ mRrCc_r,
+ mRrCcErr_r,
+ lnLStar_r,
+ lnLExp_r,
+ lnLDeV_r,
+ status,
+ ra,
+ "dec",
+ cx,
+ cy,
+ cz,
+ primTarget,
+ secTarget,
+ extinction_u,
+ extinction_g,
+ extinction_r,
+ extinction_i,
+ extinction_z,
+ htmID,
+ fieldID,
+ specObjID,
+ sqrt(mRrCc_r/2.0) as size
+ FROM PhotoObjAll;
+
+CREATE VIEW StarTag
+AS
+SELECT *
+ FROM PhotoTag g
+ WHERE type = 6 and mode=1
+;
+
+CREATE VIEW GalaxyTag
+AS
+SELECT *
+ FROM PhotoTag g
+ WHERE type = 3 and mode=1
+;
Index: Skyserver_dropViews_v6.sql
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/Skyserver/Skyserver_dropViews_v6.sql,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Skyserver_dropViews_v6.sql 31 May 2008 05:26:42 -0000 1.4
+++ Skyserver_dropViews_v6.sql 13 Jun 2008 12:49:05 -0000 1.5
@@ -48,3 +48,4 @@
DROP VIEW UberCalibStatus;
DROP VIEW Unknown;
DROP VIEW PhotoPrimary ;
+DROP VIEW PhotoTag;
Index: Skyserver_dropTables_v6.sql
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/Skyserver/Skyserver_dropTables_v6.sql,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Skyserver_dropTables_v6.sql 31 May 2008 05:26:42 -0000 1.3
+++ Skyserver_dropTables_v6.sql 13 Jun 2008 12:49:04 -0000 1.4
@@ -32,7 +32,6 @@
DROP TABLE PartitionMap;
DROP TABLE PhotoObjAll;
DROP TABLE PhotoProfile;
-DROP TABLE PhotoTag;
DROP TABLE Photoz;
DROP TABLE Photoz2;
DROP TABLE PlateX;
Index: Skyserver_tables_v6.sql
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/Skyserver/Skyserver_tables_v6.sql,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Skyserver_tables_v6.sql 31 May 2008 05:26:42 -0000 1.4
+++ Skyserver_tables_v6.sql 13 Jun 2008 12:49:05 -0000 1.5
@@ -1485,80 +1485,6 @@
)
);
-CREATE TABLE PhotoTag(
- objID bigint NOT NULL,
- skyVersion tinyint NOT NULL,
- run smallint NOT NULL,
- rerun smallint NOT NULL,
- camcol tinyint NOT NULL,
- field smallint NOT NULL,
- obj smallint NOT NULL,
- "mode" tinyint NOT NULL,
- nChild smallint NOT NULL,
- "type" smallint NOT NULL,
- probPSF real NOT NULL,
- insideMask tinyint NOT NULL,
- flags bigint NOT NULL,
- psfMag_u real NOT NULL,
- psfMag_g real NOT NULL,
- psfMag_r real NOT NULL,
- psfMag_i real NOT NULL,
- psfMag_z real NOT NULL,
- psfMagErr_u real NOT NULL,
- psfMagErr_g real NOT NULL,
- psfMagErr_r real NOT NULL,
- psfMagErr_i real NOT NULL,
- psfMagErr_z real NOT NULL,
- petroMag_u real NOT NULL,
- petroMag_g real NOT NULL,
- petroMag_r real NOT NULL,
- petroMag_i real NOT NULL,
- petroMag_z real NOT NULL,
- petroMagErr_u real NOT NULL,
- petroMagErr_g real NOT NULL,
- petroMagErr_r real NOT NULL,
- petroMagErr_i real NOT NULL,
- petroMagErr_z real NOT NULL,
- petroR50_r real NOT NULL,
- petroR90_r real NOT NULL,
- modelMag_u real NOT NULL,
- modelMag_g real NOT NULL,
- modelMag_r real NOT NULL,
- modelMag_i real NOT NULL,
- modelMag_z real NOT NULL,
- modelMagErr_u real NOT NULL,
- modelMagErr_g real NOT NULL,
- modelMagErr_r real NOT NULL,
- modelMagErr_i real NOT NULL,
- modelMagErr_z real NOT NULL,
- mRrCc_r real NOT NULL,
- mRrCcErr_r real NOT NULL,
- lnLStar_r real NOT NULL,
- lnLExp_r real NOT NULL,
- lnLDeV_r real NOT NULL,
- status int NOT NULL,
- ra float NOT NULL,
- "dec" float NOT NULL,
- cx float NOT NULL,
- cy float NOT NULL,
- cz float NOT NULL,
- primTarget int NOT NULL,
- secTarget int NOT NULL,
- extinction_u real NOT NULL,
- extinction_g real NOT NULL,
- extinction_r real NOT NULL,
- extinction_i real NOT NULL,
- extinction_z real NOT NULL,
- htmID bigint NOT NULL,
- fieldID bigint NOT NULL,
- SpecObjID bigint NOT NULL DEFAULT (0),
- size real NOT NULL DEFAULT (-9999),
- CONSTRAINT pk_PhotoTag_objID PRIMARY KEY
-(
- objID
-)
-);
-
CREATE TABLE Photoz(
pId int NOT NULL,
rank int NOT NULL,
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
