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 9c7a09e

Browse files
committed
Update devel docs: fix tests for Firebird
1 parent 62daa14 commit 9c7a09e

38 files changed

+381
-368
lines changed

‎devel/News.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,8 @@ <h3>Tests<a class="headerlink" href="#tests" title="Permalink to this headline">
200200
tests were deprecated in <code class="docutils literal"><span class="pre">pytest</span></code>.</li>
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>
203+
<li>Run at Travis CI tests with Firebird backend (server version 2.5; drivers fdb
204+
and firebirdsql). There are problems with tests.</li>
203205
</ul>
204206
</div>
205207
</div>

‎devel/_modules/sqlobject/col.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,7 @@ <h1>Source code for sqlobject.col</h1><div class="highlight"><pre>
665665
<span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">dataType</span> <span class="ow">and</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">value</span><span class="p">,</span> <span class="bp">self</span><span class="o">.</span><span class="n">dataType</span><span class="p">):</span>
666666
<span class="k">return</span> <span class="n">value</span>
667667
<span class="k">if</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">value</span><span class="p">,</span>
668-
<span class="p">(</span><span class="nb">str</span><span class="p">,</span> <span class="n">buffer_type</span><span class="p">,</span> <span class="n">binaryType</span><span class="p">,</span>
668+
<span class="p">(</span><span class="nb">str</span><span class="p">,</span> <span class="nb">bytes</span><spanclass="p">,</span><spanclass="n">buffer_type</span><span class="p">,</span> <span class="n">binaryType</span><span class="p">,</span>
669669
<span class="n">sqlbuilder</span><span class="o">.</span><span class="n">SQLExpression</span><span class="p">)):</span>
670670
<span class="k">return</span> <span class="n">value</span>
671671
<span class="k">if</span> <span class="nb">hasattr</span><span class="p">(</span><span class="n">value</span><span class="p">,</span> <span class="s1">&#39;__unicode__&#39;</span><span class="p">):</span>
@@ -1835,6 +1835,8 @@ <h1>Source code for sqlobject.col</h1><div class="highlight"><pre>
18351835
<span class="k">if</span> <span class="n">dbName</span> <span class="o">==</span> <span class="s2">&quot;mysql&quot;</span> <span class="ow">and</span> <span class="ow">not</span> <span class="n">PY2</span><span class="p">:</span>
18361836
<span class="n">value</span> <span class="o">=</span> <span class="n">value</span><span class="o">.</span><span class="n">encode</span><span class="p">(</span><span class="s1">&#39;ascii&#39;</span><span class="p">,</span> <span class="n">errors</span><span class="o">=</span><span class="s1">&#39;surrogateescape&#39;</span><span class="p">)</span>
18371837
<span class="k">return</span> <span class="n">value</span>
1838+
<span class="k">if</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">value</span><span class="p">,</span> <span class="nb">bytes</span><span class="p">):</span>
1839+
<span class="k">return</span> <span class="n">value</span>
18381840
<span class="k">if</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">value</span><span class="p">,</span> <span class="p">(</span><span class="n">buffer_type</span><span class="p">,</span> <span class="n">binaryType</span><span class="p">)):</span>
18391841
<span class="n">cachedValue</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">_cachedValue</span>
18401842
<span class="k">if</span> <span class="n">cachedValue</span> <span class="ow">and</span> <span class="n">cachedValue</span><span class="p">[</span><span class="mi">1</span><span class="p">]</span> <span class="o">==</span> <span class="n">value</span><span class="p">:</span>

‎devel/_modules/sqlobject/include/tests/test_hashcol.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ <h1>Source code for sqlobject.include.tests.test_hashcol</h1><div class="highlig
9494

9595

9696
<div class="viewcode-block" id="HashTest"><a class="viewcode-back" href="../../../../api/sqlobject.include.tests.test_hashcol.html#sqlobject.include.tests.test_hashcol.HashTest">[docs]</a><span class="k">class</span> <span class="nc">HashTest</span><span class="p">(</span><span class="n">SQLObject</span><span class="p">):</span>
97-
<span class="n">count</span> <span class="o">=</span> <span class="n">IntCol</span><span class="p">(</span><span class="n">alternateID</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span>
97+
<span class="n">so_count</span> <span class="o">=</span> <span class="n">IntCol</span><span class="p">(</span><span class="n">alternateID</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span>
9898
<span class="n">col1</span> <span class="o">=</span> <span class="n">hashcol</span><span class="o">.</span><span class="n">HashCol</span><span class="p">()</span>
9999
<span class="n">col2</span> <span class="o">=</span> <span class="n">hashcol</span><span class="o">.</span><span class="n">HashCol</span><span class="p">(</span><span class="n">hashMethod</span><span class="o">=</span><span class="n">sha256_str</span><span class="p">)</span></div>
100100

@@ -108,7 +108,7 @@ <h1>Source code for sqlobject.include.tests.test_hashcol</h1><div class="highlig
108108
<span class="n">items</span> <span class="o">=</span> <span class="p">[]</span>
109109
<span class="n">setupClass</span><span class="p">(</span><span class="n">HashTest</span><span class="p">)</span>
110110
<span class="k">for</span> <span class="n">i</span><span class="p">,</span> <span class="n">s</span> <span class="ow">in</span> <span class="nb">enumerate</span><span class="p">(</span><span class="n">data</span><span class="p">):</span>
111-
<span class="n">items</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">HashTest</span><span class="p">(</span><span class="n">count</span><span class="o">=</span><span class="n">i</span><span class="p">,</span> <span class="n">col1</span><span class="o">=</span><span class="n">s</span><span class="p">,</span> <span class="n">col2</span><span class="o">=</span><span class="n">s</span><span class="p">))</span></div>
111+
<span class="n">items</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">HashTest</span><span class="p">(</span><span class="n">so_count</span><span class="o">=</span><span class="n">i</span><span class="p">,</span> <span class="n">col1</span><span class="o">=</span><span class="n">s</span><span class="p">,</span> <span class="n">col2</span><span class="o">=</span><span class="n">s</span><span class="p">))</span></div>
112112

113113

114114
<div class="viewcode-block" id="test_create"><a class="viewcode-back" href="../../../../api/sqlobject.include.tests.test_hashcol.html#sqlobject.include.tests.test_hashcol.test_create">[docs]</a><span class="k">def</span> <span class="nf">test_create</span><span class="p">():</span>
@@ -119,13 +119,13 @@ <h1>Source code for sqlobject.include.tests.test_hashcol</h1><div class="highlig
119119

120120
<span class="n">conn</span> <span class="o">=</span> <span class="n">HashTest</span><span class="o">.</span><span class="n">_connection</span>
121121
<span class="n">rows</span> <span class="o">=</span> <span class="n">conn</span><span class="o">.</span><span class="n">queryAll</span><span class="p">(</span><span class="s2">&quot;&quot;&quot;</span>
122-
<span class="s2"> SELECT count, col1, col2</span>
122+
<span class="s2"> SELECT so_count, col1, col2</span>
123123
<span class="s2"> FROM hash_test</span>
124-
<span class="s2"> ORDER BY count</span>
124+
<span class="s2"> ORDER BY so_count</span>
125125
<span class="s2"> &quot;&quot;&quot;</span><span class="p">)</span>
126-
<span class="k">for</span> <span class="n">count</span><span class="p">,</span> <span class="n">col1</span><span class="p">,</span> <span class="n">col2</span> <span class="ow">in</span> <span class="n">rows</span><span class="p">:</span>
127-
<span class="k">assert</span> <span class="n">md5_str</span><span class="p">(</span><span class="n">data</span><span class="p">[</span><span class="n">count</span><span class="p">])</span> <span class="o">==</span> <span class="n">col1</span>
128-
<span class="k">assert</span> <span class="n">sha256_str</span><span class="p">(</span><span class="n">data</span><span class="p">[</span><span class="n">count</span><span class="p">])</span> <span class="o">==</span> <span class="n">col2</span></div>
126+
<span class="k">for</span> <span class="n">so_count</span><span class="p">,</span> <span class="n">col1</span><span class="p">,</span> <span class="n">col2</span> <span class="ow">in</span> <span class="n">rows</span><span class="p">:</span>
127+
<span class="k">assert</span> <span class="n">md5_str</span><span class="p">(</span><span class="n">data</span><span class="p">[</span><span class="n">so_count</span><span class="p">])</span> <span class="o">==</span> <span class="n">col1</span>
128+
<span class="k">assert</span> <span class="n">sha256_str</span><span class="p">(</span><span class="n">data</span><span class="p">[</span><span class="n">so_count</span><span class="p">])</span> <span class="o">==</span> <span class="n">col2</span></div>
129129

130130

131131
<div class="viewcode-block" id="test_select"><a class="viewcode-back" href="../../../../api/sqlobject.include.tests.test_hashcol.html#sqlobject.include.tests.test_hashcol.test_select">[docs]</a><span class="k">def</span> <span class="nf">test_select</span><span class="p">():</span>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ <h1>Source code for sqlobject.inheritance.tests.test_asdict</h1><div class="high
9090

9191
<div class="viewcode-block" id="EmployeeAD"><a class="viewcode-back" href="../../../../api/sqlobject.inheritance.tests.test_asdict.html#sqlobject.inheritance.tests.test_asdict.EmployeeAD">[docs]</a><span class="k">class</span> <span class="nc">EmployeeAD</span><span class="p">(</span><span class="n">InheritablePersonAD</span><span class="p">):</span>
9292
<span class="n">_inheritable</span> <span class="o">=</span> <span class="kc">False</span>
93-
<span class="n">position</span> <span class="o">=</span> <span class="n">StringCol</span><span class="p">()</span></div>
93+
<span class="n">so_position</span> <span class="o">=</span> <span class="n">StringCol</span><span class="p">()</span></div>
9494

9595

9696
<div class="viewcode-block" id="test_getColumns"><a class="viewcode-back" href="../../../../api/sqlobject.inheritance.tests.test_asdict.html#sqlobject.inheritance.tests.test_asdict.test_getColumns">[docs]</a><span class="k">def</span> <span class="nf">test_getColumns</span><span class="p">():</span>
@@ -99,7 +99,7 @@ <h1>Source code for sqlobject.inheritance.tests.test_asdict</h1><div class="high
9999
<span class="k">for</span> <span class="n">klass</span><span class="p">,</span> <span class="n">columns</span> <span class="ow">in</span> <span class="p">(</span>
100100
<span class="p">(</span><span class="n">InheritablePersonAD</span><span class="p">,</span> <span class="p">[</span><span class="s1">&#39;firstName&#39;</span><span class="p">,</span> <span class="s1">&#39;lastName&#39;</span><span class="p">]),</span>
101101
<span class="p">(</span><span class="n">ManagerAD</span><span class="p">,</span> <span class="p">[</span><span class="s1">&#39;department&#39;</span><span class="p">,</span> <span class="s1">&#39;firstName&#39;</span><span class="p">,</span> <span class="s1">&#39;lastName&#39;</span><span class="p">]),</span>
102-
<span class="p">(</span><span class="n">EmployeeAD</span><span class="p">,</span> <span class="p">[</span><span class="s1">&#39;firstName&#39;</span><span class="p">,</span> <span class="s1">&#39;lastName&#39;</span><span class="p">,</span> <span class="s1">&#39;position&#39;</span><span class="p">])):</span>
102+
<span class="p">(</span><span class="n">EmployeeAD</span><span class="p">,</span> <span class="p">[</span><span class="s1">&#39;firstName&#39;</span><span class="p">,</span> <span class="s1">&#39;lastName&#39;</span><span class="p">,</span> <span class="s1">&#39;so_position&#39;</span><span class="p">])):</span>
103103
<span class="n">_columns</span> <span class="o">=</span> <span class="nb">sorted</span><span class="p">(</span><span class="n">klass</span><span class="o">.</span><span class="n">sqlmeta</span><span class="o">.</span><span class="n">getColumns</span><span class="p">()</span><span class="o">.</span><span class="n">keys</span><span class="p">())</span>
104104
<span class="k">assert</span> <span class="n">_columns</span> <span class="o">==</span> <span class="n">columns</span></div>
105105

@@ -109,15 +109,15 @@ <h1>Source code for sqlobject.inheritance.tests.test_asdict</h1><div class="high
109109
<span class="n">InheritablePersonAD</span><span class="p">(</span><span class="n">firstName</span><span class="o">=</span><span class="s1">&#39;Oneof&#39;</span><span class="p">,</span> <span class="n">lastName</span><span class="o">=</span><span class="s1">&#39;Authors&#39;</span><span class="p">)</span>
110110
<span class="n">ManagerAD</span><span class="p">(</span><span class="n">firstName</span><span class="o">=</span><span class="s1">&#39;ManagerAD&#39;</span><span class="p">,</span> <span class="n">lastName</span><span class="o">=</span><span class="s1">&#39;The&#39;</span><span class="p">,</span> <span class="n">department</span><span class="o">=</span><span class="s1">&#39;Dep&#39;</span><span class="p">)</span>
111111
<span class="n">EmployeeAD</span><span class="p">(</span><span class="n">firstName</span><span class="o">=</span><span class="s1">&#39;Project&#39;</span><span class="p">,</span> <span class="n">lastName</span><span class="o">=</span><span class="s1">&#39;Leader&#39;</span><span class="p">,</span>
112-
<span class="n">position</span><span class="o">=</span><span class="s1">&#39;Project leader&#39;</span><span class="p">)</span>
112+
<span class="n">so_position</span><span class="o">=</span><span class="s1">&#39;Project leader&#39;</span><span class="p">)</span>
113113

114114
<span class="k">assert</span> <span class="n">InheritablePersonAD</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="mi">1</span><span class="p">)</span><span class="o">.</span><span class="n">sqlmeta</span><span class="o">.</span><span class="n">asDict</span><span class="p">()</span> <span class="o">==</span> \
115115
<span class="nb">dict</span><span class="p">(</span><span class="n">firstName</span><span class="o">=</span><span class="s1">&#39;Oneof&#39;</span><span class="p">,</span> <span class="n">lastName</span><span class="o">=</span><span class="s1">&#39;Authors&#39;</span><span class="p">,</span> <span class="nb">id</span><span class="o">=</span><span class="mi">1</span><span class="p">)</span>
116116
<span class="k">assert</span> <span class="n">InheritablePersonAD</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="mi">2</span><span class="p">)</span><span class="o">.</span><span class="n">sqlmeta</span><span class="o">.</span><span class="n">asDict</span><span class="p">()</span> <span class="o">==</span> \
117117
<span class="nb">dict</span><span class="p">(</span><span class="n">firstName</span><span class="o">=</span><span class="s1">&#39;ManagerAD&#39;</span><span class="p">,</span> <span class="n">lastName</span><span class="o">=</span><span class="s1">&#39;The&#39;</span><span class="p">,</span> <span class="n">department</span><span class="o">=</span><span class="s1">&#39;Dep&#39;</span><span class="p">,</span> <span class="nb">id</span><span class="o">=</span><span class="mi">2</span><span class="p">)</span>
118118
<span class="k">assert</span> <span class="n">InheritablePersonAD</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="mi">3</span><span class="p">)</span><span class="o">.</span><span class="n">sqlmeta</span><span class="o">.</span><span class="n">asDict</span><span class="p">()</span> <span class="o">==</span> \
119119
<span class="nb">dict</span><span class="p">(</span><span class="n">firstName</span><span class="o">=</span><span class="s1">&#39;Project&#39;</span><span class="p">,</span> <span class="n">lastName</span><span class="o">=</span><span class="s1">&#39;Leader&#39;</span><span class="p">,</span>
120-
<span class="n">position</span><span class="o">=</span><span class="s1">&#39;Project leader&#39;</span><span class="p">,</span> <span class="nb">id</span><span class="o">=</span><span class="mi">3</span><span class="p">)</span></div>
120+
<span class="n">so_position</span><span class="o">=</span><span class="s1">&#39;Project leader&#39;</span><span class="p">,</span> <span class="nb">id</span><span class="o">=</span><span class="mi">3</span><span class="p">)</span></div>
121121
</pre></div>
122122

123123
</div>

0 commit comments

Comments
(0)

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