Improve reveal.js/sqlalchemy.html and start working on the Statnett theme

1 files changed, 10 insertions, 7 deletions

diff --git a/reveal.js/sqlalchemy.html b/reveal.js/sqlalchemy.html
index 578fc13..6acd9b7 100755
--- a/reveal.js/sqlalchemy.html
+++ b/reveal.js/sqlalchemy.html
@@ -48,7 +48,7 @@
           <h2>What is SQLAlchemy?</h2>
           </br>
           <p><em>SQLAlchemy</em> is a Python library created by Mike Bayer to provide a high-level Pythonic interface to RDBMS such as <em>PostgreSQL</em>, <em>SQLite</em>, <em>MySQL</em>, <em>Oracle</em>, <em>DB2</em>.</p>
-          <p><em>SQLAlchemy</em> includes RDBMS-independent SQL expression language and an <em>object-relational mapper (ORM)</em>.</p>
+          <p><em>SQLAlchemy</em> includes RDBMS-independent <em>SQL expression language</em> and an <em>object-relational mapper (ORM)</em>.</p>
         </section>
 
         <section>
@@ -59,7 +59,7 @@
             <li><p>portability - the programming interface is independent of the type of RDBMS and connector used</p></li>
             <li><p>security - no more SQL injections</p></li>
             <li><p>abstraction - no need to bother with complex JOINs</p></li>
-            <li><p>object-orientation - you work with objects and NOT tables and rows</p></li>
+            <li><p>object-orientation - you work with objects instead of tables and rows</p></li>
             <li><p>performance - exploits the likehood of reusing a particular query</p></li>
             <li><p>flexibility - you can override almost anything</p></li>
             <li><p>0.0125 karma points for each MB transferred (2021)</p></li>
@@ -72,9 +72,9 @@
           <ul>
             <li><em>Engine</em>- manages the connection pool and the RDBMS-independent SQL dialect layer</li>
             <li><em>MetaData</em> - used to collect and organize information about your table layout (schema)</li>
-            <li><em>Session</em> - establishes all conversations with the RDBMS and represents a "holding zone" for all the objects which you've loaded or associated with it during its lifespan</li>
             <li><em>SQL expression language</em> - provides an API to execute your queries and updates against your tables, all from Python, and all in a database-independent way (low-level interface)</li>
-            <li><em>ORM</em> - provides a convenient way to add database persistence to your Python objects withoutrequiring you to design your objects around the database, or the database around the objects (high-level interface)</li>
+            <li><em>ORM</em> - provides a convenient way to add database persistence to your Python objects without requiring you to design your objects around the database, or the database around the objects (high-level interface)</li>
+            <li><em>Session</em> - establishes all conversations with the RDBMS and represents a "holding zone" for all the objects which you've loaded or associated with it during its lifespan</li>
           </ul>
           <img src="images/sqlalchemy/sqla_arch.png"></img>
         </section>
@@ -86,6 +86,7 @@
             <code class="python" data-trim data-line-numbers type="text/template">
               import sqlalchemy
               sqlalchemy.__version__
+              # Out: '1.3.23'
 
               from sqlalchemy import create_engine
 
@@ -95,7 +96,6 @@
               # and driver the name of a DBAPI, such as psycopg2, pyodbc, cx_oracle
               # The echo flag is a shortcut to setting up SQLAlchemy logging,
               # which is accomplished via Python’s standard logging module.
-              # With it enabled, we’ll see all the generated SQL produced.
               # engine = create_engine("sqlite:///library.db", echo=True)
               engine = create_engine("sqlite:///:memory:", echo=True)
 
@@ -296,7 +296,8 @@
               session.query(Book).join(Author).filter(Author.name == "Richard Dawkins").all()
               session.query(Book).\
                   from_statement("SELECT b.* FROM books b, authors a WHERE b.author_id = a.author_id AND a.name=:name").\
-                  params(name="Richard Dawkins").all()
+                      params(name="Richard Dawkins").all()
+              session.query(Book).filter(Book.author == author_1).all()
             </code>
           </pre>
         </section>
@@ -336,6 +337,7 @@
               # Out: [<__main__.Book at 0x7f132bdf0130>]
               # WHERE (abs(books.book_id) > ?) IS 1  ... in the case of func.abs
 
+              # with Pandas
               df = pd.read_sql_table("my_table", con=session.get_bind())  # or con=engine
 
               df = pd.read_sql_query(query.statement, engine)
@@ -370,7 +372,8 @@
                 // Learn about plugins: https://revealjs.netlify.app/plugins/
                 plugins: [ RevealZoom, RevealNotes, RevealSearch, RevealMarkdown, RevealHighlight ]
           });
-      
+      Reveal.configure({ pdfSeparateFragments: false });
+
         </script>
 
   </body>