Skip to content

Commit 9dea38d

Browse files
phdruphdru
committed
Update devel docs: fixed most problems with Firebird
1 parent 64d0206 commit 9dea38d

20 files changed

+1052
-1044
lines changed

‎devel/News.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,9 @@ <h3>Minor features<a class="headerlink" href="#minor-features" title="Permalink
156156
the name of the attached database to vacuum.</li>
157157
<li>Remove <code class="docutils literal"><span class="pre">driver</span></code> keyword from RdbhostConnection as it allows one driver
158158
<code class="docutils literal"><span class="pre">rdbhdb</span></code>.</li>
159-
<li>Add <code class="docutils literal"><span class="pre">driver</span></code> keyword for FirebirdConnection. Allowed values are &#8216;fdb&#8217;
160-
or &#8216;kinterbasdb&#8217;. Default is to test &#8216;fdb&#8217; and &#8216;kinterbasdb&#8217; in that
161-
order. pyfirebirdsql is supported but untested.</li>
159+
<li>Add <code class="docutils literal"><span class="pre">driver</span></code> keyword for FirebirdConnection. Allowed values are &#8216;fdb&#8217;,
160+
&#8216;kinterbasdb&#8217; or &#8216;firebirdsql&#8217;. Default is to test &#8216;fdb&#8217;, &#8216;kinterbasdb&#8217; and
161+
&#8216;firebirdsql&#8217; in that order.</li>
162162
<li>Add <code class="docutils literal"><span class="pre">driver</span></code> keyword for MySQLConnection. Allowed value are &#8216;mysqldb&#8217;,
163163
&#8216;connector&#8217;, &#8216;oursql&#8217; and &#8216;pymysql&#8217;. Default is to test for mysqldb only.</li>
164164
<li>Add support for <a class="reference external" href="https://pypi.python.org/pypi/mysql-connector">MySQL Connector</a> (pure python; <a class="reference external" href="https://dev.mysql.com/doc/connector-python/en/">binary
@@ -201,7 +201,7 @@ <h3>Tests<a class="headerlink" href="#tests" title="Permalink to this headline">
201201
<li>Tests are now run at CIs with <code class="docutils literal"><span class="pre">python3.5</span></code>.</li>
202202
<li>Drop <code class="docutils literal"><span class="pre">Circle</span> <span class="pre">CI</span></code>.</li>
203203
<li>Run at Travis CI tests with Firebird backend (server version 2.5; drivers fdb
204-
and firebirdsql). There are problems with tests.</li>
204+
and firebirdsql). There are some problems with tests.</li>
205205
<li>Add AppVeyor for windows testing. Run tests with Postgres and MS SQL. There
206206
are problems with MS SQL.</li>
207207
<li>Run sqlite tests at AppVeyor.</li>

‎devel/_modules/sqlobject/col.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -971,6 +971,10 @@ <h1>Source code for sqlobject.col</h1><div class="highlight"><pre>
971971

972972
<span class="k">def</span> <span class="nf">_mssqlType</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
973973
<span class="n">key_type</span> <span class="o">=</span> <span class="p">{</span><span class="nb">int</span><span class="p">:</span> <span class="s2">&quot;INT NULL&quot;</span><span class="p">,</span> <span class="nb">str</span><span class="p">:</span> <span class="s2">&quot;TEXT&quot;</span><span class="p">}</span>
974+
<span class="k">return</span> <span class="n">key_type</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">_idType</span><span class="p">()]</span>
975+
976+
<span class="k">def</span> <span class="nf">_firebirdType</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
977+
<span class="n">key_type</span> <span class="o">=</span> <span class="p">{</span><span class="nb">int</span><span class="p">:</span> <span class="s2">&quot;INT&quot;</span><span class="p">,</span> <span class="nb">str</span><span class="p">:</span> <span class="s2">&quot;VARCHAR(255)&quot;</span><span class="p">}</span>
974978
<span class="k">return</span> <span class="n">key_type</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">_idType</span><span class="p">()]</span></div>
975979

976980

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ <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="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>
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,firebirdsql&#39;</span>
9292
<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>
9393
<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>
9494
<span class="k">if</span> <span class="ow">not</span> <span class="n">driver</span><span class="p">:</span>
@@ -241,7 +241,7 @@ <h1>Source code for sqlobject.firebird.firebirdconnection</h1><div class="highli
241241
<span class="k">return</span> <span class="n">col</span><span class="o">.</span><span class="n">firebirdCreateSQL</span><span class="p">()</span></div>
242242

243243
<div class="viewcode-block" id="FirebirdConnection.createIDColumn"><a class="viewcode-back" href="../../../api/sqlobject.firebird.firebirdconnection.html#sqlobject.firebird.firebirdconnection.FirebirdConnection.createIDColumn">[docs]</a> <span class="k">def</span> <span class="nf">createIDColumn</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">soClass</span><span class="p">):</span>
244-
<span class="n">key_type</span> <span class="o">=</span> <span class="p">{</span><span class="nb">int</span><span class="p">:</span> <span class="s2">&quot;INT&quot;</span><span class="p">,</span> <span class="nb">str</span><span class="p">:</span> <span class="s2">&quot;TEXT&quot;</span><span class="p">}[</span><span class="n">soClass</span><span class="o">.</span><span class="n">sqlmeta</span><span class="o">.</span><span class="n">idType</span><span class="p">]</span>
244+
<span class="n">key_type</span> <span class="o">=</span> <span class="p">{</span><span class="nb">int</span><span class="p">:</span> <span class="s2">&quot;INT&quot;</span><span class="p">,</span> <span class="nb">str</span><span class="p">:</span> <span class="s2">&quot;VARCHAR(255)&quot;</span><span class="p">}[</span><span class="n">soClass</span><span class="o">.</span><span class="n">sqlmeta</span><span class="o">.</span><span class="n">idType</span><span class="p">]</span>
245245
<span class="k">return</span> <span class="s1">&#39;</span><span class="si">%s</span><span class="s1"> </span><span class="si">%s</span><span class="s1"> NOT NULL PRIMARY KEY&#39;</span> <span class="o">%</span> <span class="p">(</span><span class="n">soClass</span><span class="o">.</span><span class="n">sqlmeta</span><span class="o">.</span><span class="n">idName</span><span class="p">,</span>
246246
<span class="n">key_type</span><span class="p">)</span></div>
247247

‎devel/_modules/sqlobject/inheritance/tests/test_foreignKey.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -151,19 +151,19 @@ <h1>Source code for sqlobject.inheritance.tests.test_foreignKey</h1><div class="
151151
<span class="k">assert</span> <span class="n">employee</span><span class="o">.</span><span class="n">count</span><span class="p">()</span> <span class="o">==</span> <span class="mi">2</span></div>
152152

153153

154-
<div class="viewcode-block" id="SOTestInheritableBase"><a class="viewcode-back" href="../../../../api/sqlobject.inheritance.tests.test_foreignKey.html#sqlobject.inheritance.tests.test_foreignKey.SOTestInheritableBase">[docs]</a><span class="k">class</span> <span class="nc">SOTestInheritableBase</span><span class="p">(</span><span class="n">InheritableSQLObject</span><span class="p">):</span>
154+
<div class="viewcode-block" id="SOTestInhBase"><a class="viewcode-back" href="../../../../api/sqlobject.inheritance.tests.test_foreignKey.html#sqlobject.inheritance.tests.test_foreignKey.SOTestInhBase">[docs]</a><span class="k">class</span> <span class="nc">SOTestInhBase</span><span class="p">(</span><span class="n">InheritableSQLObject</span><span class="p">):</span>
155155
<span class="k">pass</span></div>
156156

157157

158-
<div class="viewcode-block" id="SOTestInheritableForeignKey"><a class="viewcode-back" href="../../../../api/sqlobject.inheritance.tests.test_foreignKey.html#sqlobject.inheritance.tests.test_foreignKey.SOTestInheritableForeignKey">[docs]</a><span class="k">class</span> <span class="nc">SOTestInheritableForeignKey</span><span class="p">(</span><span class="n">SOTestInheritableBase</span><span class="p">):</span>
159-
<span class="n">base</span> <span class="o">=</span> <span class="n">ForeignKey</span><span class="p">(</span><span class="s2">&quot;SOTestInheritableBase&quot;</span><span class="p">)</span></div>
158+
<div class="viewcode-block" id="SOTestInhFKey"><a class="viewcode-back" href="../../../../api/sqlobject.inheritance.tests.test_foreignKey.html#sqlobject.inheritance.tests.test_foreignKey.SOTestInhFKey">[docs]</a><span class="k">class</span> <span class="nc">SOTestInhFKey</span><span class="p">(</span><span class="n">SOTestInhBase</span><span class="p">):</span>
159+
<span class="n">base</span> <span class="o">=</span> <span class="n">ForeignKey</span><span class="p">(</span><span class="s2">&quot;SOTestInhBase&quot;</span><span class="p">)</span></div>
160160

161161

162162
<div class="viewcode-block" id="test_foreignKey2"><a class="viewcode-back" href="../../../../api/sqlobject.inheritance.tests.test_foreignKey.html#sqlobject.inheritance.tests.test_foreignKey.test_foreignKey2">[docs]</a><span class="k">def</span> <span class="nf">test_foreignKey2</span><span class="p">():</span>
163-
<span class="n">setupClass</span><span class="p">([</span><span class="n">SOTestInheritableBase</span><span class="p">,</span> <span class="n">SOTestInheritableForeignKey</span><span class="p">])</span>
163+
<span class="n">setupClass</span><span class="p">([</span><span class="n">SOTestInhBase</span><span class="p">,</span> <span class="n">SOTestInhFKey</span><span class="p">])</span>
164164

165-
<span class="n">test</span> <span class="o">=</span> <span class="n">SOTestInheritableBase</span><span class="p">()</span>
166-
<span class="n">SOTestInheritableForeignKey</span><span class="p">(</span><span class="n">base</span><span class="o">=</span><span class="n">test</span><span class="p">)</span></div>
165+
<span class="n">test</span> <span class="o">=</span> <span class="n">SOTestInhBase</span><span class="p">()</span>
166+
<span class="n">SOTestInhFKey</span><span class="p">(</span><span class="n">base</span><span class="o">=</span><span class="n">test</span><span class="p">)</span></div>
167167
</pre></div>
168168

169169
</div>

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy