Skip to content

Commit aa022b0

Browse files
mattmakaimattmakai
committed
updating database section
1 parent 183724a commit aa022b0

File tree

5 files changed

+41
-36
lines changed

5 files changed

+41
-36
lines changed

‎feeds/all.atom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<?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>2013-12-22T10:35:39Z</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>2013-12-23T09:50:16Z</updated></feed>

‎index.html‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,17 @@ <h1>Database</h1>
320320
<p><a class="reference external" href="http://www.sqlite.org/">SQLite</a> is a database that is stored in a single
321321
file on disk. SQLite is built into Python but is only built for access
322322
by a single connection at a time.</p>
323+
<div class="section" id="database-connections-with-python">
324+
<h2>Database connections with Python</h2>
325+
<p>To work with a relational database using Python, you need to use a code
326+
library. The most common libraries for relational databases are:</p>
327+
<p><a class="reference external" href="http://initd.org/psycopg/">psycopg2</a> for PostgreSQL</p>
328+
<p><a class="reference external" href="https://pypi.python.org/pypi/MySQL-python/1.2.4">MySQLdb</a> for MySQL</p>
329+
<p><a class="reference external" href="http://cx-oracle.sourceforge.net/">cx_Oracle</a> for Oracle</p>
330+
<p>SQLite support is built into Python 2.7+ and therefore a separate library
331+
is not necessary. Simply &quot;import sqlite3&quot; to begin interfacing with the
332+
single file-based database.</p>
333+
</div>
323334
<div class="section" id="database-third-party-services">
324335
<h2>Database third-party services</h2>
325336
<p>Numerous companies run scalable database servers as a hosted service.
@@ -335,16 +346,6 @@ <h2>Database third-party services</h2>
335346
be scaled to larger or smaller configurations based on storage and performance
336347
needs.</p>
337348
</div>
338-
<div class="section" id="database-connections-with-python">
339-
<h2>Database connections with Python</h2>
340-
<p>To work with a relational database using Python, you need to use a code
341-
library. The most common libraries for relational databases are:</p>
342-
<p><a class="reference external" href="http://initd.org/psycopg/">psycopg2</a> for PostgreSQL</p>
343-
<p><a class="reference external" href="https://pypi.python.org/pypi/MySQL-python/1.2.4">MySQLdb</a> for MySQL</p>
344-
<p><a class="reference external" href="http://cx-oracle.sourceforge.net/">cx_Oracle</a> for Oracle</p>
345-
<p>SQLite support is built into Python 2.7+ and therefore a separate library
346-
is not necessary.</p>
347-
</div>
348349
<div class="section" id="database-resources">
349350
<h2>Database resources</h2>
350351
<p><a class="reference external" href="http://db-engines.com/en/ranking">DB-Engines</a> ranks the most popular

‎pages/database.html‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,17 @@ <h1>Database</h1>
6666
<p><a class="reference external" href="http://www.sqlite.org/">SQLite</a> is a database that is stored in a single
6767
file on disk. SQLite is built into Python but is only built for access
6868
by a single connection at a time.</p>
69+
<div class="section" id="database-connections-with-python">
70+
<h2>Database connections with Python</h2>
71+
<p>To work with a relational database using Python, you need to use a code
72+
library. The most common libraries for relational databases are:</p>
73+
<p><a class="reference external" href="http://initd.org/psycopg/">psycopg2</a> for PostgreSQL</p>
74+
<p><a class="reference external" href="https://pypi.python.org/pypi/MySQL-python/1.2.4">MySQLdb</a> for MySQL</p>
75+
<p><a class="reference external" href="http://cx-oracle.sourceforge.net/">cx_Oracle</a> for Oracle</p>
76+
<p>SQLite support is built into Python 2.7+ and therefore a separate library
77+
is not necessary. Simply &quot;import sqlite3&quot; to begin interfacing with the
78+
single file-based database.</p>
79+
</div>
6980
<div class="section" id="database-third-party-services">
7081
<h2>Database third-party services</h2>
7182
<p>Numerous companies run scalable database servers as a hosted service.
@@ -81,16 +92,6 @@ <h2>Database third-party services</h2>
8192
be scaled to larger or smaller configurations based on storage and performance
8293
needs.</p>
8394
</div>
84-
<div class="section" id="database-connections-with-python">
85-
<h2>Database connections with Python</h2>
86-
<p>To work with a relational database using Python, you need to use a code
87-
library. The most common libraries for relational databases are:</p>
88-
<p><a class="reference external" href="http://initd.org/psycopg/">psycopg2</a> for PostgreSQL</p>
89-
<p><a class="reference external" href="https://pypi.python.org/pypi/MySQL-python/1.2.4">MySQLdb</a> for MySQL</p>
90-
<p><a class="reference external" href="http://cx-oracle.sourceforge.net/">cx_Oracle</a> for Oracle</p>
91-
<p>SQLite support is built into Python 2.7+ and therefore a separate library
92-
is not necessary.</p>
93-
</div>
9495
<div class="section" id="database-resources">
9596
<h2>Database resources</h2>
9697
<p><a class="reference external" href="http://db-engines.com/en/ranking">DB-Engines</a> ranks the most popular

‎source/content/pages/database.rst‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,22 @@ file on disk. SQLite is built into Python but is only built for access
2929
by a single connection at a time.
3030

3131

32+
Database connections with Python
33+
--------------------------------
34+
To work with a relational database using Python, you need to use a code
35+
library. The most common libraries for relational databases are:
36+
37+
`psycopg2 <http://initd.org/psycopg/>`_ for PostgreSQL
38+
39+
`MySQLdb <https://pypi.python.org/pypi/MySQL-python/1.2.4>`_ for MySQL
40+
41+
`cx_Oracle <http://cx-oracle.sourceforge.net/>`_ for Oracle
42+
43+
SQLite support is built into Python 2.7+ and therefore a separate library
44+
is not necessary. Simply "import sqlite3" to begin interfacing with the
45+
single file-based database.
46+
47+
3248
Database third-party services
3349
-----------------------------
3450
Numerous companies run scalable database servers as a hosted service.
@@ -45,21 +61,6 @@ be scaled to larger or smaller configurations based on storage and performance
4561
needs.
4662

4763

48-
Database connections with Python
49-
--------------------------------
50-
To work with a relational database using Python, you need to use a code
51-
library. The most common libraries for relational databases are:
52-
53-
`psycopg2 <http://initd.org/psycopg/>`_ for PostgreSQL
54-
55-
`MySQLdb <https://pypi.python.org/pypi/MySQL-python/1.2.4>`_ for MySQL
56-
57-
`cx_Oracle <http://cx-oracle.sourceforge.net/>`_ for Oracle
58-
59-
SQLite support is built into Python 2.7+ and therefore a separate library
60-
is not necessary.
61-
62-
6364
Database resources
6465
------------------
6566
`DB-Engines <http://db-engines.com/en/ranking>`_ ranks the most popular

‎source/content/pages/monitoring.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ transparency for your users.
4545
`PagerDuty <http://www.pagerduty.com/>`_ alerts a designated person or group
4646
if there are stability, performance, or uptime issues with an application.
4747

48+
4849
Open Source Projects
4950
--------------------
5051
`statsd <https://github.com/etsy/statsd/>`_ is a node.js network daemon that
@@ -54,6 +55,7 @@ such as Graphite.
5455
`Graphite <https://graphite.readthedocs.org/en/latest/overview.html>`_ stores
5556
time-series data and displays them in graphs through a web application.
5657

58+
5759
Monitoring Resources
5860
--------------------
5961
`The Virtues of Monitoring <http://www.paperplanes.de/2011/1/5/the_virtues_of_monitoring.html>`_

0 commit comments

Comments
 (0)