[SQL-CVS] SQLObject development repository branch master updated. 3.0.0a2-10-g9238f42

[Oleg Broytman <noreply@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, master has been updated
       via  9238f42a2c13ffb41f044b33f4d4c6bfb1c05c5c (commit)
       via  2c89eaee7b4d52938fb5a4d62343e538bc587c99 (commit)
       via  71b7885bc1e3740adf8c07c23b41835e1e69f8a2 (commit)
       via  c9a97f15da4963884d13e654f901b331dae7886a (commit)
       via  7827ef27ad83edb9f371c2d459020fdef9a155f1 (commit)
      from  121791d3f21fc16b93b7402f3d393bfc94b9b5e8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/9238f42a2c13ffb41f044b33f4d4c6bfb1c05c5c

commit 9238f42a2c13ffb41f044b33f4d4c6bfb1c05c5c
Merge: 121791d 2c89eae
Author: Oleg Broytman <phd@...>
Date:   Mon Jan 18 20:30:09 2016 +0300

    Merge pull request #117 from drnlm/bugs/issue-115-hashable-columns
    
    Bugs/issue 115 hashable rows


http://sourceforge.net/p/sqlobject/sqlobject/ci/2c89eaee7b4d52938fb5a4d62343e538bc587c99

commit 2c89eaee7b4d52938fb5a4d62343e538bc587c99
Author: Neil <drnlmuller+sqlobject@...>
Date:   Mon Jan 18 18:08:24 2016 +0200

    Fix __name__ typo

diff --git a/sqlobject/main.py b/sqlobject/main.py
index 6b8ac9b..38953d5 100644
--- a/sqlobject/main.py
+++ b/sqlobject/main.py
@@ -1748,7 +1748,7 @@ class SQLObject(with_metaclass(declarative.DeclarativeMeta, object)):
     def __hash__(self):
         # We hash on class name and id, since that should be
         # unique
-        return hash((self.__class__.name, self.id))
+        return hash((self.__class__.__name__, self.id))
 
     # Comparison
 

http://sourceforge.net/p/sqlobject/sqlobject/ci/71b7885bc1e3740adf8c07c23b41835e1e69f8a2

commit 71b7885bc1e3740adf8c07c23b41835e1e69f8a2
Author: Neil <drnlmuller+sqlobject@...>
Date:   Mon Jan 18 17:49:28 2016 +0200

    Fix flake8 warning in test case

diff --git a/sqlobject/tests/test_class_hash.py b/sqlobject/tests/test_class_hash.py
index 875f020..cc3b3aa 100644
--- a/sqlobject/tests/test_class_hash.py
+++ b/sqlobject/tests/test_class_hash.py
@@ -15,7 +15,6 @@ def test_class_hash():
     setupClass(ClassHashTest)
     ClassHashTest(name='bob')
 
-    conn = ClassHashTest._connection
     b = ClassHashTest.byName('bob')
     hashed = hash(b)
     b.expire()

http://sourceforge.net/p/sqlobject/sqlobject/ci/c9a97f15da4963884d13e654f901b331dae7886a

commit c9a97f15da4963884d13e654f901b331dae7886a
Author: Neil <drnlmuller+sqlobject@...>
Date:   Mon Jan 18 17:43:05 2016 +0200

    Add simple test case for hash implementation

diff --git a/sqlobject/tests/test_class_hash.py b/sqlobject/tests/test_class_hash.py
new file mode 100644
index 0000000..875f020
--- /dev/null
+++ b/sqlobject/tests/test_class_hash.py
@@ -0,0 +1,23 @@
+from sqlobject import *
+from sqlobject.tests.dbtest import *
+
+
+########################################
+# Test hashing a column instance
+########################################
+
+
+class ClassHashTest(SQLObject):
+    name = StringCol(length=50, alternateID=True, dbName='name_col')
+
+
+def test_class_hash():
+    setupClass(ClassHashTest)
+    ClassHashTest(name='bob')
+
+    conn = ClassHashTest._connection
+    b = ClassHashTest.byName('bob')
+    hashed = hash(b)
+    b.expire()
+    b = ClassHashTest.byName('bob')
+    assert hash(b) == hashed

http://sourceforge.net/p/sqlobject/sqlobject/ci/7827ef27ad83edb9f371c2d459020fdef9a155f1

commit 7827ef27ad83edb9f371c2d459020fdef9a155f1
Author: Neil <drnlmuller+sqlobject@...>
Date:   Mon Jan 18 17:34:21 2016 +0200

    Add hash function

diff --git a/sqlobject/main.py b/sqlobject/main.py
index 0a50668..6b8ac9b 100644
--- a/sqlobject/main.py
+++ b/sqlobject/main.py
@@ -1743,6 +1743,13 @@ class SQLObject(with_metaclass(declarative.DeclarativeMeta, object)):
     def tablesUsedImmediate(self):
         return [self.__class__.q]
 
+    # hash implementation
+
+    def __hash__(self):
+        # We hash on class name and id, since that should be
+        # unique
+        return hash((self.__class__.name, self.id))
+
     # Comparison
 
     def __eq__(self, other):

-----------------------------------------------------------------------

Summary of changes:
 sqlobject/main.py                  |    7 +++++++
 sqlobject/tests/test_class_hash.py |   22 ++++++++++++++++++++++
 2 files changed, 29 insertions(+), 0 deletions(-)
 create mode 100644 sqlobject/tests/test_class_hash.py


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch sphinx-docs created. 3.0.0a2-6-g14ca610

[Oleg Broytman <noreply@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, sphinx-docs has been created
        at  14ca6104a9724ee32a9308a5c38bd6c2fdcee7d5 (commit)

- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/14ca6104a9724ee32a9308a5c38bd6c2fdcee7d5

commit 14ca6104a9724ee32a9308a5c38bd6c2fdcee7d5
Author: Oleg Broytman <phd@...>
Date:   Mon Feb 16 21:56:33 2015 +0300

    Generate docs using sphinx
    
    Used sphinx-apidoc to generate split API docs.

diff --git a/docs/.gitignore b/docs/.gitignore
index 5937020..cf1f956 100644
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -1,3 +1,4 @@
 /*.html
+/_build/
 /data.db
 /html
diff --git a/docs/Makefile b/docs/Makefile
new file mode 100644
index 0000000..5188142
--- /dev/null
+++ b/docs/Makefile
@@ -0,0 +1,183 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
+BUILDDIR      = _build
+
+# User-friendly check for sphinx-build
+ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
+$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
+endif
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest coverage gettext
+
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html       to make standalone HTML files"
+	@echo "  dirhtml    to make HTML files named index.html in directories"
+	@echo "  singlehtml to make a single large HTML file"
+	@echo "  pickle     to make pickle files"
+	@echo "  json       to make JSON files"
+	@echo "  htmlhelp   to make HTML files and a HTML help project"
+	@echo "  qthelp     to make HTML files and a qthelp project"
+	@echo "  devhelp    to make HTML files and a Devhelp project"
+	@echo "  epub       to make an epub"
+	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
+	@echo "  latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
+	@echo "  text       to make text files"
+	@echo "  man        to make manual pages"
+	@echo "  texinfo    to make Texinfo files"
+	@echo "  info       to make Texinfo files and run them through makeinfo"
+	@echo "  gettext    to make PO message catalogs"
+	@echo "  changes    to make an overview of all changed/added/deprecated items"
+	@echo "  xml        to make Docutils-native XML files"
+	@echo "  pseudoxml  to make pseudoxml-XML files for display purposes"
+	@echo "  linkcheck  to check all external links for integrity"
+	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+	@echo "  coverage   to run coverage check of the documentation (if enabled)"
+
+clean:
+	rm -rf $(BUILDDIR)/*
+
+html:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+singlehtml:
+	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+	@echo
+	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+pickle:
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+json:
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/SQLObject.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/SQLObject.qhc"
+
+devhelp:
+	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+	@echo
+	@echo "Build finished."
+	@echo "To view the help file:"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/SQLObject"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/SQLObject"
+	@echo "# devhelp"
+
+epub:
+	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+	@echo
+	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+latex:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Run \`make' in that directory to run these through (pdf)latex" \
+	      "(use \`make latexpdf' here to do that automatically)."
+
+latexpdf:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through pdflatex..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+latexpdfja:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through platex and dvipdfmx..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+text:
+	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+	@echo
+	@echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+man:
+	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+	@echo
+	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+texinfo:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo
+	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
+	@echo "Run \`make' in that directory to run these through makeinfo" \
+	      "(use \`make info' here to do that automatically)."
+
+info:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo "Running Texinfo files through makeinfo..."
+	make -C $(BUILDDIR)/texinfo info
+	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
+
+gettext:
+	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
+	@echo
+	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
+
+changes:
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+	@echo
+	@echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/doctest/output.txt."
+
+coverage:
+	$(SPHINXBUILD) -b coverage $(ALLSPHINXOPTS) $(BUILDDIR)/coverage
+	@echo "Testing of coverage in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/coverage/python.txt."
+
+xml:
+	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
+	@echo
+	@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
+
+pseudoxml:
+	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
+	@echo
+	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
diff --git a/docs/api/modules.txt b/docs/api/modules.txt
new file mode 100644
index 0000000..656ed22
--- /dev/null
+++ b/docs/api/modules.txt
@@ -0,0 +1,7 @@
+sqlobject
+=========
+
+.. toctree::
+   :maxdepth: 4
+
+   sqlobject
diff --git a/docs/api/sqlobject.boundattributes.txt b/docs/api/sqlobject.boundattributes.txt
new file mode 100644
index 0000000..1518f8d
--- /dev/null
+++ b/docs/api/sqlobject.boundattributes.txt
@@ -0,0 +1,7 @@
+sqlobject.boundattributes module
+================================
+
+.. automodule:: sqlobject.boundattributes
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.cache.txt b/docs/api/sqlobject.cache.txt
new file mode 100644
index 0000000..6c74d5b
--- /dev/null
+++ b/docs/api/sqlobject.cache.txt
@@ -0,0 +1,7 @@
+sqlobject.cache module
+======================
+
+.. automodule:: sqlobject.cache
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.classregistry.txt b/docs/api/sqlobject.classregistry.txt
new file mode 100644
index 0000000..0882491
--- /dev/null
+++ b/docs/api/sqlobject.classregistry.txt
@@ -0,0 +1,7 @@
+sqlobject.classregistry module
+==============================
+
+.. automodule:: sqlobject.classregistry
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.col.txt b/docs/api/sqlobject.col.txt
new file mode 100644
index 0000000..5282fc2
--- /dev/null
+++ b/docs/api/sqlobject.col.txt
@@ -0,0 +1,7 @@
+sqlobject.col module
+====================
+
+.. automodule:: sqlobject.col
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.conftest.txt b/docs/api/sqlobject.conftest.txt
new file mode 100644
index 0000000..8e56428
--- /dev/null
+++ b/docs/api/sqlobject.conftest.txt
@@ -0,0 +1,7 @@
+sqlobject.conftest module
+=========================
+
+.. automodule:: sqlobject.conftest
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.constraints.txt b/docs/api/sqlobject.constraints.txt
new file mode 100644
index 0000000..ad39272
--- /dev/null
+++ b/docs/api/sqlobject.constraints.txt
@@ -0,0 +1,7 @@
+sqlobject.constraints module
+============================
+
+.. automodule:: sqlobject.constraints
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.converters.txt b/docs/api/sqlobject.converters.txt
new file mode 100644
index 0000000..82b5cff
--- /dev/null
+++ b/docs/api/sqlobject.converters.txt
@@ -0,0 +1,7 @@
+sqlobject.converters module
+===========================
+
+.. automodule:: sqlobject.converters
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.dbconnection.txt b/docs/api/sqlobject.dbconnection.txt
new file mode 100644
index 0000000..6a6adc3
--- /dev/null
+++ b/docs/api/sqlobject.dbconnection.txt
@@ -0,0 +1,7 @@
+sqlobject.dbconnection module
+=============================
+
+.. automodule:: sqlobject.dbconnection
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.dberrors.txt b/docs/api/sqlobject.dberrors.txt
new file mode 100644
index 0000000..3035746
--- /dev/null
+++ b/docs/api/sqlobject.dberrors.txt
@@ -0,0 +1,7 @@
+sqlobject.dberrors module
+=========================
+
+.. automodule:: sqlobject.dberrors
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.declarative.txt b/docs/api/sqlobject.declarative.txt
new file mode 100644
index 0000000..9cc7e9b
--- /dev/null
+++ b/docs/api/sqlobject.declarative.txt
@@ -0,0 +1,7 @@
+sqlobject.declarative module
+============================
+
+.. automodule:: sqlobject.declarative
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.events.txt b/docs/api/sqlobject.events.txt
new file mode 100644
index 0000000..8c33239
--- /dev/null
+++ b/docs/api/sqlobject.events.txt
@@ -0,0 +1,7 @@
+sqlobject.events module
+=======================
+
+.. automodule:: sqlobject.events
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.firebird.firebirdconnection.txt b/docs/api/sqlobject.firebird.firebirdconnection.txt
new file mode 100644
index 0000000..6fdf26e
--- /dev/null
+++ b/docs/api/sqlobject.firebird.firebirdconnection.txt
@@ -0,0 +1,7 @@
+sqlobject.firebird.firebirdconnection module
+============================================
+
+.. automodule:: sqlobject.firebird.firebirdconnection
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.firebird.txt b/docs/api/sqlobject.firebird.txt
new file mode 100644
index 0000000..78cec9a
--- /dev/null
+++ b/docs/api/sqlobject.firebird.txt
@@ -0,0 +1,15 @@
+sqlobject.firebird package
+==========================
+
+.. automodule:: sqlobject.firebird
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+
+   sqlobject.firebird.firebirdconnection
+
diff --git a/docs/api/sqlobject.include.hashcol.txt b/docs/api/sqlobject.include.hashcol.txt
new file mode 100644
index 0000000..76396aa
--- /dev/null
+++ b/docs/api/sqlobject.include.hashcol.txt
@@ -0,0 +1,7 @@
+sqlobject.include.hashcol module
+================================
+
+.. automodule:: sqlobject.include.hashcol
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.include.txt b/docs/api/sqlobject.include.txt
new file mode 100644
index 0000000..b438105
--- /dev/null
+++ b/docs/api/sqlobject.include.txt
@@ -0,0 +1,15 @@
+sqlobject.include package
+=========================
+
+.. automodule:: sqlobject.include
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+
+   sqlobject.include.hashcol
+
diff --git a/docs/api/sqlobject.index.txt b/docs/api/sqlobject.index.txt
new file mode 100644
index 0000000..bc96433
--- /dev/null
+++ b/docs/api/sqlobject.index.txt
@@ -0,0 +1,7 @@
+sqlobject.index module
+======================
+
+.. automodule:: sqlobject.index
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.inheritance.iteration.txt b/docs/api/sqlobject.inheritance.iteration.txt
new file mode 100644
index 0000000..0e9538f
--- /dev/null
+++ b/docs/api/sqlobject.inheritance.iteration.txt
@@ -0,0 +1,7 @@
+sqlobject.inheritance.iteration module
+======================================
+
+.. automodule:: sqlobject.inheritance.iteration
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.inheritance.tests.testDestroyCascade.txt b/docs/api/sqlobject.inheritance.tests.testDestroyCascade.txt
new file mode 100644
index 0000000..7dc60f6
--- /dev/null
+++ b/docs/api/sqlobject.inheritance.tests.testDestroyCascade.txt
@@ -0,0 +1,7 @@
+sqlobject.inheritance.tests.testDestroyCascade module
+=====================================================
+
+.. automodule:: sqlobject.inheritance.tests.testDestroyCascade
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.inheritance.tests.test_aggregates.txt b/docs/api/sqlobject.inheritance.tests.test_aggregates.txt
new file mode 100644
index 0000000..ee01f6b
--- /dev/null
+++ b/docs/api/sqlobject.inheritance.tests.test_aggregates.txt
@@ -0,0 +1,7 @@
+sqlobject.inheritance.tests.test_aggregates module
+==================================================
+
+.. automodule:: sqlobject.inheritance.tests.test_aggregates
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.inheritance.tests.test_asdict.txt b/docs/api/sqlobject.inheritance.tests.test_asdict.txt
new file mode 100644
index 0000000..ff95591
--- /dev/null
+++ b/docs/api/sqlobject.inheritance.tests.test_asdict.txt
@@ -0,0 +1,7 @@
+sqlobject.inheritance.tests.test_asdict module
+==============================================
+
+.. automodule:: sqlobject.inheritance.tests.test_asdict
+    :members:
+    :undoc-members:
+    :show-inheritance:
... 2045 lines suppressed ...


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch master updated. 3.0.0a2-5-g121791d

[Oleg Broytman <noreply@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, master has been updated
       via  121791d3f21fc16b93b7402f3d393bfc94b9b5e8 (commit)
      from  9b1efdfd041d535caedd8147355cf9a2168013e3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 sqlobject/tests/test_unicode.py |   77 ++++++++++++++++++++++++---------------
 1 files changed, 47 insertions(+), 30 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch master updated. 3.0.0a2-4-g9b1efdf

[Oleg Broytman <noreply@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, master has been updated
       via  9b1efdfd041d535caedd8147355cf9a2168013e3 (commit)
       via  2b1ae788855c3719daa69ed655c0392d1b4ecc9a (commit)
       via  2c6291cb3941e561590c633b5822fc1a72da4333 (commit)
       via  06decd29a52483cee0dffd44b8d2457da28d51c9 (commit)
      from  a034697c25b17b1d165fea66162f32f50235882f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/9b1efdfd041d535caedd8147355cf9a2168013e3

commit 9b1efdfd041d535caedd8147355cf9a2168013e3
Merge: a034697 2b1ae78
Author: Oleg Broytman <phd@...>
Date:   Mon Dec 28 18:44:34 2015 +0300

    Merge branch '2.2'

diff --cc sqlobject/include/hashcol.py
index b4f1383,fa00dd5..e36b980
--- a/sqlobject/include/hashcol.py
+++ b/sqlobject/include/hashcol.py
@@@ -91,14 -49,13 +91,14 @@@ class SOHashCol(sqlobject.col.SOStringC
          else:
              self.hashMethod = kw['hashMethod']
              del kw['hashMethod']
-         super(sqlobject.col.SOStringCol, self).__init__(**kw)
 -        super( SOHashCol, self ).__init__( **kw )
++        super(SOHashCol, self).__init__(**kw)
 +
 +    def createValidators(self):
 +        return [HashValidator(name=self.name, hashMethod=self.hashMethod)] + \
 +            super(SOHashCol, self).createValidators()
  
 -    def createValidators( self ):
 -        return [HashValidator( name=self.name, hashMethod=self.hashMethod )] + \
 -            super( SOHashCol, self ).createValidators()
  
 -class HashCol( sqlobject.col.StringCol ):
 +class HashCol(sqlobject.col.StringCol):
      """ End-user HashCol class. May be instantiated with 'hashMethod', a function
      which returns the string hash of any other string (i.e. basestring). """
  

-----------------------------------------------------------------------

Summary of changes:
 docs/News.txt                |    2 ++
 sqlobject/include/hashcol.py |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch 2.2 updated. 2.2.0b2-3-g2b1ae78

[Oleg Broytman <noreply@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, 2.2 has been updated
       via  2b1ae788855c3719daa69ed655c0392d1b4ecc9a (commit)
       via  2c6291cb3941e561590c633b5822fc1a72da4333 (commit)
       via  06decd29a52483cee0dffd44b8d2457da28d51c9 (commit)
      from  925a55bb33ad1099ec567a722b3028d0faf746f8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 docs/News.txt                |    2 ++
 sqlobject/include/hashcol.py |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch 1.7 updated. 1.7.5-10-g2c6291c

[Oleg Broytman <noreply@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, 1.7 has been updated
       via  2c6291cb3941e561590c633b5822fc1a72da4333 (commit)
       via  06decd29a52483cee0dffd44b8d2457da28d51c9 (commit)
      from  d619a21ddf9058463908f67a8b41f61eaccf1ed4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 docs/News.txt                |    2 ++
 sqlobject/include/hashcol.py |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch 1.6 updated. 1.6.6-4-g06decd2

[Oleg Broytman <noreply@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, 1.6 has been updated
       via  06decd29a52483cee0dffd44b8d2457da28d51c9 (commit)
      from  098e954915ce40bd4730645be1a0688c769e4b34 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 docs/News.txt                |    2 ++
 sqlobject/include/hashcol.py |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository annotated tag 3.0.0a2 created. 3.0.0a2

[Oleg Broytman <noreply@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The annotated tag, 3.0.0a2 has been created
        at  41885cf15d83fb6f4db21e6b2fa5e4dcf02fb4a4 (tag)
   tagging  a034697c25b17b1d165fea66162f32f50235882f (commit)
  replaces  3.0.0a1
 tagged by  Oleg Broytman
        on  Thu Dec 24 22:51:07 2015 +0300

- Log -----------------------------------------------------------------
Release 3.0.0a2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAABCgAGBQJWfEyrAAoJEG4IC3C2KHsDcpcQAKqQk95NomAnMjhuHY63wqr/
m76tT21P5DbfqHpC3awqAmPTr9Xp4q2KvkfQe5WXZyK8Gz5Q+Tk8ppI6bHqJaTbd
a+m39OtALVyiK+TGIbzYPU4+ZQ5I10aI1cl/i+2lkrKdrq33AyxAlUFTY6qz4m79
Tesuiq8HQVmRj5xOtzQFJ1W6oqypSLGvtCxz3LLJqznDCbKvKzRGy2YVsJ7lxhjN
3G6X6TC2xT3BjEmR8SSQXCOfm1pNMHTjx+G84Kid9z8tw/XNBd40aGdnSvL6FhVI
1rY3nBBZeQepfDFzqO70l+SmkzbSM+qrEbEJfjdvvYZDFq/Xlsy7/DyHZRi2uhoO
SLC2dFz3CtDP5lAWcdPk8bhNYG6l1kLecqhotznou11RkbzlSSBsQQExU41YmqNr
neuq7yGeKk8Vqow9EXbJLVw2okR71+YKr+Fe7XCNzuI/9KjIH5BKeQ+nc3/X69iN
tPVDjb/lD5seu5L7/QDJ4oAmWNJA5gu4kbYrE0VnRfrekGSNq4kL2EOJOAIQsq/u
wXtk5sVjgdVldT2pJEPBR8OloVhmoTolLnVJrHI+M2wUazKEogmxVC/Bp3g9haff
lypwfE3PstgRPCEHcAQPfyHWuY430HAzOh/5nIHPIGiX/hMAVBhEg6AN4wYEjF7a
G22ah6+ZGj5EPeGVUgud
=VBsP
-----END PGP SIGNATURE-----

Oleg Broytman (32):
      Document MSSQL server versions
      Merge branch '1.6' into 1.7
      Merge branch '1.7' into 2.1
      For MSSQL use datetime2(6) and time(6) columns
      Branch 2.2
      Merge branch '2.1'
      Null-merge branch 2.2
      Extend error message
      Fix a bug: mxDateTime doesn't support microseconds
      Add function col.use_microseconds(True/False)
      Structure news
      Merge branch '2.2'
      Release 2.2.0b1
      Merge branch '2.2'
      Speedup SQLite connections in tests
      Merge branch '1.6' into 1.7
      Update News.txt
      Merge branch '1.7' into 2.2
      Update News.txt
      Merge branch '2.2'
      Update News.txt
      Fix a flake8 warning
      Fix ForeignKey column type
      Add a helper to test mutually referencing tables
      Add ForeignKeyValidator
      Update docs
      Merge branch '2.2'
      Update docs
      Do not allow failures
      Release 2.2.0b2
      Null-merge branch '2.2'
      Release 3.0.0a2

-----------------------------------------------------------------------


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository annotated tag 2.2.0b2 created. 2.2.0b2

[Oleg Broytman <noreply@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The annotated tag, 2.2.0b2 has been created
        at  d1ccbb3eacfbb3292a8a961c7567a808e6978292 (tag)
   tagging  925a55bb33ad1099ec567a722b3028d0faf746f8 (commit)
  replaces  2.2.0b1
 tagged by  Oleg Broytman
        on  Thu Dec 24 22:44:34 2015 +0300

- Log -----------------------------------------------------------------
Release 2.2.0b2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAABCgAGBQJWfEsiAAoJEG4IC3C2KHsDG+oP/20d+yfzQIbUIjStN4eWUzWQ
xY2fcKt/iyRnzPxHD8SmmV1kEzKxCo66evoTftVF/UI83Y3sN5SFpZjxYVOeDqDh
16ftPN+hwp+5p75Q6D2zC3CYUmuSmdBDNSxLQ1tvu/ApU8N9WbTHJkp19WMjMG/W
2zgWSFrDS59dkXn7R6B9k5ak4goBMlUFDwdhR8rvYAVl2MeIESzNRubUsGy9YbCV
G/9M3glt3jpNqt6Uu/h4fN5+nYWac+WRVikjJ07w+5np3C+3dxDGJ2LnKbhhCOYv
rIQF/eC86nyb643+VXfnhN1A8NeTyaVFwyoPc13GUUcwPGjVD2vzLhkq3gWksEiN
pPbesTqohHxKgEPssQyekKU1wumjyenprAQXA8UZTOErfJKwVUsk/ifxTZ6vT4DL
2u86iAQ/uepr9oDYifWreuh2e6W1PuXH5F8hzPwcZilq8YBka4elvSnY3QTYf4S5
YKhZbBTM1NP8tiZtuQFzjsMS+HNAjUyLRCCuFeSAcxtVLjc27WOgWckkQnXLZjfw
AQLdChwg7NtgfkwwNyy9S04OEBF6CJSXoxHOpzk5083PDbJBSFPj/A1PfU5ttLXE
TYCsr0mRyN0ll6OVxo15JDO9qX1YU9hya1WxBWjoH3asD7auOVluQGDWjdcXcf65
vcIZbFRyt7R/48LzvcOB
=NZ4l
-----END PGP SIGNATURE-----

Oleg Broytman (10):
      Speedup SQLite connections in tests
      Merge branch '1.6' into 1.7
      Update News.txt
      Merge branch '1.7' into 2.2
      Update News.txt
      Fix ForeignKey column type
      Add a helper to test mutually referencing tables
      Add ForeignKeyValidator
      Update docs
      Release 2.2.0b2

-----------------------------------------------------------------------


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch master updated. 3.0.0a2

[Oleg Broytman <noreply@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, master has been updated
       via  a034697c25b17b1d165fea66162f32f50235882f (commit)
       via  4cdbbda4f41562ab6d7172232cea99d19a88bec2 (commit)
       via  925a55bb33ad1099ec567a722b3028d0faf746f8 (commit)
       via  414e326c61c715d9db3ff3fdf49742f2909cb6eb (commit)
       via  fa7f2d8ee36fb86e25a7cc8dabbea9ea569dcb2b (commit)
       via  0e95c3bb1454ad593e4f71c7e6143496ea0884e2 (commit)
       via  ceba96dac3a68e6231947adfeea7ab5886d50295 (commit)
       via  038679d11db5425f328852c8da98bf82c100c249 (commit)
       via  3f3a7cefe899534b3ebe67cd93bbbdc358ab4316 (commit)
       via  6dd8296d5c7c3925a03d2eb3efd4c12ded1e13f1 (commit)
      from  f031a362564a27da8523eb749c5e7e5f7cedaae4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/a034697c25b17b1d165fea66162f32f50235882f

commit a034697c25b17b1d165fea66162f32f50235882f
Author: Oleg Broytman <phd@...>
Date:   Thu Dec 24 22:50:22 2015 +0300

    Release 3.0.0a2

diff --git a/README.txt b/README.txt
index f619d90..dabed60 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-SQLObject 3.0.0a1
+SQLObject 3.0.0a2
 =================
 
 Thanks for looking at SQLObject.  SQLObject is an object-relational
diff --git a/setup.py b/setup.py
index dfe945e..b532d22 100755
--- a/setup.py
+++ b/setup.py
@@ -82,7 +82,7 @@ and `GitHub <https://github.com/sqlobject>`_.
       maintainer_email="phd@...",
       url="http://sqlobject.org/devel/";,
       download_url="https://pypi.python.org/pypi/SQLObject/";
-          "%sdev-20150327" % version,
+          "%sdev-20151224" % version,
       license="LGPL",
       packages=["sqlobject"] +
           ['sqlobject.%s' % package for package in subpackages],
diff --git a/sqlobject/__version__.py b/sqlobject/__version__.py
index 4df07a7..05e6604 100644
--- a/sqlobject/__version__.py
+++ b/sqlobject/__version__.py
@@ -1,8 +1,8 @@
 
-version = '3.0.0a1'
+version = '3.0.0a2'
 major = 3
 minor = 0
 micro = 0
 release_level = 'alpha'
-serial = 1
+serial = 2
 version_info = (major, minor, micro, release_level, serial)

http://sourceforge.net/p/sqlobject/sqlobject/ci/4cdbbda4f41562ab6d7172232cea99d19a88bec2

commit 4cdbbda4f41562ab6d7172232cea99d19a88bec2
Merge: 414e326 925a55b
Author: Oleg Broytman <phd@...>
Date:   Thu Dec 24 22:44:06 2015 +0300

    Null-merge branch '2.2'


http://sourceforge.net/p/sqlobject/sqlobject/ci/414e326c61c715d9db3ff3fdf49742f2909cb6eb

commit 414e326c61c715d9db3ff3fdf49742f2909cb6eb
Author: Oleg Broytman <phd@...>
Date:   Thu Dec 24 19:46:05 2015 +0300

    Do not allow failures

diff --git a/.travis.yml b/.travis.yml
index 92ecc8f..9b7db21 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,10 +17,5 @@ install: pip install tox
 
 matrix:
   fast_finish: true
-  allow_failures:
-    - env: TOXENV=py34-sqlite
-    - env: TOXENV=py34-postgres
-    - env: TOXENV=py34-mysqlclient
-    - env: TOXENV=py34-flake8
 
 script: tox -e ${TOXENV}

http://sourceforge.net/p/sqlobject/sqlobject/ci/fa7f2d8ee36fb86e25a7cc8dabbea9ea569dcb2b

commit fa7f2d8ee36fb86e25a7cc8dabbea9ea569dcb2b
Author: Oleg Broytman <phd@...>
Date:   Thu Dec 24 19:40:56 2015 +0300

    Update docs
    
    [skip ci]

diff --git a/docs/News.txt b/docs/News.txt
index e33eca0..cdccde9 100644
--- a/docs/News.txt
+++ b/docs/News.txt
@@ -16,6 +16,9 @@ Features
 * Support for Python 2 and Python 3 with one codebase!
   (Python version >= 3.4 currently required.)
 
+* Columns for ForeignKey are created using idType of the referenced
+  table -- merged from `SQLObject 2.2.0`_.
+
 Minor features
 --------------
 
@@ -41,6 +44,9 @@ Tests
 
 * Speedup SQLite connections in tests -- merged from `SQLObject 2.2.0`_.
 
+* Added new test helper setupCyclicClasses to setup classes with mutual
+  references -- merged from `SQLObject 2.2.0`_.
+
 SQLObject 2.2.0
 ===============
 

http://sourceforge.net/p/sqlobject/sqlobject/ci/0e95c3bb1454ad593e4f71c7e6143496ea0884e2

commit 0e95c3bb1454ad593e4f71c7e6143496ea0884e2
Merge: f031a36 ceba96d
Author: Oleg Broytman <phd@...>
Date:   Thu Dec 24 19:32:00 2015 +0300

    Merge branch '2.2'

diff --cc docs/Authors.txt
index 91b7301,dbb648c..d52dc92
--- a/docs/Authors.txt
+++ b/docs/Authors.txt
@@@ -30,8 -30,8 +30,9 @@@ Contributions have been made by
  * Andrew Ziem <ahz001 at gmail.com>
  * Andrew Trusty <atrusty at gatech.edu>
  * Ian Cordasco <graffatcolmingov at gmail.com>
 +* Lukasz Dobrzanski <lukasz.m.dobrzanski at gmail.com>
  * Gregor Horvath <gh at gregor-horvath.com>
+ * Nathan Edwards <nje5 at georgetown.edu>
  * Oleg Broytman <phd@...>
  
  .. image:: http://sflogo.sourceforge.net/sflogo.php?group_id=74338&type=10
diff --cc sqlobject/col.py
index 2b2ed29,794532f..bc57813
--- a/sqlobject/col.py
+++ b/sqlobject/col.py
@@@ -889,14 -830,39 +892,42 @@@ class SOKeyCol(SOCol)
  
      def _mssqlType(self):
          key_type = {int: "INT NULL", str: "TEXT"}
-         return key_type[self.soClass.sqlmeta.idType]
+         return key_type[self._idType()]
  
 +
  class KeyCol(Col):
  
      baseClass = SOKeyCol
  
 +
+ class ForeignKeyValidator(SOValidator):
+ 
+     def __init__(self, *args, **kw):
+         super(ForeignKeyValidator, self).__init__(*args, **kw)
+         self.fkIDType = None
+ 
+     def from_python(self, value, state):
+         if value is None:
+             return None
+         # Avoid importing the main module
+         # to get the SQLObject class for isinstance
+         if hasattr(value, 'sqlmeta'):
+             return value
+         if self.fkIDType is None:
+             otherTable = findClass(self.soCol.foreignKey,
+                                    self.soCol.soClass.sqlmeta.registry)
+             self.fkIDType = otherTable.sqlmeta.idType
+         try:
+             value = self.fkIDType(value)
+             return value
+         except (ValueError, TypeError):
+             pass
+         raise validators.Invalid("expected a %r for the ForeignKey '%s', "
+                                  "got %s %r instead" %
+                                  (self.fkIDType, self.name,
+                                   type(value), value), value, state)
+ 
++
  class SOForeignKey(SOKeyCol):
  
      def __init__(self, **kw):
@@@ -906,10 -872,17 +937,18 @@@
              kw['origName'] = kw['name']
              kw['name'] = style.instanceAttrToIDAttr(kw['name'])
          else:
 -            kw['name'] = style.instanceAttrToIDAttr(style.pythonClassToAttr(foreignKey))
 +            kw['name'] = style.instanceAttrToIDAttr(
 +                style.pythonClassToAttr(foreignKey))
          super(SOForeignKey, self).__init__(**kw)
  
+     def createValidators(self):
+         return [ForeignKeyValidator(name=self.name)] + \
+             super(SOForeignKey, self).createValidators()
+ 
+     def _idType(self):
+         other = findClass(self.foreignKey, self.soClass.sqlmeta.registry)
+         return other.sqlmeta.idType
+ 
      def sqliteCreateSQL(self):
          sql = SOKeyCol.sqliteCreateSQL(self)
          other = findClass(self.foreignKey, self.soClass.sqlmeta.registry)
diff --cc sqlobject/tests/dbtest.py
index 2778db7,1473e7b..6a5027e
--- a/sqlobject/tests/dbtest.py
+++ b/sqlobject/tests/dbtest.py
@@@ -5,8 -4,9 +5,8 @@@ from __future__ import print_functio
  
  import logging
  import os
 -import re
  import sys
- from py.test import raises
+ from py.test import raises, skip
  import sqlobject
  import sqlobject.conftest as conftest
  
@@@ -330,7 -320,23 +330,24 @@@ def setupLogging()
      logger = logging.getLogger()
      logger.addHandler(hdlr)
  
++
+ def setupCyclicClasses(*classes):
+     if not supports('dropTableCascade'):
+         skip("dropTableCascade isn't supported")
+     conn = getConnection()
+     for soClass in classes:
+         soClass.setConnection(conn)
+         soClass.dropTable(ifExists=True, cascade=True)
+ 
+     constraints = []
+     for soClass in classes:
+         constraints += soClass.createTable(ifNotExists=True,
+                                            applyConstraints=False)
+     for constraint in constraints:
+         conn.query(constraint)
+ 
 -__all__ = ['getConnection', 'getConnectionURI', 'setupClass', 'Dummy', 'raises',
 -           'inserts', 'supports', 'deprecated_module',
 -           'setup_module', 'teardown_module', 'setupLogging',
 -           'setupCyclicClasses',
++
 +__all__ = ['Dummy', 'deprecated_module', 'getConnection', 'getConnectionURI',
-            'inserts', 'raises', 'setupClass', 'setupLogging', 'setup_module',
-            'supports', 'teardown_module',
++           'inserts', 'raises', 'setupClass', 'setupCyclicClasses',
++           'setupLogging', 'setup_module', 'supports', 'teardown_module',
             ]
diff --cc sqlobject/tests/test_ForeignKey.py
index a7659b4,30c4127..2168c41
--- a/sqlobject/tests/test_ForeignKey.py
+++ b/sqlobject/tests/test_ForeignKey.py
@@@ -93,3 -85,35 +94,39 @@@ def test_otherColumn()
      getConnection().cache.clear()
      assert test_fkey.key1 == test_composer1
      assert test_other.key2 == test_composer2
+ 
++
+ class TestFKValidationA(SQLObject):
+     name = StringCol()
+     bfk = ForeignKey("TestFKValidationB")
+     cfk = ForeignKey("TestFKValidationC", default=None)
+ 
++
+ class TestFKValidationB(SQLObject):
+     name = StringCol()
+     afk = ForeignKey("TestFKValidationA")
+ 
++
+ class TestFKValidationC(SQLObject):
+     class sqlmeta:
+         idType = str
+     name = StringCol()
+ 
++
+ def test_foreignkey_validation():
+     setupCyclicClasses(TestFKValidationA, TestFKValidationB, TestFKValidationC)
+     a = TestFKValidationA(name="testa", bfk=None)
+     b = TestFKValidationB(name="testb", afk=a)
+     c = TestFKValidationC(id='testc', name="testc")
+     a.bfk = b
+     a.cfk = c
+     assert a.bfk == b
+     assert a.cfk == c
+     assert b.afk == a
+ 
+     raises(validators.Invalid,
+            TestFKValidationA, name="testa", bfk='testb', cfk='testc')
+ 
+     a = TestFKValidationA(name="testa", bfk=1, cfk='testc')
+     assert a.bfkID == 1
+     assert a.cfkID == 'testc'

-----------------------------------------------------------------------

Summary of changes:
 .travis.yml                        |    5 ----
 README.txt                         |    2 +-
 docs/Authors.txt                   |    1 +
 docs/News.txt                      |   12 +++++++++
 setup.py                           |    2 +-
 sqlobject/__version__.py           |    4 +-
 sqlobject/col.py                   |   45 +++++++++++++++++++++++++++++++++--
 sqlobject/tests/dbtest.py          |   23 ++++++++++++++++--
 sqlobject/tests/test_ForeignKey.py |   37 +++++++++++++++++++++++++++++
 9 files changed, 116 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch 2.2 updated. 2.2.0b2

[Oleg Broytman <noreply@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, 2.2 has been updated
       via  925a55bb33ad1099ec567a722b3028d0faf746f8 (commit)
       via  ceba96dac3a68e6231947adfeea7ab5886d50295 (commit)
       via  038679d11db5425f328852c8da98bf82c100c249 (commit)
       via  3f3a7cefe899534b3ebe67cd93bbbdc358ab4316 (commit)
       via  6dd8296d5c7c3925a03d2eb3efd4c12ded1e13f1 (commit)
      from  f7e8320dff038cec043fbe0b516125e5413a1568 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 README.txt                         |    2 +-
 docs/Authors.txt                   |    1 +
 docs/News.txt                      |    6 +++++
 setup.py                           |    2 +-
 sqlobject/__version__.py           |    4 +-
 sqlobject/col.py                   |   44 +++++++++++++++++++++++++++++++++--
 sqlobject/tests/dbtest.py          |   21 +++++++++++++++-
 sqlobject/tests/test_ForeignKey.py |   33 +++++++++++++++++++++++++++
 8 files changed, 104 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch sphinx-docs deleted. 3.0.0a1-23-ga4bff12

[Oleg Broytman <noreply@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, sphinx-docs has been deleted
       was  a4bff128db859869c77ca50789cb9c9bfe5dc76f

- Log -----------------------------------------------------------------
a4bff128db859869c77ca50789cb9c9bfe5dc76f Generate docs using sphinx
-----------------------------------------------------------------------


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch master updated. 3.0.0a1-22-gf031a36

[Oleg Broytman <noreply@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, master has been updated
       via  f031a362564a27da8523eb749c5e7e5f7cedaae4 (commit)
      from  5c542af37b33efdf56c17f6c5c6ad2c272388943 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/f031a362564a27da8523eb749c5e7e5f7cedaae4

commit f031a362564a27da8523eb749c5e7e5f7cedaae4
Author: Oleg Broytman <phd@...>
Date:   Thu Jul 23 04:17:06 2015 +0300

    Fix a flake8 warning

diff --git a/sqlobject/tests/dbtest.py b/sqlobject/tests/dbtest.py
index df8fded..2778db7 100644
--- a/sqlobject/tests/dbtest.py
+++ b/sqlobject/tests/dbtest.py
@@ -78,6 +78,7 @@ def setupClass(soClasses, force=False):
     installOrClear(soClasses, force=force)
     return soClasses
 
+
 def speedupSQLiteConnection(connection):
     connection.query("PRAGMA synchronous=OFF")
     connection.query("PRAGMA count_changes=OFF")

-----------------------------------------------------------------------

Summary of changes:
 sqlobject/tests/dbtest.py |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch sphinx-docs created. 3.0.0a1-23-ga4bff12

[Oleg Broytman <noreply@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, sphinx-docs has been created
        at  a4bff128db859869c77ca50789cb9c9bfe5dc76f (commit)

- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/a4bff128db859869c77ca50789cb9c9bfe5dc76f

commit a4bff128db859869c77ca50789cb9c9bfe5dc76f
Author: Oleg Broytman <phd@...>
Date:   Mon Feb 16 21:56:33 2015 +0300

    Generate docs using sphinx
    
    Used sphinx-apidoc to generate split API docs.

diff --git a/docs/.gitignore b/docs/.gitignore
index 5937020..cf1f956 100644
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -1,3 +1,4 @@
 /*.html
+/_build/
 /data.db
 /html
diff --git a/docs/Makefile b/docs/Makefile
new file mode 100644
index 0000000..5188142
--- /dev/null
+++ b/docs/Makefile
@@ -0,0 +1,183 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
+BUILDDIR      = _build
+
+# User-friendly check for sphinx-build
+ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
+$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
+endif
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest coverage gettext
+
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html       to make standalone HTML files"
+	@echo "  dirhtml    to make HTML files named index.html in directories"
+	@echo "  singlehtml to make a single large HTML file"
+	@echo "  pickle     to make pickle files"
+	@echo "  json       to make JSON files"
+	@echo "  htmlhelp   to make HTML files and a HTML help project"
+	@echo "  qthelp     to make HTML files and a qthelp project"
+	@echo "  devhelp    to make HTML files and a Devhelp project"
+	@echo "  epub       to make an epub"
+	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
+	@echo "  latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
+	@echo "  text       to make text files"
+	@echo "  man        to make manual pages"
+	@echo "  texinfo    to make Texinfo files"
+	@echo "  info       to make Texinfo files and run them through makeinfo"
+	@echo "  gettext    to make PO message catalogs"
+	@echo "  changes    to make an overview of all changed/added/deprecated items"
+	@echo "  xml        to make Docutils-native XML files"
+	@echo "  pseudoxml  to make pseudoxml-XML files for display purposes"
+	@echo "  linkcheck  to check all external links for integrity"
+	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+	@echo "  coverage   to run coverage check of the documentation (if enabled)"
+
+clean:
+	rm -rf $(BUILDDIR)/*
+
+html:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+singlehtml:
+	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+	@echo
+	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+pickle:
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+json:
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/SQLObject.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/SQLObject.qhc"
+
+devhelp:
+	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+	@echo
+	@echo "Build finished."
+	@echo "To view the help file:"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/SQLObject"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/SQLObject"
+	@echo "# devhelp"
+
+epub:
+	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+	@echo
+	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+latex:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Run \`make' in that directory to run these through (pdf)latex" \
+	      "(use \`make latexpdf' here to do that automatically)."
+
+latexpdf:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through pdflatex..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+latexpdfja:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through platex and dvipdfmx..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+text:
+	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+	@echo
+	@echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+man:
+	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+	@echo
+	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+texinfo:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo
+	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
+	@echo "Run \`make' in that directory to run these through makeinfo" \
+	      "(use \`make info' here to do that automatically)."
+
+info:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo "Running Texinfo files through makeinfo..."
+	make -C $(BUILDDIR)/texinfo info
+	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
+
+gettext:
+	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
+	@echo
+	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
+
+changes:
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+	@echo
+	@echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/doctest/output.txt."
+
+coverage:
+	$(SPHINXBUILD) -b coverage $(ALLSPHINXOPTS) $(BUILDDIR)/coverage
+	@echo "Testing of coverage in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/coverage/python.txt."
+
+xml:
+	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
+	@echo
+	@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
+
+pseudoxml:
+	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
+	@echo
+	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
diff --git a/docs/api/modules.txt b/docs/api/modules.txt
new file mode 100644
index 0000000..656ed22
--- /dev/null
+++ b/docs/api/modules.txt
@@ -0,0 +1,7 @@
+sqlobject
+=========
+
+.. toctree::
+   :maxdepth: 4
+
+   sqlobject
diff --git a/docs/api/sqlobject.boundattributes.txt b/docs/api/sqlobject.boundattributes.txt
new file mode 100644
index 0000000..1518f8d
--- /dev/null
+++ b/docs/api/sqlobject.boundattributes.txt
@@ -0,0 +1,7 @@
+sqlobject.boundattributes module
+================================
+
+.. automodule:: sqlobject.boundattributes
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.cache.txt b/docs/api/sqlobject.cache.txt
new file mode 100644
index 0000000..6c74d5b
--- /dev/null
+++ b/docs/api/sqlobject.cache.txt
@@ -0,0 +1,7 @@
+sqlobject.cache module
+======================
+
+.. automodule:: sqlobject.cache
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.classregistry.txt b/docs/api/sqlobject.classregistry.txt
new file mode 100644
index 0000000..0882491
--- /dev/null
+++ b/docs/api/sqlobject.classregistry.txt
@@ -0,0 +1,7 @@
+sqlobject.classregistry module
+==============================
+
+.. automodule:: sqlobject.classregistry
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.col.txt b/docs/api/sqlobject.col.txt
new file mode 100644
index 0000000..5282fc2
--- /dev/null
+++ b/docs/api/sqlobject.col.txt
@@ -0,0 +1,7 @@
+sqlobject.col module
+====================
+
+.. automodule:: sqlobject.col
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.conftest.txt b/docs/api/sqlobject.conftest.txt
new file mode 100644
index 0000000..8e56428
--- /dev/null
+++ b/docs/api/sqlobject.conftest.txt
@@ -0,0 +1,7 @@
+sqlobject.conftest module
+=========================
+
+.. automodule:: sqlobject.conftest
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.constraints.txt b/docs/api/sqlobject.constraints.txt
new file mode 100644
index 0000000..ad39272
--- /dev/null
+++ b/docs/api/sqlobject.constraints.txt
@@ -0,0 +1,7 @@
+sqlobject.constraints module
+============================
+
+.. automodule:: sqlobject.constraints
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.converters.txt b/docs/api/sqlobject.converters.txt
new file mode 100644
index 0000000..82b5cff
--- /dev/null
+++ b/docs/api/sqlobject.converters.txt
@@ -0,0 +1,7 @@
+sqlobject.converters module
+===========================
+
+.. automodule:: sqlobject.converters
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.dbconnection.txt b/docs/api/sqlobject.dbconnection.txt
new file mode 100644
index 0000000..6a6adc3
--- /dev/null
+++ b/docs/api/sqlobject.dbconnection.txt
@@ -0,0 +1,7 @@
+sqlobject.dbconnection module
+=============================
+
+.. automodule:: sqlobject.dbconnection
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.dberrors.txt b/docs/api/sqlobject.dberrors.txt
new file mode 100644
index 0000000..3035746
--- /dev/null
+++ b/docs/api/sqlobject.dberrors.txt
@@ -0,0 +1,7 @@
+sqlobject.dberrors module
+=========================
+
+.. automodule:: sqlobject.dberrors
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.declarative.txt b/docs/api/sqlobject.declarative.txt
new file mode 100644
index 0000000..9cc7e9b
--- /dev/null
+++ b/docs/api/sqlobject.declarative.txt
@@ -0,0 +1,7 @@
+sqlobject.declarative module
+============================
+
+.. automodule:: sqlobject.declarative
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.events.txt b/docs/api/sqlobject.events.txt
new file mode 100644
index 0000000..8c33239
--- /dev/null
+++ b/docs/api/sqlobject.events.txt
@@ -0,0 +1,7 @@
+sqlobject.events module
+=======================
+
+.. automodule:: sqlobject.events
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.firebird.firebirdconnection.txt b/docs/api/sqlobject.firebird.firebirdconnection.txt
new file mode 100644
index 0000000..6fdf26e
--- /dev/null
+++ b/docs/api/sqlobject.firebird.firebirdconnection.txt
@@ -0,0 +1,7 @@
+sqlobject.firebird.firebirdconnection module
+============================================
+
+.. automodule:: sqlobject.firebird.firebirdconnection
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.firebird.txt b/docs/api/sqlobject.firebird.txt
new file mode 100644
index 0000000..78cec9a
--- /dev/null
+++ b/docs/api/sqlobject.firebird.txt
@@ -0,0 +1,15 @@
+sqlobject.firebird package
+==========================
+
+.. automodule:: sqlobject.firebird
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+
+   sqlobject.firebird.firebirdconnection
+
diff --git a/docs/api/sqlobject.include.hashcol.txt b/docs/api/sqlobject.include.hashcol.txt
new file mode 100644
index 0000000..76396aa
--- /dev/null
+++ b/docs/api/sqlobject.include.hashcol.txt
@@ -0,0 +1,7 @@
+sqlobject.include.hashcol module
+================================
+
+.. automodule:: sqlobject.include.hashcol
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.include.txt b/docs/api/sqlobject.include.txt
new file mode 100644
index 0000000..b438105
--- /dev/null
+++ b/docs/api/sqlobject.include.txt
@@ -0,0 +1,15 @@
+sqlobject.include package
+=========================
+
+.. automodule:: sqlobject.include
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+
+   sqlobject.include.hashcol
+
diff --git a/docs/api/sqlobject.index.txt b/docs/api/sqlobject.index.txt
new file mode 100644
index 0000000..bc96433
--- /dev/null
+++ b/docs/api/sqlobject.index.txt
@@ -0,0 +1,7 @@
+sqlobject.index module
+======================
+
+.. automodule:: sqlobject.index
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.inheritance.iteration.txt b/docs/api/sqlobject.inheritance.iteration.txt
new file mode 100644
index 0000000..0e9538f
--- /dev/null
+++ b/docs/api/sqlobject.inheritance.iteration.txt
@@ -0,0 +1,7 @@
+sqlobject.inheritance.iteration module
+======================================
+
+.. automodule:: sqlobject.inheritance.iteration
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.inheritance.tests.testDestroyCascade.txt b/docs/api/sqlobject.inheritance.tests.testDestroyCascade.txt
new file mode 100644
index 0000000..7dc60f6
--- /dev/null
+++ b/docs/api/sqlobject.inheritance.tests.testDestroyCascade.txt
@@ -0,0 +1,7 @@
+sqlobject.inheritance.tests.testDestroyCascade module
+=====================================================
+
+.. automodule:: sqlobject.inheritance.tests.testDestroyCascade
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.inheritance.tests.test_aggregates.txt b/docs/api/sqlobject.inheritance.tests.test_aggregates.txt
new file mode 100644
index 0000000..ee01f6b
--- /dev/null
+++ b/docs/api/sqlobject.inheritance.tests.test_aggregates.txt
@@ -0,0 +1,7 @@
+sqlobject.inheritance.tests.test_aggregates module
+==================================================
+
+.. automodule:: sqlobject.inheritance.tests.test_aggregates
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.inheritance.tests.test_asdict.txt b/docs/api/sqlobject.inheritance.tests.test_asdict.txt
new file mode 100644
index 0000000..ff95591
--- /dev/null
+++ b/docs/api/sqlobject.inheritance.tests.test_asdict.txt
@@ -0,0 +1,7 @@
+sqlobject.inheritance.tests.test_asdict module
+==============================================
+
+.. automodule:: sqlobject.inheritance.tests.test_asdict
+    :members:
+    :undoc-members:
+    :show-inheritance:
... 2067 lines suppressed ...


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch master updated. 3.0.0a1-21-g5c542af

[Oleg Broytman <noreply@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, master has been updated
       via  5c542af37b33efdf56c17f6c5c6ad2c272388943 (commit)
       via  6e75c5fc534f640d6a6f66c612dc19ebea34c03d (commit)
       via  f7e8320dff038cec043fbe0b516125e5413a1568 (commit)
       via  f0b610795db1e630d03c65dac05201665ee62b23 (commit)
       via  d619a21ddf9058463908f67a8b41f61eaccf1ed4 (commit)
       via  c1232694ef26e703c5e205f0dd0343c729713dfd (commit)
       via  098e954915ce40bd4730645be1a0688c769e4b34 (commit)
      from  d13754ed83f887b4ca45d0867aa3c04bbacde8e5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 docs/News.txt             |   20 ++++++++++++++++++++
 sqlobject/tests/dbtest.py |   10 ++++++++++
 2 files changed, 30 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch 2.2 updated. 2.2.0b1-5-gf7e8320

[Oleg Broytman <noreply@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, 2.2 has been updated
       via  f7e8320dff038cec043fbe0b516125e5413a1568 (commit)
       via  f0b610795db1e630d03c65dac05201665ee62b23 (commit)
       via  d619a21ddf9058463908f67a8b41f61eaccf1ed4 (commit)
       via  c1232694ef26e703c5e205f0dd0343c729713dfd (commit)
       via  098e954915ce40bd4730645be1a0688c769e4b34 (commit)
      from  68cbedc8010b3e0d2cab44b449f6e9a2dfea39c5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 docs/News.txt             |   13 +++++++++++++
 sqlobject/tests/dbtest.py |   10 ++++++++++
 2 files changed, 23 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch 1.7 updated. 1.7.5-8-gd619a21

[Oleg Broytman <noreply@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, 1.7 has been updated
       via  d619a21ddf9058463908f67a8b41f61eaccf1ed4 (commit)
       via  c1232694ef26e703c5e205f0dd0343c729713dfd (commit)
       via  098e954915ce40bd4730645be1a0688c769e4b34 (commit)
      from  62c12c3c36164a981ee1430a66e285048d2d0d78 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 docs/News.txt             |    6 ++++++
 sqlobject/tests/dbtest.py |   10 ++++++++++
 2 files changed, 16 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch 1.6 updated. 1.6.6-3-g098e954

[Oleg Broytman <noreply@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, 1.6 has been updated
       via  098e954915ce40bd4730645be1a0688c769e4b34 (commit)
      from  48cd28437ddf45eadac2bb6b503f49f869d0b995 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 docs/News.txt             |    2 ++
 sqlobject/tests/dbtest.py |   10 ++++++++++
 2 files changed, 12 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository annotated tag 2.2.0b1 created. 2.2.0b1

[Oleg Broytman <noreply@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The annotated tag, 2.2.0b1 has been created
        at  b304c92c16ed7854142835852a4f61a2168fbd80 (tag)
   tagging  68cbedc8010b3e0d2cab44b449f6e9a2dfea39c5 (commit)
  replaces  2.1.2
 tagged by  Oleg Broytman
        on  Fri Jun 19 17:12:35 2015 +0300

- Log -----------------------------------------------------------------
Release 2.2.0b1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAABCgAGBQJVhCNTAAoJEG4IC3C2KHsD0ZkP/0nDnXhgrY/Y+QlREB9S6JUW
MQ2JMPXSW958uHScriHUTWTJkQJCA2ejbJ6DBnzTsEUSLBwh9rpXxuLW9qcRxJSC
MmTTo5/cA4uQHeJMwDEFOvhlw5Y7axoFL1cHKe4HvQVEIfZ5+VLG2UbMBShWS+/2
PQr4gBpx3lSySAjRjg/s64i0i0BCvUhoMMohmDjdgGheRKML4iwcAiaTjSHshvLL
F1c1yyo2QKpF2jzlD72oMrsmTCPbpWywFLBSwSiE+0ZLBGhC2f/Mnfg28yKe2PdY
HhoYr2dj/Pmc7B03Sd4nb9bYDi3YxLHd5Gs/I/tsSWr2vl6YqJGozqzA1OeeNkd4
09gn3b1WPJlSfGCnx5QhF7ZB5Ej8JkCr62VICvC2tCMdcU1D3KQPdN1NGiqde5Z1
oUl6wzoX9l6SKOUU4C5FqxSnZXmcitYdFTh+qIZJk/YKr9Q4JelNQSC4VcYv3Wjt
XM+w3OvmPqjorAD5s45VyPj5mlMYBsppaALetoOy8YYWFJTwISHA17jiLGOSjdY2
BwgUhfP72VlGHK8rKX1nJatp4XTmB7PUtKRMZYWEXVWilIekYz48TeyMqDEP1FZ/
qkKs4jQ53WOLpjlatRZ9nZk1rpXK7mJhaE8Zl1kyDZFehKVhQCTV9lvRFhp8Q7jf
XNIVZrgV2wKTMNef5x0s
=Yftk
-----END PGP SIGNATURE-----

Oleg Broytman (15):
      Minor refactoring to simplify merging into master
      Merge branch '1.6' into 1.7
      Minor refactoring to simplify merging into master
      Merge branch '1.7' into 2.1
      Minor refactoring to simplify merging into master
      Document MSSQL server versions
      Merge branch '1.6' into 1.7
      Merge branch '1.7' into 2.1
      For MSSQL use datetime2(6) and time(6) columns
      Branch 2.2
      Extend error message
      Fix a bug: mxDateTime doesn't support microseconds
      Add function col.use_microseconds(True/False)
      Structure news
      Release 2.2.0b1

-----------------------------------------------------------------------


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch master updated. 3.0.0a1-14-gd13754e

[Oleg Broytman <noreply@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, master has been updated
       via  d13754ed83f887b4ca45d0867aa3c04bbacde8e5 (commit)
       via  68cbedc8010b3e0d2cab44b449f6e9a2dfea39c5 (commit)
      from  af5c77a11410fa315cd0fca2393ddbd17f6c4e4c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/d13754ed83f887b4ca45d0867aa3c04bbacde8e5

commit d13754ed83f887b4ca45d0867aa3c04bbacde8e5
Merge: af5c77a 68cbedc
Author: Oleg Broytman <phd@...>
Date:   Fri Jun 19 17:12:14 2015 +0300

    Merge branch '2.2'


-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch 2.2 updated. 2.2.0b1

[Oleg Broytman <noreply@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, 2.2 has been updated
       via  68cbedc8010b3e0d2cab44b449f6e9a2dfea39c5 (commit)
      from  3b63a3a1ec226a291e650ddc3d0260748ff98d83 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 README.txt               |    4 ++--
 setup.cfg                |    4 ++--
 setup.py                 |    4 ++--
 sqlobject/__version__.py |    6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch 2.2 created. 2.1.2-14-g3b63a3a

[Oleg Broytman <noreply@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, 2.2 has been created
        at  3b63a3a1ec226a291e650ddc3d0260748ff98d83 (commit)

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch master updated. 3.0.0a1-12-gaf5c77a

[Oleg Broytman <noreply@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, master has been updated
       via  af5c77a11410fa315cd0fca2393ddbd17f6c4e4c (commit)
       via  3b63a3a1ec226a291e650ddc3d0260748ff98d83 (commit)
       via  ed8a18d683815e19503896939a10bc5e0f3fefe5 (commit)
       via  5ec7fb0fbed6648c61e9e6998657b462c8b2645d (commit)
       via  4cea85888411aef213fc69a80efdff5e2e25e8c6 (commit)
       via  e59e089b78b5ed3e70a9d4695f2a3265f7ccd1bc (commit)
       via  b75adf042b0a3961b4022ab43a00c5da91d131b4 (commit)
       via  40077a5bb76ca5cb8b1f7eaabb5ce8c853eae5f7 (commit)
       via  b3381c4d9fc2f0d2579a83a0a3e70e821871202e (commit)
       via  4384a86393b2ae832e7765cfdd0641943352d9a8 (commit)
       via  62c12c3c36164a981ee1430a66e285048d2d0d78 (commit)
       via  48cd28437ddf45eadac2bb6b503f49f869d0b995 (commit)
      from  e3ec249ed82ea04e79cc160904bb20ef6da02ad0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/af5c77a11410fa315cd0fca2393ddbd17f6c4e4c

commit af5c77a11410fa315cd0fca2393ddbd17f6c4e4c
Merge: e59e089 3b63a3a
Author: Oleg Broytman <phd@...>
Date:   Wed Jun 17 22:29:46 2015 +0300

    Merge branch '2.2'

diff --cc docs/News.txt
index 2ad7e7f,b621e7f..dca9b9d
--- a/docs/News.txt
+++ b/docs/News.txt
@@@ -7,36 -7,20 +7,47 @@@ New
  
  .. _start:
  
 +SQLObject 3.0.0 (master)
 +========================
 +
 +Features
 +--------
 +
 +* Support for Python 2 and Python 3 with one codebase!
 +  (Python version >= 3.4 currently required.)
 +
 +Minor features
 +--------------
 +
 +* Use fdb adapter for Firebird.
 +
 +* PyDispatcher (>=2.0.4) was made an external dependency.
 +
 +Development
 +-----------
 +
 +* Source code was made flake8-clean.
 +
 +Documentation
 +-------------
 +
 +* Documentation is published at http://sqlobject.readthedocs.org/ in
 +  Sphinx format.
 +
- SQLObject 2.1.3
+ SQLObject 2.2.0
  ===============
  
+ Features & Interface
+ --------------------
+ 
+ * Add function col.use_microseconds(True/False). Default is to use
+   microseconds (True).
+ 
+ * For MSSQL use datetime2(6) and time(6) columns.
+ 
+ Minor features
+ --------------
+ 
  * Minor refactoring to pave the way to Python 3 was merged from
    `SQLObject 1.6.7`_.
  
diff --cc sqlobject/col.py
index 7f85279,454249b..2b2ed29
--- a/sqlobject/col.py
+++ b/sqlobject/col.py
@@@ -27,15 -28,16 +27,16 @@@ try
  except ImportError:
      import pickle
  import weakref
 +
  from formencode import compound, validators
 -from classregistry import findClass
 +from .classregistry import findClass
  # Sadly the name "constraints" conflicts with many of the function
  # arguments in this module, so we rename it:
 -import constraints as constrs
 -import converters
 -import sqlbuilder
 -from styles import capword
 -
 -NoDefault = sqlbuilder.NoDefault
 +from . import constraints as constrs
++from . import converters
 +from . import sqlbuilder
 +from .styles import capword
 +from .compat import PY2, string_type, unicode_type, buffer_type
  
  import datetime
  datetime_available = True
@@@ -71,16 -73,25 +72,35 @@@ __all__ = ["datetime_available", "mxdat
  if mxdatetime_available:
      __all__.append("MXDATETIME_IMPLEMENTATION")
  
 +default_datetime_implementation = DATETIME_IMPLEMENTATION
 +
 +if not PY2:
 +    # alias for python 3 compatibility
 +    long = int
 +    # This is to satisfy flake8 under python 3
 +    unicode = str
 +
 +NoDefault = sqlbuilder.NoDefault
 +
+ 
+ def use_microseconds(use=True):
+     if use:
+         SODateTimeCol.datetimeFormat = '%Y-%m-%d %H:%M:%S.%f'
+         SOTimeCol.timeFormat = '%H:%M:%S.%f'
+         dt_types = [(datetime.datetime, converters.DateTimeConverterMS),
+                     (datetime.time, converters.TimeConverterMS)]
+     else:
+         SODateTimeCol.datetimeFormat = '%Y-%m-%d %H:%M:%S'
+         SOTimeCol.timeFormat = '%H:%M:%S'
+         dt_types = [(datetime.datetime, converters.DateTimeConverter),
+                     (datetime.time, converters.TimeConverter)]
+     for dt_type, converter in dt_types:
+         converters.registerConverter(dt_type, converter)
+ 
+ 
+ __all__.append("use_microseconds")
+ 
+ 
  creationOrder = count()
  
  ########################################
diff --cc sqlobject/converters.py
index aa08ba3,322b5d8..cddf52e
--- a/sqlobject/converters.py
+++ b/sqlobject/converters.py
@@@ -144,17 -116,16 +144,17 @@@ def FloatConverter(value, db)
  registerConverter(float, FloatConverter)
  
  if DateTimeType:
-     def DateTimeConverter(value, db):
-         return "'%s'" % value.strftime("%Y-%m-%d %H:%M:%S.%s")
+     def mxDateTimeConverter(value, db):
+         return "'%s'" % value.strftime("%Y-%m-%d %H:%M:%S")
  
-     registerConverter(DateTimeType, DateTimeConverter)
+     registerConverter(DateTimeType, mxDateTimeConverter)
  
-     def TimeConverter(value, db):
+     def mxTimeConverter(value, db):
          return "'%s'" % value.strftime("%H:%M:%S")
  
-     registerConverter(DateTimeDeltaType, TimeConverter)
+     registerConverter(DateTimeDeltaType, mxTimeConverter)
  
 +
  def NoneConverter(value, db):
      return "NULL"
  
@@@ -176,28 -146,31 +176,38 @@@ if hasattr(time, 'struct_time')
  
      registerConverter(time.struct_time, StructTimeConverter)
  
 +
  def DateTimeConverter(value, db):
+     return "'%04d-%02d-%02d %02d:%02d:%02d'" % (
+         value.year, value.month, value.day,
+         value.hour, value.minute, value.second)
+ 
++
+ def DateTimeConverterMS(value, db):
      return "'%04d-%02d-%02d %02d:%02d:%02d.%06d'" % (
          value.year, value.month, value.day,
          value.hour, value.minute, value.second, value.microsecond)
  
- registerConverter(datetime.datetime, DateTimeConverter)
+ registerConverter(datetime.datetime, DateTimeConverterMS)
  
 +
  def DateConverter(value, db):
      return "'%04d-%02d-%02d'" % (value.year, value.month, value.day)
  
  registerConverter(datetime.date, DateConverter)
  
 +
  def TimeConverter(value, db):
+     return "'%02d:%02d:%02d'" % (value.hour, value.minute, value.second)
+ 
++
+ def TimeConverterMS(value, db):
 -    return "'%02d:%02d:%02d.%06d'" % (value.hour, value.minute, value.second, value.microsecond)
 +    return "'%02d:%02d:%02d.%06d'" % (value.hour, value.minute,
 +                                      value.second, value.microsecond)
  
- registerConverter(datetime.time, TimeConverter)
+ registerConverter(datetime.time, TimeConverterMS)
  
 +
  def DecimalConverter(value, db):
      return value.to_eng_string()
  

http://sourceforge.net/p/sqlobject/sqlobject/ci/e59e089b78b5ed3e70a9d4695f2a3265f7ccd1bc

commit e59e089b78b5ed3e70a9d4695f2a3265f7ccd1bc
Merge: b75adf0 40077a5
Author: Oleg Broytman <phd@...>
Date:   Wed Jun 17 21:51:09 2015 +0300

    Null-merge branch 2.2


http://sourceforge.net/p/sqlobject/sqlobject/ci/b75adf042b0a3961b4022ab43a00c5da91d131b4

commit b75adf042b0a3961b4022ab43a00c5da91d131b4
Merge: e3ec249 b3381c4
Author: Oleg Broytman <phd@...>
Date:   Wed Jun 17 21:50:29 2015 +0300

    Merge branch '2.1'


-----------------------------------------------------------------------

Summary of changes:
 docs/News.txt                      |   24 +++++++++++++++++++++++-
 sqlobject/col.py                   |   31 ++++++++++++++++++++++++++++++-
 sqlobject/converters.py            |   24 +++++++++++++++++-------
 sqlobject/mssql/mssqlconnection.py |   15 +++++++++++++++
 sqlobject/tests/test_datetime.py   |   21 +++++++++++++++++++--
 5 files changed, 104 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch 2.1 deleted. 2.1.2-9-gb3381c4

[Oleg Broytman <noreply@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, 2.1 has been deleted
       was  b3381c4d9fc2f0d2579a83a0a3e70e821871202e

- Log -----------------------------------------------------------------
b3381c4d9fc2f0d2579a83a0a3e70e821871202e For MSSQL use datetime2(6) and time(6) columns
-----------------------------------------------------------------------


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch 2.1 updated. 2.1.2-9-gb3381c4

[Oleg Broytman <noreply@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, 2.1 has been updated
       via  b3381c4d9fc2f0d2579a83a0a3e70e821871202e (commit)
       via  4384a86393b2ae832e7765cfdd0641943352d9a8 (commit)
       via  62c12c3c36164a981ee1430a66e285048d2d0d78 (commit)
       via  48cd28437ddf45eadac2bb6b503f49f869d0b995 (commit)
      from  6abfcc4936a5005a736dac22f44d776f85b71c37 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/b3381c4d9fc2f0d2579a83a0a3e70e821871202e

commit b3381c4d9fc2f0d2579a83a0a3e70e821871202e
Author: Oleg Broytman <phd@...>
Date:   Wed Jun 10 18:20:04 2015 +0300

    For MSSQL use datetime2(6) and time(6) columns

diff --git a/docs/News.txt b/docs/News.txt
index 928a5e9..c559599 100644
--- a/docs/News.txt
+++ b/docs/News.txt
@@ -13,6 +13,8 @@ SQLObject 2.1.3
 * Minor refactoring to pave the way to Python 3 was merged from
   `SQLObject 1.6.7`_.
 
+* For MSSQL use datetime2(6) and time(6) columns.
+
 SQLObject 2.1.2
 ===============
 
@@ -69,6 +71,9 @@ Features & Interface
   ``ALTER TABLE name MODIFY COLUMN col TIME(6)`` for every column that
   you want to store microseconds.
 
+  For MSSQL use datetime2(6) and time(6) columns. They are available
+  since MS SQL Server 2008.
+
   WARNING: backward compatibility problem! Date/Time columns created
   with microseconds cannot be read back from SQLite databases (and
   perhaps other backends) with versions of SQLObject older than 1.7.
diff --git a/sqlobject/col.py b/sqlobject/col.py
index 1a677bb..087f8f8 100644
--- a/sqlobject/col.py
+++ b/sqlobject/col.py
@@ -1206,7 +1206,10 @@ class SODateTimeCol(SOCol):
         return 'DATETIME'
 
     def _mssqlType(self):
-        return 'DATETIME'
+        if self.connection and self.connection.can_use_microseconds():
+            return 'DATETIME2(6)'
+        else:
+            return 'DATETIME'
 
     def _sqliteType(self):
         return 'TIMESTAMP'
@@ -1339,6 +1342,12 @@ class SOTimeCol(SOCol):
     def _sybaseType(self):
         return 'TIME'
 
+    def _mssqlType(self):
+        if self.connection and self.connection.can_use_microseconds():
+            return 'TIME(6)'
+        else:
+            return 'TIME'
+
     def _sqliteType(self):
         return 'TIME'
 
diff --git a/sqlobject/mssql/mssqlconnection.py b/sqlobject/mssql/mssqlconnection.py
index 9954dd6..a61343a 100644
--- a/sqlobject/mssql/mssqlconnection.py
+++ b/sqlobject/mssql/mssqlconnection.py
@@ -82,6 +82,7 @@ class MSSQLConnection(DBAPI):
         self.db = db
         self._server_version = None
         self._can_use_max_types = None
+        self._can_use_microseconds = None
         DBAPI.__init__(self, **kw)
 
     @classmethod
@@ -323,3 +324,11 @@ class MSSQLConnection(DBAPI):
         self._can_use_max_types = can_use_max_types = \
             (server_version is not None) and (server_version >= 9)
         return can_use_max_types
+
+    def can_use_microseconds(self):
+        if self._can_use_microseconds is not None:
+            return self._can_use_microseconds
+        server_version = self.server_version()
+        self._can_use_microseconds = can_use_microseconds = \
+            (server_version is not None) and (server_version >= 10)
+        return can_use_microseconds

http://sourceforge.net/p/sqlobject/sqlobject/ci/4384a86393b2ae832e7765cfdd0641943352d9a8

commit 4384a86393b2ae832e7765cfdd0641943352d9a8
Merge: 6abfcc4 62c12c3
Author: Oleg Broytman <phd@...>
Date:   Wed Jun 10 18:07:55 2015 +0300

    Merge branch '1.7' into 2.1


-----------------------------------------------------------------------

Summary of changes:
 docs/News.txt                      |    7 +++++++
 sqlobject/col.py                   |   11 ++++++++++-
 sqlobject/mssql/mssqlconnection.py |   15 +++++++++++++++
 3 files changed, 32 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
SQLObject development repository