Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 65e9449

Browse files
committed
Update devel docs: drivers
1 parent a677a6e commit 65e9449

File tree

7 files changed

+79
-44
lines changed

7 files changed

+79
-44
lines changed

‎devel/News.html‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,14 @@ <h1>News<a class="headerlink" href="#news" title="Permalink to this headline">¶
149149
<div class="section" id="minor-features">
150150
<h3>Minor features<a class="headerlink" href="#minor-features" title="Permalink to this headline"></a></h3>
151151
<ul class="simple">
152-
<li>Dropped table name from <code class="docutils literal"><span class="pre">VACUUM</span></code> command in SQLiteConnection:
152+
<li>Drop table name from <code class="docutils literal"><span class="pre">VACUUM</span></code> command in SQLiteConnection:
153153
SQLite doesn&#8217;t vacuum a single table and SQLite 3.15 uses the supplied name
154154
as the name of the attached database to vacuum.</li>
155+
<li>Remove <code class="docutils literal"><span class="pre">driver</span></code> keyword from RdbhostConnection as it allows one driver
156+
<code class="docutils literal"><span class="pre">rdbhost</span></code>.</li>
157+
<li>Add <code class="docutils literal"><span class="pre">driver</span></code> keyword for FirebirdConnection. Allowed values are &#8216;fdb&#8217; or
158+
&#8216;kinterbasdb&#8217;. Default is to test &#8216;fdb&#8217; and &#8216;kinterbasdb&#8217; in that order.</li>
159+
<li>Add <code class="docutils literal"><span class="pre">driver</span></code> keyword for MySQLConnection. Allowed value is &#8216;mysqldb&#8217;.</li>
155160
</ul>
156161
</div>
157162
<div class="section" id="documentation">

‎devel/_modules/sqlobject/firebird/firebirdconnection.html‎

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -88,17 +88,34 @@ <h1>Source code for sqlobject.firebird.firebirdconnection</h1><div class="highli
8888
<span class="k">def</span> <span class="nf">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">host</span><span class="p">,</span> <span class="n">db</span><span class="p">,</span> <span class="n">port</span><span class="o">=</span><span class="s1">&#39;3050&#39;</span><span class="p">,</span> <span class="n">user</span><span class="o">=</span><span class="s1">&#39;sysdba&#39;</span><span class="p">,</span>
8989
<span class="n">password</span><span class="o">=</span><span class="s1">&#39;masterkey&#39;</span><span class="p">,</span> <span class="n">autoCommit</span><span class="o">=</span><span class="mi">1</span><span class="p">,</span>
9090
<span class="n">dialect</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">role</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">charset</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="o">**</span><span class="n">kw</span><span class="p">):</span>
91-
<span class="k">try</span><span class="p">:</span>
92-
<span class="kn">import</span> <span class="nn">fdb</span>
93-
<span class="bp">self</span><span class="o">.</span><span class="n">module</span> <span class="o">=</span> <span class="n">fdb</span>
94-
<span class="k">except</span> <span class="ne">ImportError</span><span class="p">:</span>
95-
<span class="kn">import</span> <span class="nn">kinterbasdb</span>
96-
<span class="c1"># See http://kinterbasdb.sourceforge.net/dist_docs/usage.html</span>
97-
<span class="c1"># for an explanation; in short: use datetime, decimal and</span>
98-
<span class="c1"># unicode.</span>
99-
<span class="n">kinterbasdb</span><span class="o">.</span><span class="n">init</span><span class="p">(</span><span class="n">type_conv</span><span class="o">=</span><span class="mi">200</span><span class="p">)</span>
100-
<span class="bp">self</span><span class="o">.</span><span class="n">module</span> <span class="o">=</span> <span class="n">kinterbasdb</span>
101-
91+
<span class="n">drivers</span> <span class="o">=</span> <span class="n">kw</span><span class="o">.</span><span class="n">pop</span><span class="p">(</span><span class="s1">&#39;driver&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> <span class="s1">&#39;fdb,kinterbasdb&#39;</span>
92+
<span class="k">for</span> <span class="n">driver</span> <span class="ow">in</span> <span class="n">drivers</span><span class="o">.</span><span class="n">split</span><span class="p">(</span><span class="s1">&#39;,&#39;</span><span class="p">):</span>
93+
<span class="n">driver</span> <span class="o">=</span> <span class="n">driver</span><span class="o">.</span><span class="n">strip</span><span class="p">()</span>
94+
<span class="k">if</span> <span class="ow">not</span> <span class="n">driver</span><span class="p">:</span>
95+
<span class="k">continue</span>
96+
<span class="k">try</span><span class="p">:</span>
97+
<span class="k">if</span> <span class="n">driver</span> <span class="o">==</span> <span class="s1">&#39;fdb&#39;</span><span class="p">:</span>
98+
<span class="kn">import</span> <span class="nn">fdb</span>
99+
<span class="bp">self</span><span class="o">.</span><span class="n">module</span> <span class="o">=</span> <span class="n">fdb</span>
100+
<span class="k">elif</span> <span class="n">driver</span> <span class="o">==</span> <span class="s1">&#39;kinterbasdb&#39;</span><span class="p">:</span>
101+
<span class="kn">import</span> <span class="nn">kinterbasdb</span>
102+
<span class="c1"># See</span>
103+
<span class="c1"># http://kinterbasdb.sourceforge.net/dist_docs/usage.html</span>
104+
<span class="c1"># for an explanation; in short: use datetime, decimal and</span>
105+
<span class="c1"># unicode.</span>
106+
<span class="n">kinterbasdb</span><span class="o">.</span><span class="n">init</span><span class="p">(</span><span class="n">type_conv</span><span class="o">=</span><span class="mi">200</span><span class="p">)</span>
107+
<span class="bp">self</span><span class="o">.</span><span class="n">module</span> <span class="o">=</span> <span class="n">kinterbasdb</span>
108+
<span class="k">else</span><span class="p">:</span>
109+
<span class="k">raise</span> <span class="ne">ValueError</span><span class="p">(</span>
110+
<span class="s1">&#39;Unknown FireBird driver &quot;</span><span class="si">%s</span><span class="s1">&quot;, &#39;</span>
111+
<span class="s1">&#39;expected fdb or kinterbasdb&#39;</span> <span class="o">%</span> <span class="n">driver</span><span class="p">)</span>
112+
<span class="k">except</span> <span class="ne">ImportError</span><span class="p">:</span>
113+
<span class="k">pass</span>
114+
<span class="k">else</span><span class="p">:</span>
115+
<span class="k">break</span>
116+
<span class="k">else</span><span class="p">:</span>
117+
<span class="k">raise</span> <span class="ne">ImportError</span><span class="p">(</span>
118+
<span class="s1">&#39;Cannot find an FireBird driver, tried </span><span class="si">%s</span><span class="s1">&#39;</span> <span class="o">%</span> <span class="n">drivers</span><span class="p">)</span>
102119
<span class="bp">self</span><span class="o">.</span><span class="n">host</span> <span class="o">=</span> <span class="n">host</span>
103120
<span class="bp">self</span><span class="o">.</span><span class="n">port</span> <span class="o">=</span> <span class="n">port</span>
104121
<span class="bp">self</span><span class="o">.</span><span class="n">db</span> <span class="o">=</span> <span class="n">db</span>

‎devel/_modules/sqlobject/mysql/mysqlconnection.html‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,28 @@ <h1>Source code for sqlobject.mysql.mysqlconnection</h1><div class="highlight"><
9393
<span class="n">schemes</span> <span class="o">=</span> <span class="p">[</span><span class="n">dbName</span><span class="p">]</span>
9494

9595
<span class="k">def</span> <span class="nf">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">db</span><span class="p">,</span> <span class="n">user</span><span class="p">,</span> <span class="n">password</span><span class="o">=</span><span class="s1">&#39;&#39;</span><span class="p">,</span> <span class="n">host</span><span class="o">=</span><span class="s1">&#39;localhost&#39;</span><span class="p">,</span> <span class="n">port</span><span class="o">=</span><span class="mi">0</span><span class="p">,</span> <span class="o">**</span><span class="n">kw</span><span class="p">):</span>
96-
<span class="kn">import</span> <span class="nn">MySQLdb</span><span class="o">,</span> <span class="nn">MySQLdb.constants.CR</span><span class="o">,</span> <span class="nn">MySQLdb.constants.ER</span> <span class="c1"># noqa</span>
97-
<span class="bp">self</span><span class="o">.</span><span class="n">module</span> <span class="o">=</span> <span class="n">MySQLdb</span>
96+
<span class="n">drivers</span> <span class="o">=</span> <span class="n">kw</span><span class="o">.</span><span class="n">pop</span><span class="p">(</span><span class="s1">&#39;driver&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> <span class="s1">&#39;mysqldb&#39;</span>
97+
<span class="k">for</span> <span class="n">driver</span> <span class="ow">in</span> <span class="n">drivers</span><span class="o">.</span><span class="n">split</span><span class="p">(</span><span class="s1">&#39;,&#39;</span><span class="p">):</span>
98+
<span class="n">driver</span> <span class="o">=</span> <span class="n">driver</span><span class="o">.</span><span class="n">strip</span><span class="p">()</span>
99+
<span class="k">if</span> <span class="ow">not</span> <span class="n">driver</span><span class="p">:</span>
100+
<span class="k">continue</span>
101+
<span class="k">try</span><span class="p">:</span>
102+
<span class="k">if</span> <span class="n">driver</span><span class="o">.</span><span class="n">lower</span><span class="p">()</span> <span class="o">==</span> <span class="s1">&#39;mysqldb&#39;</span><span class="p">:</span>
103+
<span class="kn">import</span> <span class="nn">MySQLdb</span>
104+
<span class="kn">import</span> <span class="nn">MySQLdb.constants.CR</span>
105+
<span class="kn">import</span> <span class="nn">MySQLdb.constants.ER</span>
106+
<span class="bp">self</span><span class="o">.</span><span class="n">module</span> <span class="o">=</span> <span class="n">MySQLdb</span>
107+
<span class="k">else</span><span class="p">:</span>
108+
<span class="k">raise</span> <span class="ne">ValueError</span><span class="p">(</span>
109+
<span class="s1">&#39;Unknown MySQL driver &quot;</span><span class="si">%s</span><span class="s1">&quot;, &#39;</span>
110+
<span class="s1">&#39;expected mysqldb&#39;</span> <span class="o">%</span> <span class="n">driver</span><span class="p">)</span>
111+
<span class="k">except</span> <span class="ne">ImportError</span><span class="p">:</span>
112+
<span class="k">pass</span>
113+
<span class="k">else</span><span class="p">:</span>
114+
<span class="k">break</span>
115+
<span class="k">else</span><span class="p">:</span>
116+
<span class="k">raise</span> <span class="ne">ImportError</span><span class="p">(</span>
117+
<span class="s1">&#39;Cannot find a MySQL driver, tried </span><span class="si">%s</span><span class="s1">&#39;</span> <span class="o">%</span> <span class="n">drivers</span><span class="p">)</span>
98118
<span class="bp">self</span><span class="o">.</span><span class="n">host</span> <span class="o">=</span> <span class="n">host</span>
99119
<span class="bp">self</span><span class="o">.</span><span class="n">port</span> <span class="o">=</span> <span class="n">port</span>
100120
<span class="bp">self</span><span class="o">.</span><span class="n">db</span> <span class="o">=</span> <span class="n">db</span>

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /