adding new resourceo n difference between sql and django orm

mattmakai · mattmakai · commit 4128d2b26e8b · 2014-10-25T09:57:00.000-04:00
diff --git a/all.html b/all.html
@@ -1869,6 +1869,10 @@ <h2>Object-Relational Mapping</h2>
 creating a data analysis tool or a batch script without a user interface. 
 Currently, the most widely used stand-alone ORM written for Python is
 <a href="http://www.sqlalchemy.org/">SQLAlchemy</a>.</p>
+<p>If you're interested in the differences between SQLAlchemy and the Django
+ORM I highly recommend reading 
+<a href="http://lucumr.pocoo.org/2011/7/19/sqlachemy-and-you/">SQLAlchemy and You</a>
+by Armin Ronacher.</p>
 <h2>Database third-party services</h2>
 <p>Numerous companies run scalable database servers as a hosted service.
 Hosted databases can often provide automated backups and recovery,
diff --git a/databases.html b/databases.html
@@ -164,6 +164,10 @@ <h2>Object-Relational Mapping</h2>
 creating a data analysis tool or a batch script without a user interface. 
 Currently, the most widely used stand-alone ORM written for Python is
 <a href="http://www.sqlalchemy.org/">SQLAlchemy</a>.</p>
+<p>If you're interested in the differences between SQLAlchemy and the Django
+ORM I highly recommend reading 
+<a href="http://lucumr.pocoo.org/2011/7/19/sqlachemy-and-you/">SQLAlchemy and You</a>
+by Armin Ronacher.</p>
 <h2>Database third-party services</h2>
 <p>Numerous companies run scalable database servers as a hosted service.
 Hosted databases can often provide automated backups and recovery,
diff --git a/feeds/all.atom.xml b/feeds/all.atom.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-10-24T09:40:09Z</updated></feed>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-10-25T09:56:35Z</updated></feed>
diff --git a/source/content/pages/04-data/0401-databases.markdown b/source/content/pages/04-data/0401-databases.markdown
@@ -146,6 +146,11 @@ creating a data analysis tool or a batch script without a user interface.
 Currently, the most widely used stand-alone ORM written for Python is
 [SQLAlchemy](http://www.sqlalchemy.org/).
 
+If you're interested in the differences between SQLAlchemy and the Django
+ORM I highly recommend reading 
+[SQLAlchemy and You](http://lucumr.pocoo.org/2011/7/19/sqlachemy-and-you/)
+by Armin Ronacher.
+
 
 ## Database third-party services
 Numerous companies run scalable database servers as a hosted service.

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`<?xml version="1.0" encoding="utf-8"?>`
`2`		`-<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-10-24T09:40:09Z</updated></feed>`
	`2`	`+<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-10-25T09:56:35Z</updated></feed>`