Update of /cvsroot/monetdb/sql/src/test/Skyserver
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19536
Modified Files:
Tag: SQL_2-24
Skyserver_tables_v6.sql Skyserver_views_v6.sql
Log Message:
synchronize with the skyserver module..
U Skyserver_tables_v6.sql
Index: Skyserver_tables_v6.sql
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/Skyserver/Skyserver_tables_v6.sql,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- Skyserver_tables_v6.sql 30 May 2008 09:27:34 -0000 1.1.2.3
+++ Skyserver_tables_v6.sql 12 Jun 2008 10:54:08 -0000 1.1.2.4
@@ -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,
U Skyserver_views_v6.sql
Index: Skyserver_views_v6.sql
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/Skyserver/Skyserver_views_v6.sql,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- Skyserver_views_v6.sql 30 May 2008 09:27:35 -0000 1.1.2.2
+++ Skyserver_views_v6.sql 12 Jun 2008 10:54:12 -0000 1.1.2.3
@@ -372,3 +372,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
+;
-------------------------------------------------------------------------
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
