From c0d3fca6d69e7d0c843f19b541dbe78f387ab0c8 Mon Sep 17 00:00:00 2001
From: Joel Brownstein <joelbrownstein@sdss.org>
Date: Sat, 10 Aug 2019 15:29:42 -0600
Subject: [PATCH 01/28] archive

---
 python/sdssdb/sqlalchemy/archive/__init__.py | 24 ++++++++
 python/sdssdb/sqlalchemy/archive/sas.py      | 60 ++++++++++++++++++++
 2 files changed, 84 insertions(+)
 create mode 100644 python/sdssdb/sqlalchemy/archive/__init__.py
 create mode 100644 python/sdssdb/sqlalchemy/archive/sas.py

diff --git a/python/sdssdb/sqlalchemy/archive/__init__.py b/python/sdssdb/sqlalchemy/archive/__init__.py
new file mode 100644
index 00000000..969baeea
--- /dev/null
+++ b/python/sdssdb/sqlalchemy/archive/__init__.py
@@ -0,0 +1,24 @@
+# !usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# Licensed under a 3-clause BSD license.
+#
+# @Author: Brian Cherinka
+# @Date:   2018-09-23 16:06:18
+# @Last modified by: José Sánchez-Gallego (gallegoj@uw.edu)
+# @Last Modified time: 2018-10-10 11:25:13
+
+from __future__ import print_function, division, absolute_import
+
+from sdssdb.connection import SQLADatabaseConnection
+from sqlalchemy.ext.declarative import declarative_base, DeferredReflection
+from sdssdb.sqlalchemy import BaseModel
+
+# we need a shared common Base when joining across multiple schema
+ArchiveBase = declarative_base(cls=(DeferredReflection, BaseModel,))
+
+class ArchiveDatabaseConnection(SQLADatabaseConnection):
+    dbname = 'archive'
+    base = ArchiveBase
+
+database = ArchiveDatabaseConnection(autoconnect=True)
diff --git a/python/sdssdb/sqlalchemy/archive/sas.py b/python/sdssdb/sqlalchemy/archive/sas.py
new file mode 100644
index 00000000..214f2bfc
--- /dev/null
+++ b/python/sdssdb/sqlalchemy/archive/sas.py
@@ -0,0 +1,60 @@
+# !usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# Licensed under a 3-clause BSD license.
+#
+# @Author: Joel Brownstein
+# @Date:   2019-08-01 06:54:15
+# @Last modified by: Joel Brownstein (joelbrownstein@astro.utah.edu)
+
+from __future__ import absolute_import, division, print_function
+
+from sdssdb.sqlalchemy.archive import database, ArchiveBase, sas
+from sqlalchemy import Column, Float, and_, case, cast, select
+from sqlalchemy.engine import reflection
+from sqlalchemy.ext.declarative import AbstractConcreteBase, declared_attr
+from sqlalchemy.ext.hybrid import hybrid_property
+from sqlalchemy.orm import relationship
+from sqlalchemy.types import Integer
+
+SCHEMA = 'sas'
+
+class Base(AbstractConcreteBase, ArchiveBase):
+    __abstract__ = True
+    _schema = SCHEMA
+    _relations = 'define_relations'
+
+    @declared_attr
+    def __table_args__(cls):
+        return {'schema': cls._schema}
+
+class Root(Base):
+    __tablename__ = 'root'
+
+class Tree(Base):
+    __tablename__ = 'tree'
+
+class Env(Base):
+    __tablename__ = 'env'
+
+class File(Base):
+    __tablename__ = 'file'
+
+class Symlink_file(Base):
+    __tablename__ = 'symlink_file'
+
+class Symlink_directory(Base):
+    __tablename__ = 'symlink_directory'
+
+class Checksumfile(Base):
+    __tablename__ = 'checksumfile'
+
+class Checksum(Base):
+    __tablename__ = 'checksum'
+
+def define_relations():
+    """Setup relationships after preparation."""
+    pass
+
+# prepare the base
+database.add_base(Base)

From de160863568ae80c73d92b1e5960d280e6930ee8 Mon Sep 17 00:00:00 2001
From: Joel Brownstein <joelbrownstein@sdss.org>
Date: Sat, 10 Aug 2019 15:41:18 -0600
Subject: [PATCH 02/28] archive_20190507

---
 python/sdssdb/sqlalchemy/archive/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/sdssdb/sqlalchemy/archive/__init__.py b/python/sdssdb/sqlalchemy/archive/__init__.py
index 969baeea..583f1a5d 100644
--- a/python/sdssdb/sqlalchemy/archive/__init__.py
+++ b/python/sdssdb/sqlalchemy/archive/__init__.py
@@ -18,7 +18,7 @@
 ArchiveBase = declarative_base(cls=(DeferredReflection, BaseModel,))
 
 class ArchiveDatabaseConnection(SQLADatabaseConnection):
-    dbname = 'archive'
+    dbname = 'archive_20190507'
     base = ArchiveBase
 
 database = ArchiveDatabaseConnection(autoconnect=True)

From 783eb6a17138e05d9e5ee92fad07cd3e989ee822 Mon Sep 17 00:00:00 2001
From: Joel Brownstein <joelbrownstein@astro.utah.edu>
Date: Sun, 11 Aug 2019 12:02:01 -0600
Subject: [PATCH 03/28] Update sas.py

directory table
---
 python/sdssdb/sqlalchemy/archive/sas.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/python/sdssdb/sqlalchemy/archive/sas.py b/python/sdssdb/sqlalchemy/archive/sas.py
index 214f2bfc..59238c99 100644
--- a/python/sdssdb/sqlalchemy/archive/sas.py
+++ b/python/sdssdb/sqlalchemy/archive/sas.py
@@ -37,6 +37,9 @@ class Tree(Base):
 class Env(Base):
     __tablename__ = 'env'
 
+class Directory(Base):
+    __tablename__ = 'directory'
+
 class File(Base):
     __tablename__ = 'file'
 

From dbfb0c8b1d1a5897a4f6c6dca9a897ffcfd3d6c2 Mon Sep 17 00:00:00 2001
From: N Benjamin Murphy <n.benjamin.murphy@astro.utah.edu>
Date: Wed, 4 Sep 2019 16:33:35 -0600
Subject: [PATCH 04/28] Updated define_relations() method in sas module

---
 python/sdssdb/sqlalchemy/archive/sas.py | 68 ++++++++++++++++++++++++-
 1 file changed, 66 insertions(+), 2 deletions(-)

diff --git a/python/sdssdb/sqlalchemy/archive/sas.py b/python/sdssdb/sqlalchemy/archive/sas.py
index 59238c99..cdccd5ad 100644
--- a/python/sdssdb/sqlalchemy/archive/sas.py
+++ b/python/sdssdb/sqlalchemy/archive/sas.py
@@ -5,7 +5,8 @@
 #
 # @Author: Joel Brownstein
 # @Date:   2019-08-01 06:54:15
-# @Last modified by: Joel Brownstein (joelbrownstein@astro.utah.edu)
+# @Last modified by: N Benjamin Murphy (n.benjamin.murphy@astro.utah.edu)
+# @Date:   2019-09-04 16:31:00
 
 from __future__ import absolute_import, division, print_function
 
@@ -57,7 +58,70 @@ class Checksum(Base):
 
 def define_relations():
     """Setup relationships after preparation."""
-    pass
+    
+    # model relationships
+    #directories = relationship("Directory", backref='root')
+    #envs = relationship("Env", backref='tree')
+    Root.directories = relationship(Directory, backref='root')
+    Tree.envs        = relationship(Env,       backref='tree')
+    
+    #class Checksum
+    #tree_id = db.Column(db.Integer, db.ForeignKey('%s.tree.id' % schema))
+    #checksumfile_id = db.Column(db.Integer, db.ForeignKey('%s.checksumfile.id' % schema), nullable=False)
+    #file_id = db.Column(db.Integer, db.ForeignKey('%s.file.id' % schema))
+    #directory_id = db.Column(db.Integer, db.ForeignKey('%s.directory.id' % schema), nullable=False)
+    Checksum.tree         = relationship(Tree,         backref='checksum')
+    Checksum.checksumfile = relationship(Checksumfile, backref='checksum')
+    Checksum.file         = relationship(File,         backref='checksum')
+    Checksum.directory    = relationship(Directory,    backref='checksum')
+    
+    #class Checksumfile
+    #tree_id = db.Column(db.Integer, db.ForeignKey('%s.tree.id' % schema))
+    #env_id = db.Column(db.Integer, db.ForeignKey('%s.env.id' % schema))
+    #directory_id = db.Column(db.Integer, db.ForeignKey('%s.directory.id' % schema), nullable=False)
+    #file_id = db.Column(db.Integer, db.ForeignKey('%s.file.id' % schema), nullable=False)
+    Checksumfile.tree      = relationship(Tree,      backref='checksumfile')
+    Checksumfile.env       = relationship(Env,       backref='checksumfile')
+    Checksumfile.directory = relationship(Directory, backref='checksumfile')
+    Checksumfile.file      = relationship(File,      backref='checksumfile')
+
+    #class Directory
+    #root_id = db.Column(db.Integer, db.ForeignKey('%s.root.id' % schema), nullable = False)
+    #tree_id = db.Column(db.Integer, db.ForeignKey('%s.tree.id' % schema))
+    #env_id = db.Column(db.Integer, db.ForeignKey('%s.env.id' % schema))
+    Directory.root = relationship(Root, backref='directory')
+    Directory.tree = relationship(Tree, backref='directory')
+    Directory.env  = relationship(Env,  backref='directory')
+
+    #class Env
+    #tree_id = db.Column(db.Integer, db.ForeignKey('%s.tree.id' % schema))
+    #real_env_id = db.Column(db.Integer, db.ForeignKey('%s.env.id' % schema))
+    Env.tree = relationship(Tree, backref='env')
+    Env.real_env = relationship(Env)
+
+    #class File
+    #root_id = db.Column(db.Integer, db.ForeignKey('%s.root.id' % schema), nullable = False)
+    #tree_id = db.Column(db.Integer, db.ForeignKey('%s.tree.id' % schema))
+    #env_id = db.Column(db.Integer, db.ForeignKey('%s.env.id' % schema))
+    File.root = relationship(Root, backref='file')
+    File.tree = relationship(Tree, backref='file')
+    File.env  = relationship(Env,  backref='file')
+
+    #class Symlink_directory
+    #root_id = db.Column(db.Integer, db.ForeignKey('%s.root.id' % schema), nullable = False)
+    #tree_id = db.Column(db.Integer, db.ForeignKey('%s.tree.id' % schema))
+    #env_id = db.Column(db.Integer, db.ForeignKey('%s.env.id' % schema))
+    Symlink_directory.root = relationship(Root, backref='symlink_directory')
+    Symlink_directory.tree = relationship(Tree, backref='symlink_directory')
+    Symlink_directory.env  = relationship(Env,  backref='symlink_directory')
+
+    #class Symlink_file
+    #root_id = db.Column(db.Integer, db.ForeignKey('%s.root.id' % schema), nullable = False)
+    #tree_id = db.Column(db.Integer, db.ForeignKey('%s.tree.id' % schema))
+    #env_id = db.Column(db.Integer, db.ForeignKey('%s.env.id' % schema))
+    Symlink_file.root = relationship(Root, backref='symlink_file')
+    Symlink_file.tree = relationship(Tree, backref='symlink_file')
+    Symlink_file.env  = relationship(Env,  backref='symlink_file')
 
 # prepare the base
 database.add_base(Base)

From b92db3057bfac0b07d3ea64fc449fcbbf96bae9c Mon Sep 17 00:00:00 2001
From: Brian Cherinka <havok2063@hotmail.com>
Date: Wed, 18 Sep 2019 12:05:41 -0400
Subject: [PATCH 05/28] linting archive sas.py file

---
 python/sdssdb/sqlalchemy/archive/sas.py | 34 +++++++++++++++++--------
 python/sdssdb/tests/test_main.py        | 14 +++++-----
 2 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/python/sdssdb/sqlalchemy/archive/sas.py b/python/sdssdb/sqlalchemy/archive/sas.py
index cdccd5ad..954b749a 100644
--- a/python/sdssdb/sqlalchemy/archive/sas.py
+++ b/python/sdssdb/sqlalchemy/archive/sas.py
@@ -20,6 +20,7 @@
 
 SCHEMA = 'sas'
 
+
 class Base(AbstractConcreteBase, ArchiveBase):
     __abstract__ = True
     _schema = SCHEMA
@@ -29,33 +30,43 @@ class Base(AbstractConcreteBase, ArchiveBase):
     def __table_args__(cls):
         return {'schema': cls._schema}
 
+
 class Root(Base):
     __tablename__ = 'root'
 
+
 class Tree(Base):
     __tablename__ = 'tree'
 
+
 class Env(Base):
     __tablename__ = 'env'
 
+
 class Directory(Base):
     __tablename__ = 'directory'
 
+
 class File(Base):
     __tablename__ = 'file'
 
+
 class Symlink_file(Base):
     __tablename__ = 'symlink_file'
 
+
 class Symlink_directory(Base):
     __tablename__ = 'symlink_directory'
 
+
 class Checksumfile(Base):
     __tablename__ = 'checksumfile'
 
+
 class Checksum(Base):
     __tablename__ = 'checksum'
 
+
 def define_relations():
     """Setup relationships after preparation."""
     
@@ -63,27 +74,27 @@ def define_relations():
     #directories = relationship("Directory", backref='root')
     #envs = relationship("Env", backref='tree')
     Root.directories = relationship(Directory, backref='root')
-    Tree.envs        = relationship(Env,       backref='tree')
+    Tree.envs = relationship(Env, backref='tree')
     
     #class Checksum
     #tree_id = db.Column(db.Integer, db.ForeignKey('%s.tree.id' % schema))
     #checksumfile_id = db.Column(db.Integer, db.ForeignKey('%s.checksumfile.id' % schema), nullable=False)
     #file_id = db.Column(db.Integer, db.ForeignKey('%s.file.id' % schema))
     #directory_id = db.Column(db.Integer, db.ForeignKey('%s.directory.id' % schema), nullable=False)
-    Checksum.tree         = relationship(Tree,         backref='checksum')
+    Checksum.tree = relationship(Tree, backref='checksum')
     Checksum.checksumfile = relationship(Checksumfile, backref='checksum')
-    Checksum.file         = relationship(File,         backref='checksum')
-    Checksum.directory    = relationship(Directory,    backref='checksum')
+    Checksum.file = relationship(File, backref='checksum')
+    Checksum.directory = relationship(Directory, backref='checksum')
     
     #class Checksumfile
     #tree_id = db.Column(db.Integer, db.ForeignKey('%s.tree.id' % schema))
     #env_id = db.Column(db.Integer, db.ForeignKey('%s.env.id' % schema))
     #directory_id = db.Column(db.Integer, db.ForeignKey('%s.directory.id' % schema), nullable=False)
     #file_id = db.Column(db.Integer, db.ForeignKey('%s.file.id' % schema), nullable=False)
-    Checksumfile.tree      = relationship(Tree,      backref='checksumfile')
-    Checksumfile.env       = relationship(Env,       backref='checksumfile')
+    Checksumfile.tree = relationship(Tree, backref='checksumfile')
+    Checksumfile.env = relationship(Env, backref='checksumfile')
     Checksumfile.directory = relationship(Directory, backref='checksumfile')
-    Checksumfile.file      = relationship(File,      backref='checksumfile')
+    Checksumfile.file = relationship(File, backref='checksumfile')
 
     #class Directory
     #root_id = db.Column(db.Integer, db.ForeignKey('%s.root.id' % schema), nullable = False)
@@ -91,7 +102,7 @@ def define_relations():
     #env_id = db.Column(db.Integer, db.ForeignKey('%s.env.id' % schema))
     Directory.root = relationship(Root, backref='directory')
     Directory.tree = relationship(Tree, backref='directory')
-    Directory.env  = relationship(Env,  backref='directory')
+    Directory.env = relationship(Env, backref='directory')
 
     #class Env
     #tree_id = db.Column(db.Integer, db.ForeignKey('%s.tree.id' % schema))
@@ -105,7 +116,7 @@ def define_relations():
     #env_id = db.Column(db.Integer, db.ForeignKey('%s.env.id' % schema))
     File.root = relationship(Root, backref='file')
     File.tree = relationship(Tree, backref='file')
-    File.env  = relationship(Env,  backref='file')
+    File.env = relationship(Env, backref='file')
 
     #class Symlink_directory
     #root_id = db.Column(db.Integer, db.ForeignKey('%s.root.id' % schema), nullable = False)
@@ -113,7 +124,7 @@ def define_relations():
     #env_id = db.Column(db.Integer, db.ForeignKey('%s.env.id' % schema))
     Symlink_directory.root = relationship(Root, backref='symlink_directory')
     Symlink_directory.tree = relationship(Tree, backref='symlink_directory')
-    Symlink_directory.env  = relationship(Env,  backref='symlink_directory')
+    Symlink_directory.env = relationship(Env, backref='symlink_directory')
 
     #class Symlink_file
     #root_id = db.Column(db.Integer, db.ForeignKey('%s.root.id' % schema), nullable = False)
@@ -121,7 +132,8 @@ def define_relations():
     #env_id = db.Column(db.Integer, db.ForeignKey('%s.env.id' % schema))
     Symlink_file.root = relationship(Root, backref='symlink_file')
     Symlink_file.tree = relationship(Tree, backref='symlink_file')
-    Symlink_file.env  = relationship(Env,  backref='symlink_file')
+    Symlink_file.env = relationship(Env, backref='symlink_file')
+
 
 # prepare the base
 database.add_base(Base)
diff --git a/python/sdssdb/tests/test_main.py b/python/sdssdb/tests/test_main.py
index 78c82100..c580e311 100644
--- a/python/sdssdb/tests/test_main.py
+++ b/python/sdssdb/tests/test_main.py
@@ -10,14 +10,14 @@
 
 from pytest import mark
 
-from sdssdb.main import math
+# from sdssdb.main import math
 
 
-class TestMath(object):
-    """Tests for the ``math`` function in main.py."""
+# class TestMath(object):
+#     """Tests for the ``math`` function in main.py."""
 
-    @mark.parametrize(('arg1', 'arg2', 'operator', 'result'),
-                      [(1, 2, '+', 3), (2, 2, '-', 0), (3, 5, '*', 15), (10, 2, '/', 5)])
-    def test_math(self, arg1, arg2, operator, result):
+#     @mark.parametrize(('arg1', 'arg2', 'operator', 'result'),
+#                       [(1, 2, '+', 3), (2, 2, '-', 0), (3, 5, '*', 15), (10, 2, '/', 5)])
+#     def test_math(self, arg1, arg2, operator, result):
 
-        assert math(arg1, arg2, arith_operator=operator) == result
+#         assert math(arg1, arg2, arith_operator=operator) == result

From d1c9c80f1b9624dfdd279995d706934e32ac212c Mon Sep 17 00:00:00 2001
From: Brian Cherinka <havok2063@hotmail.com>
Date: Wed, 18 Sep 2019 17:06:54 -0400
Subject: [PATCH 06/28] updating relationships

---
 python/sdssdb/sqlalchemy/archive/sas.py | 98 ++++++++++---------------
 1 file changed, 37 insertions(+), 61 deletions(-)

diff --git a/python/sdssdb/sqlalchemy/archive/sas.py b/python/sdssdb/sqlalchemy/archive/sas.py
index 954b749a..90de3f15 100644
--- a/python/sdssdb/sqlalchemy/archive/sas.py
+++ b/python/sdssdb/sqlalchemy/archive/sas.py
@@ -51,15 +51,15 @@ class File(Base):
     __tablename__ = 'file'
 
 
-class Symlink_file(Base):
+class SymlinkFile(Base):
     __tablename__ = 'symlink_file'
 
 
-class Symlink_directory(Base):
+class SymlinkDirectory(Base):
     __tablename__ = 'symlink_directory'
 
 
-class Checksumfile(Base):
+class ChecksumFile(Base):
     __tablename__ = 'checksumfile'
 
 
@@ -71,68 +71,44 @@ def define_relations():
     """Setup relationships after preparation."""
     
     # model relationships
-    #directories = relationship("Directory", backref='root')
-    #envs = relationship("Env", backref='tree')
     Root.directories = relationship(Directory, backref='root')
     Tree.envs = relationship(Env, backref='tree')
     
-    #class Checksum
-    #tree_id = db.Column(db.Integer, db.ForeignKey('%s.tree.id' % schema))
-    #checksumfile_id = db.Column(db.Integer, db.ForeignKey('%s.checksumfile.id' % schema), nullable=False)
-    #file_id = db.Column(db.Integer, db.ForeignKey('%s.file.id' % schema))
-    #directory_id = db.Column(db.Integer, db.ForeignKey('%s.directory.id' % schema), nullable=False)
-    Checksum.tree = relationship(Tree, backref='checksum')
-    Checksum.checksumfile = relationship(Checksumfile, backref='checksum')
-    Checksum.file = relationship(File, backref='checksum')
-    Checksum.directory = relationship(Directory, backref='checksum')
+    # class Checksum
+    Checksum.tree = relationship(Tree, backref='checksums')
+    Checksum.checksumfile = relationship(ChecksumFile, backref='checksums')
+    Checksum.file = relationship(File, backref='checksums')
+    Checksum.directory = relationship(Directory, backref='checksums')
     
-    #class Checksumfile
-    #tree_id = db.Column(db.Integer, db.ForeignKey('%s.tree.id' % schema))
-    #env_id = db.Column(db.Integer, db.ForeignKey('%s.env.id' % schema))
-    #directory_id = db.Column(db.Integer, db.ForeignKey('%s.directory.id' % schema), nullable=False)
-    #file_id = db.Column(db.Integer, db.ForeignKey('%s.file.id' % schema), nullable=False)
-    Checksumfile.tree = relationship(Tree, backref='checksumfile')
-    Checksumfile.env = relationship(Env, backref='checksumfile')
-    Checksumfile.directory = relationship(Directory, backref='checksumfile')
-    Checksumfile.file = relationship(File, backref='checksumfile')
-
-    #class Directory
-    #root_id = db.Column(db.Integer, db.ForeignKey('%s.root.id' % schema), nullable = False)
-    #tree_id = db.Column(db.Integer, db.ForeignKey('%s.tree.id' % schema))
-    #env_id = db.Column(db.Integer, db.ForeignKey('%s.env.id' % schema))
-    Directory.root = relationship(Root, backref='directory')
-    Directory.tree = relationship(Tree, backref='directory')
-    Directory.env = relationship(Env, backref='directory')
-
-    #class Env
-    #tree_id = db.Column(db.Integer, db.ForeignKey('%s.tree.id' % schema))
-    #real_env_id = db.Column(db.Integer, db.ForeignKey('%s.env.id' % schema))
-    Env.tree = relationship(Tree, backref='env')
-    Env.real_env = relationship(Env)
-
-    #class File
-    #root_id = db.Column(db.Integer, db.ForeignKey('%s.root.id' % schema), nullable = False)
-    #tree_id = db.Column(db.Integer, db.ForeignKey('%s.tree.id' % schema))
-    #env_id = db.Column(db.Integer, db.ForeignKey('%s.env.id' % schema))
-    File.root = relationship(Root, backref='file')
-    File.tree = relationship(Tree, backref='file')
-    File.env = relationship(Env, backref='file')
-
-    #class Symlink_directory
-    #root_id = db.Column(db.Integer, db.ForeignKey('%s.root.id' % schema), nullable = False)
-    #tree_id = db.Column(db.Integer, db.ForeignKey('%s.tree.id' % schema))
-    #env_id = db.Column(db.Integer, db.ForeignKey('%s.env.id' % schema))
-    Symlink_directory.root = relationship(Root, backref='symlink_directory')
-    Symlink_directory.tree = relationship(Tree, backref='symlink_directory')
-    Symlink_directory.env = relationship(Env, backref='symlink_directory')
-
-    #class Symlink_file
-    #root_id = db.Column(db.Integer, db.ForeignKey('%s.root.id' % schema), nullable = False)
-    #tree_id = db.Column(db.Integer, db.ForeignKey('%s.tree.id' % schema))
-    #env_id = db.Column(db.Integer, db.ForeignKey('%s.env.id' % schema))
-    Symlink_file.root = relationship(Root, backref='symlink_file')
-    Symlink_file.tree = relationship(Tree, backref='symlink_file')
-    Symlink_file.env = relationship(Env, backref='symlink_file')
+    # class Checksumfile
+    ChecksumFile.tree = relationship(Tree, backref='checksumfile')
+    ChecksumFile.env = relationship(Env, backref='checksumfile')
+    ChecksumFile.directory = relationship(Directory, backref='checksumfile')
+    ChecksumFile.file = relationship(File, backref='checksumfile')
+
+    # class Directory
+    #Directory.root = relationship(Root, backref='directory')
+    Directory.tree = relationship(Tree, backref='directories')
+    Directory.env = relationship(Env, backref='directories')
+
+    # class Env
+    #Env.tree = relationship(Tree, backref='env')
+    Env.real_env = relationship(Env, backref='env')
+
+    # class File
+    File.root = relationship(Root, backref='files')
+    File.tree = relationship(Tree, backref='files')
+    File.env = relationship(Env, backref='files')
+
+    # class Symlink_directory
+    SymlinkDirectory.root = relationship(Root, backref='symdirs', foreign_keys=['root_id'])
+    SymlinkDirectory.tree = relationship(Tree, backref='symdirs', foreign_keys=['tree_id'])
+    SymlinkDirectory.env = relationship(Env, backref='symdirs')
+
+    # class Symlink_file
+    SymlinkFile.root = relationship(Root, backref='symlinks', foreign_keys=['root_id'])
+    SymlinkFile.tree = relationship(Tree, backref='symlinks', foreign_keys=['tree_id'])
+    SymlinkFile.env = relationship(Env, backref='symlinks')
 
 
 # prepare the base

From 45ab9522099f7bd44c1b41d23c151a9d525d63cd Mon Sep 17 00:00:00 2001
From: Brian Cherinka <havok2063@hotmail.com>
Date: Wed, 18 Sep 2019 18:10:54 -0400
Subject: [PATCH 07/28] updating relationships

---
 python/sdssdb/sqlalchemy/archive/sas.py | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/python/sdssdb/sqlalchemy/archive/sas.py b/python/sdssdb/sqlalchemy/archive/sas.py
index 90de3f15..200f5280 100644
--- a/python/sdssdb/sqlalchemy/archive/sas.py
+++ b/python/sdssdb/sqlalchemy/archive/sas.py
@@ -81,7 +81,7 @@ def define_relations():
     Checksum.directory = relationship(Directory, backref='checksums')
     
     # class Checksumfile
-    ChecksumFile.tree = relationship(Tree, backref='checksumfile')
+    ChecksumFile.tree = relationship(Tree, backref='checksumfiles')
     ChecksumFile.env = relationship(Env, backref='checksumfile')
     ChecksumFile.directory = relationship(Directory, backref='checksumfile')
     ChecksumFile.file = relationship(File, backref='checksumfile')
@@ -92,8 +92,8 @@ def define_relations():
     Directory.env = relationship(Env, backref='directories')
 
     # class Env
-    #Env.tree = relationship(Tree, backref='env')
-    Env.real_env = relationship(Env, backref='env')
+    # specify remote_side when foreign key points to itself
+    Env.real_env = relationship(Env, remote_side=['Env.id'], backref='env')
 
     # class File
     File.root = relationship(Root, backref='files')
@@ -101,14 +101,25 @@ def define_relations():
     File.env = relationship(Env, backref='files')
 
     # class Symlink_directory
-    SymlinkDirectory.root = relationship(Root, backref='symdirs', foreign_keys=['root_id'])
-    SymlinkDirectory.tree = relationship(Tree, backref='symdirs', foreign_keys=['tree_id'])
+    SymlinkDirectory.directory = relationship(Directory, backref='symdir')
+    SymlinkDirectory.root = relationship(Root, backref='symdirs', foreign_keys='SymlinkDirectory.root_id')
+    SymlinkDirectory.tree = relationship(Tree, backref='symdirs', foreign_keys='SymlinkDirectory.tree_id', 
+                                         primaryjoin='and_(SymlinkDirectory.tree_id==Tree.id)')
     SymlinkDirectory.env = relationship(Env, backref='symdirs')
+    SymlinkDirectory.real_dir = relationship(SymlinkDirectory, remote_side=['SymlinkDirectory.directory_id'], backref='symdir')
+    SymlinkDirectory.real_tree = relationship(SymlinkDirectory, remote_side=[
+                                              'SymlinkDirectory.tree_id'], backref='symdir')
+
 
     # class Symlink_file
-    SymlinkFile.root = relationship(Root, backref='symlinks', foreign_keys=['root_id'])
-    SymlinkFile.tree = relationship(Tree, backref='symlinks', foreign_keys=['tree_id'])
+    SymlinkFile.directory = relationship(Directory, backref='symlinks')
+    SymlinkFile.root = relationship(Root, backref='symlinks', foreign_keys='SymlinkFile.root_id')
+    SymlinkFile.tree = relationship(Tree, backref='symlinks', foreign_keys='SymlinkFile.tree_id',
+                                    primaryjoin='and_(SymlinkDirectory.tree_id==Tree.id)')
     SymlinkFile.env = relationship(Env, backref='symlinks')
+    SymlinkFile.real_tree = relationship(SymlinkFile, remote_side=[
+                                         'SymlinkFile.tree_id'], backref='symlinks')
+    SymlinkFile.real_file = relationship(File, backref='symlinks')
 
 
 # prepare the base

From 51d7dd9ed29d914668b6c81ceb7ee24d0bf0c2c4 Mon Sep 17 00:00:00 2001
From: Brian Cherinka <havok2063@hotmail.com>
Date: Wed, 18 Sep 2019 18:13:31 -0400
Subject: [PATCH 08/28] updating relationships

---
 python/sdssdb/sqlalchemy/archive/sas.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/python/sdssdb/sqlalchemy/archive/sas.py b/python/sdssdb/sqlalchemy/archive/sas.py
index 200f5280..8ac4c5d8 100644
--- a/python/sdssdb/sqlalchemy/archive/sas.py
+++ b/python/sdssdb/sqlalchemy/archive/sas.py
@@ -101,12 +101,14 @@ def define_relations():
     File.env = relationship(Env, backref='files')
 
     # class Symlink_directory
-    SymlinkDirectory.directory = relationship(Directory, backref='symdir')
-    SymlinkDirectory.root = relationship(Root, backref='symdirs', foreign_keys='SymlinkDirectory.root_id')
+    SymlinkDirectory.directory = relationship(
+        Directory, backref='symdir', foreign_keys='SymlinkDirectory.directory_id')
+    SymlinkDirectory.root = relationship(Root, backref='symdirs')
     SymlinkDirectory.tree = relationship(Tree, backref='symdirs', foreign_keys='SymlinkDirectory.tree_id', 
                                          primaryjoin='and_(SymlinkDirectory.tree_id==Tree.id)')
     SymlinkDirectory.env = relationship(Env, backref='symdirs')
-    SymlinkDirectory.real_dir = relationship(SymlinkDirectory, remote_side=['SymlinkDirectory.directory_id'], backref='symdir')
+    SymlinkDirectory.real_dir = relationship(SymlinkDirectory, 
+                                             remote_side=['SymlinkDirectory.directory_id'], backref='symdir')
     SymlinkDirectory.real_tree = relationship(SymlinkDirectory, remote_side=[
                                               'SymlinkDirectory.tree_id'], backref='symdir')
 

From 4a5f7f53265112fc7c34edc92eaed50fe8ee362a Mon Sep 17 00:00:00 2001
From: Brian Cherinka <havok2063@hotmail.com>
Date: Wed, 18 Sep 2019 18:29:55 -0400
Subject: [PATCH 09/28] updating relationships to fix symlinks and symdirs

---
 python/sdssdb/sqlalchemy/archive/sas.py | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/python/sdssdb/sqlalchemy/archive/sas.py b/python/sdssdb/sqlalchemy/archive/sas.py
index 8ac4c5d8..e3a2bdb8 100644
--- a/python/sdssdb/sqlalchemy/archive/sas.py
+++ b/python/sdssdb/sqlalchemy/archive/sas.py
@@ -104,24 +104,23 @@ def define_relations():
     SymlinkDirectory.directory = relationship(
         Directory, backref='symdir', foreign_keys='SymlinkDirectory.directory_id')
     SymlinkDirectory.root = relationship(Root, backref='symdirs')
-    SymlinkDirectory.tree = relationship(Tree, backref='symdirs', foreign_keys='SymlinkDirectory.tree_id', 
+    SymlinkDirectory.tree = relationship(Tree, backref='symdirs', foreign_keys='SymlinkDirectory.tree_id',
                                          primaryjoin='and_(SymlinkDirectory.tree_id==Tree.id)')
     SymlinkDirectory.env = relationship(Env, backref='symdirs')
-    SymlinkDirectory.real_dir = relationship(SymlinkDirectory, 
-                                             remote_side=['SymlinkDirectory.directory_id'], backref='symdir')
-    SymlinkDirectory.real_tree = relationship(SymlinkDirectory, remote_side=[
-                                              'SymlinkDirectory.tree_id'], backref='symdir')
-
+    SymlinkDirectory.real_dir = relationship(Directory, backref='realsymdir', 
+                                             primaryjoin='and_(SymlinkDirectory.real_directory_id==Directory.id)')
+    SymlinkDirectory.real_tree = relationship(
+        Tree, backref='realsymdir', primaryjoin='and_(SymlinkDirectory.real_tree_id==Tree.id)')
 
     # class Symlink_file
     SymlinkFile.directory = relationship(Directory, backref='symlinks')
-    SymlinkFile.root = relationship(Root, backref='symlinks', foreign_keys='SymlinkFile.root_id')
-    SymlinkFile.tree = relationship(Tree, backref='symlinks', foreign_keys='SymlinkFile.tree_id',
-                                    primaryjoin='and_(SymlinkDirectory.tree_id==Tree.id)')
     SymlinkFile.env = relationship(Env, backref='symlinks')
-    SymlinkFile.real_tree = relationship(SymlinkFile, remote_side=[
-                                         'SymlinkFile.tree_id'], backref='symlinks')
     SymlinkFile.real_file = relationship(File, backref='symlinks')
+    SymlinkFile.root = relationship(Root, backref='symlinks', foreign_keys='SymlinkFile.root_id')
+    SymlinkFile.tree = relationship(Tree, backref='symlinks', foreign_keys='SymlinkFile.tree_id',
+                                    primaryjoin='and_(SymlinkFile.tree_id==Tree.id)')
+    SymlinkFile.real_tree = relationship(
+        Tree, backref='realsymlinks', primaryjoin='and_(SymlinkFile.real_tree_id==Tree.id)')
 
 
 # prepare the base

From aa0f0389ae65d1ea39b907af866bf378a4293fbb Mon Sep 17 00:00:00 2001
From: Brian Cherinka <havok2063@hotmail.com>
Date: Wed, 18 Sep 2019 18:36:00 -0400
Subject: [PATCH 10/28] cleaning up relationships

---
 python/sdssdb/sqlalchemy/archive/sas.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/python/sdssdb/sqlalchemy/archive/sas.py b/python/sdssdb/sqlalchemy/archive/sas.py
index e3a2bdb8..f4a15ba6 100644
--- a/python/sdssdb/sqlalchemy/archive/sas.py
+++ b/python/sdssdb/sqlalchemy/archive/sas.py
@@ -87,13 +87,12 @@ def define_relations():
     ChecksumFile.file = relationship(File, backref='checksumfile')
 
     # class Directory
-    #Directory.root = relationship(Root, backref='directory')
     Directory.tree = relationship(Tree, backref='directories')
     Directory.env = relationship(Env, backref='directories')
 
     # class Env
-    # specify remote_side when foreign key points to itself
-    Env.real_env = relationship(Env, remote_side=['Env.id'], backref='env')
+    # need to specify remote_side when foreign key points to itself
+    Env.real_env = relationship(Env, remote_side='Env.id', backref='env')
 
     # class File
     File.root = relationship(Root, backref='files')
@@ -101,14 +100,16 @@ def define_relations():
     File.env = relationship(Env, backref='files')
 
     # class Symlink_directory
+    SymlinkDirectory.env = relationship(Env, backref='symdirs')
+    SymlinkDirectory.root = relationship(Root, backref='symdirs')
+    # need to specify foreign_keys when multiple columns points to same key
+    # need to specify primaryjoin when there are multiple ways to join the tables
     SymlinkDirectory.directory = relationship(
         Directory, backref='symdir', foreign_keys='SymlinkDirectory.directory_id')
-    SymlinkDirectory.root = relationship(Root, backref='symdirs')
+    SymlinkDirectory.real_dir = relationship(Directory, backref='realsymdir',
+                                             primaryjoin='and_(SymlinkDirectory.real_directory_id==Directory.id)')
     SymlinkDirectory.tree = relationship(Tree, backref='symdirs', foreign_keys='SymlinkDirectory.tree_id',
                                          primaryjoin='and_(SymlinkDirectory.tree_id==Tree.id)')
-    SymlinkDirectory.env = relationship(Env, backref='symdirs')
-    SymlinkDirectory.real_dir = relationship(Directory, backref='realsymdir', 
-                                             primaryjoin='and_(SymlinkDirectory.real_directory_id==Directory.id)')
     SymlinkDirectory.real_tree = relationship(
         Tree, backref='realsymdir', primaryjoin='and_(SymlinkDirectory.real_tree_id==Tree.id)')
 

From a13c28dfc0329b035991f3558115d002bb89add9 Mon Sep 17 00:00:00 2001
From: Brian Cherinka <havok2063@hotmail.com>
Date: Wed, 18 Sep 2019 18:45:34 -0400
Subject: [PATCH 11/28] updating print_fields

---
 python/sdssdb/sqlalchemy/archive/sas.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/python/sdssdb/sqlalchemy/archive/sas.py b/python/sdssdb/sqlalchemy/archive/sas.py
index f4a15ba6..c2f76952 100644
--- a/python/sdssdb/sqlalchemy/archive/sas.py
+++ b/python/sdssdb/sqlalchemy/archive/sas.py
@@ -33,10 +33,12 @@ def __table_args__(cls):
 
 class Root(Base):
     __tablename__ = 'root'
+    print_fields = ['identifier']
 
 
 class Tree(Base):
     __tablename__ = 'tree'
+    print_fields = ['version']
 
 
 class Env(Base):
@@ -45,22 +47,27 @@ class Env(Base):
 
 class Directory(Base):
     __tablename__ = 'directory'
+    print_fields = ['location']
 
 
 class File(Base):
     __tablename__ = 'file'
+    print_fields = ['location']
 
 
 class SymlinkFile(Base):
     __tablename__ = 'symlink_file'
+    print_fields = ['location']
 
 
 class SymlinkDirectory(Base):
     __tablename__ = 'symlink_directory'
+    print_fields = ['location']
 
 
 class ChecksumFile(Base):
     __tablename__ = 'checksumfile'
+    print_fields = ['filename']
 
 
 class Checksum(Base):

From 632a3e08522010ba45d81972973f11a1621bf505 Mon Sep 17 00:00:00 2001
From: Joel Brownstein <joelbrownstein@sdss.org>
Date: Wed, 18 Sep 2019 17:05:16 -0600
Subject: [PATCH 12/28] add archive

---
 docs/sphinx/intro.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/sphinx/intro.rst b/docs/sphinx/intro.rst
index 605439d5..05943403 100644
--- a/docs/sphinx/intro.rst
+++ b/docs/sphinx/intro.rst
@@ -38,6 +38,8 @@ Currently, we support the following databases and schemas:
 * **sdss5db**: the SDSS-V development database.
     * *catalogdb*: schema for source catalogues used for target selection.
     * *targetdb*: schema with the results of the target selection and positioner information.
+* **archive**: the SDSS science archive database.
+    * *sas*: schema for SAS.
 
 Note that the level of readiness is not necessarily identical in both Peewee and SQLAlchemy. This table summarises what schemas are available for each library. Green indicates fully supported, yellow partial support, and red means that there are currently not model classes available for that schema. You can download the graph visualisation of the schema, showing the tables, columns, and relations between tables.
 

From 44750317a3a66b534d4e1b8ea4276b395cfbe222 Mon Sep 17 00:00:00 2001
From: Brian Cherinka <havok2063@hotmail.com>
Date: Thu, 19 Sep 2019 13:40:12 -0400
Subject: [PATCH 13/28] updating backrefs

---
 python/sdssdb/sqlalchemy/archive/sas.py | 28 +++++++++++++------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/python/sdssdb/sqlalchemy/archive/sas.py b/python/sdssdb/sqlalchemy/archive/sas.py
index c2f76952..77ee0113 100644
--- a/python/sdssdb/sqlalchemy/archive/sas.py
+++ b/python/sdssdb/sqlalchemy/archive/sas.py
@@ -107,28 +107,30 @@ def define_relations():
     File.env = relationship(Env, backref='files')
 
     # class Symlink_directory
-    SymlinkDirectory.env = relationship(Env, backref='symdirs')
-    SymlinkDirectory.root = relationship(Root, backref='symdirs')
+    SymlinkDirectory.env = relationship(Env, backref='symlink_directories')
+    SymlinkDirectory.root = relationship(Root, backref='symlink_directories')
     # need to specify foreign_keys when multiple columns points to same key
     # need to specify primaryjoin when there are multiple ways to join the tables
     SymlinkDirectory.directory = relationship(
-        Directory, backref='symdir', foreign_keys='SymlinkDirectory.directory_id')
-    SymlinkDirectory.real_dir = relationship(Directory, backref='realsymdir',
-                                             primaryjoin='and_(SymlinkDirectory.real_directory_id==Directory.id)')
-    SymlinkDirectory.tree = relationship(Tree, backref='symdirs', foreign_keys='SymlinkDirectory.tree_id',
+        Directory, backref='symlink_directories', foreign_keys='SymlinkDirectory.directory_id')
+    SymlinkDirectory.real_directory = relationship(Directory, backref='linked_symlink_directories',
+                                                   primaryjoin='and_(SymlinkDirectory.real_directory_id==Directory.id)')
+
+    SymlinkDirectory.tree = relationship(Tree, backref='symlink_directories', foreign_keys='SymlinkDirectory.tree_id',
                                          primaryjoin='and_(SymlinkDirectory.tree_id==Tree.id)')
     SymlinkDirectory.real_tree = relationship(
-        Tree, backref='realsymdir', primaryjoin='and_(SymlinkDirectory.real_tree_id==Tree.id)')
+        Tree, backref='linked_symlink_directories', primaryjoin='and_(SymlinkDirectory.real_tree_id==Tree.id)')
 
     # class Symlink_file
-    SymlinkFile.directory = relationship(Directory, backref='symlinks')
-    SymlinkFile.env = relationship(Env, backref='symlinks')
-    SymlinkFile.real_file = relationship(File, backref='symlinks')
-    SymlinkFile.root = relationship(Root, backref='symlinks', foreign_keys='SymlinkFile.root_id')
-    SymlinkFile.tree = relationship(Tree, backref='symlinks', foreign_keys='SymlinkFile.tree_id',
+    SymlinkFile.directory = relationship(Directory, backref='symlink_files')
+    SymlinkFile.env = relationship(Env, backref='symlink_files')
+    SymlinkFile.real_file = relationship(File, backref='symlink_files')
+    SymlinkFile.root = relationship(Root, backref='symlink_files', foreign_keys='SymlinkFile.root_id')
+
+    SymlinkFile.tree = relationship(Tree, backref='symlink_files', foreign_keys='SymlinkFile.tree_id',
                                     primaryjoin='and_(SymlinkFile.tree_id==Tree.id)')
     SymlinkFile.real_tree = relationship(
-        Tree, backref='realsymlinks', primaryjoin='and_(SymlinkFile.real_tree_id==Tree.id)')
+        Tree, backref='linked_symlink_files', primaryjoin='and_(SymlinkFile.real_tree_id==Tree.id)')
 
 
 # prepare the base

From 7120537099cc3337cd25880716eb14b3b60a27a1 Mon Sep 17 00:00:00 2001
From: Brian Cherinka <havok2063@hotmail.com>
Date: Thu, 19 Sep 2019 14:00:45 -0400
Subject: [PATCH 14/28] adding archive db to docs

---
 docs/sphinx/intro.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/sphinx/intro.rst b/docs/sphinx/intro.rst
index 05943403..6d839a6d 100644
--- a/docs/sphinx/intro.rst
+++ b/docs/sphinx/intro.rst
@@ -113,6 +113,13 @@ Note that the level of readiness is not necessarily identical in both Peewee and
             <td class="warning"></td>
             <td align="center"><a class="glyphicon glyphicon-download-alt" href="_static/schema_graphs/auto/sdss5db.targetdb.pdf"></a></td>
         </tr>
+        <tr>
+            <td class="active">archive</td>
+            <td class="active">sas</td>
+            <td class="danger"></td>
+            <td class="success"></td>
+            <td align="center"><a class="glyphicon glyphicon-download-alt" href="#"></a></td>
+        </tr> 
         </tbody>
     </table>
 

From 3130548dd2a4815a04684ebd9fb5ce2b1d29a8fd Mon Sep 17 00:00:00 2001
From: Brian Cherinka <havok2063@hotmail.com>
Date: Thu, 19 Sep 2019 14:02:02 -0400
Subject: [PATCH 15/28] updating changelog

---
 CHANGELOG.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 2ad02d93..96a87bff 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,7 @@ Changelog
 
 This document records the main changes to the ``sdssdb`` code.
 
+* Added ``archive`` database with ``sas`` schema.
 * Added ``TIC v8``.
 * :release:`0.2.2 <2019-07-24>`
 * Fixed import of database connections when Peewee or SQLAlchemy are not available.

From 8e47785d0071808b89e7c613c92b7e7446dbeac3 Mon Sep 17 00:00:00 2001
From: Brian Cherinka <havok2063@hotmail.com>
Date: Thu, 19 Sep 2019 14:10:56 -0400
Subject: [PATCH 16/28] adding files-dir relationship and name property to file

---
 python/sdssdb/sqlalchemy/archive/sas.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/python/sdssdb/sqlalchemy/archive/sas.py b/python/sdssdb/sqlalchemy/archive/sas.py
index 77ee0113..bbc4470b 100644
--- a/python/sdssdb/sqlalchemy/archive/sas.py
+++ b/python/sdssdb/sqlalchemy/archive/sas.py
@@ -52,7 +52,11 @@ class Directory(Base):
 
 class File(Base):
     __tablename__ = 'file'
-    print_fields = ['location']
+    print_fields = ['name']
+
+    @property
+    def name(self):
+        return self.location.rsplit('/', 1)[-1]
 
 
 class SymlinkFile(Base):
@@ -105,6 +109,7 @@ def define_relations():
     File.root = relationship(Root, backref='files')
     File.tree = relationship(Tree, backref='files')
     File.env = relationship(Env, backref='files')
+    File.env = relationship(Directory, backref='files')
 
     # class Symlink_directory
     SymlinkDirectory.env = relationship(Env, backref='symlink_directories')

From 807faf23f2769118ab471b3998f0027c07fa58bc Mon Sep 17 00:00:00 2001
From: Brian Cherinka <havok2063@hotmail.com>
Date: Thu, 19 Sep 2019 14:13:17 -0400
Subject: [PATCH 17/28] bugfix in relationship name

---
 python/sdssdb/sqlalchemy/archive/sas.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/sdssdb/sqlalchemy/archive/sas.py b/python/sdssdb/sqlalchemy/archive/sas.py
index bbc4470b..ec922f59 100644
--- a/python/sdssdb/sqlalchemy/archive/sas.py
+++ b/python/sdssdb/sqlalchemy/archive/sas.py
@@ -109,7 +109,7 @@ def define_relations():
     File.root = relationship(Root, backref='files')
     File.tree = relationship(Tree, backref='files')
     File.env = relationship(Env, backref='files')
-    File.env = relationship(Directory, backref='files')
+    File.directory = relationship(Directory, backref='files')
 
     # class Symlink_directory
     SymlinkDirectory.env = relationship(Env, backref='symlink_directories')

From 64bfe1fb69061c29b5a23b4b3a755154018947e8 Mon Sep 17 00:00:00 2001
From: N Benjamin Murphy <n.benjamin.murphy@astro.utah.edu>
Date: Thu, 19 Sep 2019 18:59:32 -0600
Subject: [PATCH 18/28] Added archive db ER diagram and made associated changes
 to intro.rst

---
 docs/sphinx/intro.rst          |   4 ++--
 schema/archive/archive_sas.pdf | Bin 0 -> 20612 bytes
 2 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 schema/archive/archive_sas.pdf

diff --git a/docs/sphinx/intro.rst b/docs/sphinx/intro.rst
index 6d839a6d..286c6d49 100644
--- a/docs/sphinx/intro.rst
+++ b/docs/sphinx/intro.rst
@@ -118,8 +118,8 @@ Note that the level of readiness is not necessarily identical in both Peewee and
             <td class="active">sas</td>
             <td class="danger"></td>
             <td class="success"></td>
-            <td align="center"><a class="glyphicon glyphicon-download-alt" href="#"></a></td>
-        </tr> 
+            <td align="center"><a class="glyphicon glyphicon-download-alt" href="schema/archive/archive_sas.pdf"></a></td>
+        </tr>
         </tbody>
     </table>
 
diff --git a/schema/archive/archive_sas.pdf b/schema/archive/archive_sas.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..5e8461a94b139d72aeb41d006566d28315676e10
GIT binary patch
literal 20612
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

literal 0
HcmV?d00001


From 3a6b978dc711361766d51b4e50b92d7218985711 Mon Sep 17 00:00:00 2001
From: Brian Cherinka <havok2063@hotmail.com>
Date: Mon, 23 Sep 2019 15:36:02 -0400
Subject: [PATCH 19/28] fixing link to sas archive pdf schema

---
 docs/sphinx/intro.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/sphinx/intro.rst b/docs/sphinx/intro.rst
index 286c6d49..8b54e1b4 100644
--- a/docs/sphinx/intro.rst
+++ b/docs/sphinx/intro.rst
@@ -118,7 +118,7 @@ Note that the level of readiness is not necessarily identical in both Peewee and
             <td class="active">sas</td>
             <td class="danger"></td>
             <td class="success"></td>
-            <td align="center"><a class="glyphicon glyphicon-download-alt" href="schema/archive/archive_sas.pdf"></a></td>
+            <td align="center"><a class="glyphicon glyphicon-download-alt" href="../../../../schema/archive/archive_sas.pdf"></a></td>
         </tr>
         </tbody>
     </table>

From 9dbc24ba96803866e8130123f394c569100581c7 Mon Sep 17 00:00:00 2001
From: Brian Cherinka <havok2063@hotmail.com>
Date: Mon, 23 Sep 2019 15:54:05 -0400
Subject: [PATCH 20/28] fixing imports and linting issues

---
 python/sdssdb/sqlalchemy/archive/sas.py | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/python/sdssdb/sqlalchemy/archive/sas.py b/python/sdssdb/sqlalchemy/archive/sas.py
index ec922f59..686c1efd 100644
--- a/python/sdssdb/sqlalchemy/archive/sas.py
+++ b/python/sdssdb/sqlalchemy/archive/sas.py
@@ -10,13 +10,9 @@
 
 from __future__ import absolute_import, division, print_function
 
-from sdssdb.sqlalchemy.archive import database, ArchiveBase, sas
-from sqlalchemy import Column, Float, and_, case, cast, select
-from sqlalchemy.engine import reflection
+from sdssdb.sqlalchemy.archive import database, ArchiveBase
 from sqlalchemy.ext.declarative import AbstractConcreteBase, declared_attr
-from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm import relationship
-from sqlalchemy.types import Integer
 
 SCHEMA = 'sas'
 
@@ -119,20 +115,25 @@ def define_relations():
     SymlinkDirectory.directory = relationship(
         Directory, backref='symlink_directories', foreign_keys='SymlinkDirectory.directory_id')
     SymlinkDirectory.real_directory = relationship(Directory, backref='linked_symlink_directories',
-                                                   primaryjoin='and_(SymlinkDirectory.real_directory_id==Directory.id)')
+                                                   primaryjoin=('and_(SymlinkDirectory.'
+                                                                'real_directory_id==Directory.id)'))
 
-    SymlinkDirectory.tree = relationship(Tree, backref='symlink_directories', foreign_keys='SymlinkDirectory.tree_id',
+    SymlinkDirectory.tree = relationship(Tree, backref='symlink_directories',
+                                         foreign_keys='SymlinkDirectory.tree_id',
                                          primaryjoin='and_(SymlinkDirectory.tree_id==Tree.id)')
     SymlinkDirectory.real_tree = relationship(
-        Tree, backref='linked_symlink_directories', primaryjoin='and_(SymlinkDirectory.real_tree_id==Tree.id)')
+        Tree, backref='linked_symlink_directories',
+        primaryjoin='and_(SymlinkDirectory.real_tree_id==Tree.id)')
 
     # class Symlink_file
     SymlinkFile.directory = relationship(Directory, backref='symlink_files')
     SymlinkFile.env = relationship(Env, backref='symlink_files')
     SymlinkFile.real_file = relationship(File, backref='symlink_files')
-    SymlinkFile.root = relationship(Root, backref='symlink_files', foreign_keys='SymlinkFile.root_id')
+    SymlinkFile.root = relationship(Root, backref='symlink_files',
+                                    foreign_keys='SymlinkFile.root_id')
 
-    SymlinkFile.tree = relationship(Tree, backref='symlink_files', foreign_keys='SymlinkFile.tree_id',
+    SymlinkFile.tree = relationship(Tree, backref='symlink_files',
+                                    foreign_keys='SymlinkFile.tree_id',
                                     primaryjoin='and_(SymlinkFile.tree_id==Tree.id)')
     SymlinkFile.real_tree = relationship(
         Tree, backref='linked_symlink_files', primaryjoin='and_(SymlinkFile.real_tree_id==Tree.id)')

From a3dfcf0615728e114df47e86b75e649414a7b2a6 Mon Sep 17 00:00:00 2001
From: Brian Cherinka <havok2063@hotmail.com>
Date: Mon, 23 Sep 2019 16:01:09 -0400
Subject: [PATCH 21/28] fixing linting issues

---
 python/sdssdb/sqlalchemy/archive/__init__.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/python/sdssdb/sqlalchemy/archive/__init__.py b/python/sdssdb/sqlalchemy/archive/__init__.py
index 583f1a5d..bdfc930c 100644
--- a/python/sdssdb/sqlalchemy/archive/__init__.py
+++ b/python/sdssdb/sqlalchemy/archive/__init__.py
@@ -17,8 +17,10 @@
 # we need a shared common Base when joining across multiple schema
 ArchiveBase = declarative_base(cls=(DeferredReflection, BaseModel,))
 
+
 class ArchiveDatabaseConnection(SQLADatabaseConnection):
     dbname = 'archive_20190507'
     base = ArchiveBase
 
+
 database = ArchiveDatabaseConnection(autoconnect=True)

From ba7c8430f3852aedae126c0570cbeda046d62570 Mon Sep 17 00:00:00 2001
From: Brian Cherinka <havok2063@hotmail.com>
Date: Mon, 23 Sep 2019 16:46:34 -0400
Subject: [PATCH 22/28] adding travis status badge

---
 README.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 65f79c9a..e93d211a 100644
--- a/README.rst
+++ b/README.rst
@@ -1,7 +1,7 @@
 sdssdb
 ======
 
-|python| |docs|
+|python| |docs| |travis| 
 
 `SDSS <https://sdss.org>`__ product for database management.
 
@@ -30,3 +30,6 @@ How to use
     :alt: Documentation Status
     :scale: 100%
     :target: https://sdssdb.readthedocs.io/en/latest/?badge=latest
+
+.. |travis| image:: https://travis-ci.org/sdss/sdssdb.svg?branch=master
+    :target: https://travis-ci.org/sdss/sdssdb
\ No newline at end of file

From d6ffc9a8e591e0852c4f6ff6427e9246a904ac8d Mon Sep 17 00:00:00 2001
From: Brian Cherinka <havok2063@hotmail.com>
Date: Mon, 23 Sep 2019 16:47:59 -0400
Subject: [PATCH 23/28] removing requirements.txt from travis file

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7bb57110..31504224 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,6 @@ branches:
 install:
 - pip install -U pip wheel --quiet
 - pip install --upgrade setuptools --quiet
-- pip install -r requirements.txt --quiet
 - pip install pytest
 - pip install pytest-coverage
 - pip install coveralls

From f2cd3bc73c0db5a22c61b2e5efb981c252f148a7 Mon Sep 17 00:00:00 2001
From: Brian Cherinka <havok2063@hotmail.com>
Date: Mon, 23 Sep 2019 16:56:07 -0400
Subject: [PATCH 24/28] adding a skipdb test for travis until db tests can be
 fixed

---
 python/sdssdb/tests/test_peewee.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/python/sdssdb/tests/test_peewee.py b/python/sdssdb/tests/test_peewee.py
index adaed0f8..1bfe41e8 100644
--- a/python/sdssdb/tests/test_peewee.py
+++ b/python/sdssdb/tests/test_peewee.py
@@ -9,6 +9,13 @@
 from __future__ import unicode_literals
 
 import sdssdb.peewee.sdss5db.targetdb as targetdb
+import pytest
+
+
+@pytest.fixture(scope='session', autouse=True)
+def skipdb():
+    if targetdb.database.connected is False:
+        pytest.skip('no targetdb found')
 
 
 class TestPeewee(object):

From 4b3d9c69acf02ca955b229f823a268b9f93ffd77 Mon Sep 17 00:00:00 2001
From: Brian Cherinka <havok2063@hotmail.com>
Date: Mon, 23 Sep 2019 16:57:13 -0400
Subject: [PATCH 25/28] removing tests for nonexistent code

---
 python/sdssdb/tests/test_main.py | 23 -----------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 python/sdssdb/tests/test_main.py

diff --git a/python/sdssdb/tests/test_main.py b/python/sdssdb/tests/test_main.py
deleted file mode 100644
index c580e311..00000000
--- a/python/sdssdb/tests/test_main.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# encoding: utf-8
-#
-# main.py
-
-
-from __future__ import division
-from __future__ import print_function
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
-from pytest import mark
-
-# from sdssdb.main import math
-
-
-# class TestMath(object):
-#     """Tests for the ``math`` function in main.py."""
-
-#     @mark.parametrize(('arg1', 'arg2', 'operator', 'result'),
-#                       [(1, 2, '+', 3), (2, 2, '-', 0), (3, 5, '*', 15), (10, 2, '/', 5)])
-#     def test_math(self, arg1, arg2, operator, result):
-
-#         assert math(arg1, arg2, arith_operator=operator) == result

From a6910b65145612823b855eea485c9d83791f5d15 Mon Sep 17 00:00:00 2001
From: Brian Cherinka <havok2063@hotmail.com>
Date: Mon, 23 Sep 2019 16:59:37 -0400
Subject: [PATCH 26/28] allowing py2.7 to fail

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 31504224..8486a6c5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,8 @@ os:
 
 matrix:
   fast_finish: true
+  allow_failures:
+    - python: '2.7'
 
 notifications:
   email: false

From 6b6645097ab5e9e9a63d4e9c28015fb872a1080f Mon Sep 17 00:00:00 2001
From: Brian Cherinka <havok2063@hotmail.com>
Date: Mon, 23 Sep 2019 17:00:39 -0400
Subject: [PATCH 27/28] allowing py3.5 to fail since we use fstrings

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 8486a6c5..3bb44138 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,7 @@ python:
 - '2.7'
 - '3.5'
 - '3.6'
+- '3.7'
 
 os:
 - linux
@@ -18,6 +19,7 @@ matrix:
   fast_finish: true
   allow_failures:
     - python: '2.7'
+    - python: '3.5'
 
 notifications:
   email: false

From 7c490a1bc05f863c556af984789c4455ea984583 Mon Sep 17 00:00:00 2001
From: Brian Cherinka <havok2063@hotmail.com>
Date: Mon, 23 Sep 2019 17:34:59 -0400
Subject: [PATCH 28/28] removing explicit localhost from local profile

---
 python/sdssdb/etc/sdssdb.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/python/sdssdb/etc/sdssdb.yml b/python/sdssdb/etc/sdssdb.yml
index 986e4005..eaadb6f1 100644
--- a/python/sdssdb/etc/sdssdb.yml
+++ b/python/sdssdb/etc/sdssdb.yml
@@ -14,8 +14,6 @@ lco:
     domain: lco.cl
 
 local:
-    host: localhost
-    port: 5432
     domain: null
 
 lore: