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 1fae4a0

Browse files
committed
Update devel docs: fix a number of bugs in MSSQLConnection
1 parent 9dea38d commit 1fae4a0

28 files changed

+290
-986
lines changed

‎devel/News.html

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ <h3><a href="index.html">Table Of Contents</a></h3>
6262
<li><a class="reference internal" href="#sqlobject-3-2-0-master">SQLObject 3.2.0 (master)</a><ul>
6363
<li><a class="reference internal" href="#minor-features">Minor features</a></li>
6464
<li><a class="reference internal" href="#drivers-work-in-progress">Drivers (work in progress)</a></li>
65+
<li><a class="reference internal" href="#bug-fix">Bug fix</a></li>
6566
<li><a class="reference internal" href="#documentation">Documentation</a></li>
6667
<li><a class="reference internal" href="#tests">Tests</a></li>
6768
</ul>
@@ -124,22 +125,23 @@ <h1>News<a class="headerlink" href="#news" title="Permalink to this headline">¶
124125
<li><a class="reference internal" href="#sqlobject-3-2-0-master" id="id8">SQLObject 3.2.0 (master)</a><ul>
125126
<li><a class="reference internal" href="#minor-features" id="id9">Minor features</a></li>
126127
<li><a class="reference internal" href="#drivers-work-in-progress" id="id10">Drivers (work in progress)</a></li>
127-
<li><a class="reference internal" href="#documentation" id="id11">Documentation</a></li>
128-
<li><a class="reference internal" href="#tests" id="id12">Tests</a></li>
128+
<li><a class="reference internal" href="#bug-fix" id="id11">Bug fix</a></li>
129+
<li><a class="reference internal" href="#documentation" id="id12">Documentation</a></li>
130+
<li><a class="reference internal" href="#tests" id="id13">Tests</a></li>
129131
</ul>
130132
</li>
131-
<li><a class="reference internal" href="#sqlobject-3-1-0" id="id13">SQLObject 3.1.0</a><ul>
132-
<li><a class="reference internal" href="#features" id="id14">Features</a></li>
133-
<li><a class="reference internal" href="#id1" id="id15">Documentation</a></li>
134-
<li><a class="reference internal" href="#source-code" id="id16">Source code</a></li>
135-
<li><a class="reference internal" href="#id2" id="id17">Tests</a></li>
133+
<li><a class="reference internal" href="#sqlobject-3-1-0" id="id14">SQLObject 3.1.0</a><ul>
134+
<li><a class="reference internal" href="#features" id="id15">Features</a></li>
135+
<li><a class="reference internal" href="#id1" id="id16">Documentation</a></li>
136+
<li><a class="reference internal" href="#source-code" id="id17">Source code</a></li>
137+
<li><a class="reference internal" href="#id2" id="id18">Tests</a></li>
136138
</ul>
137139
</li>
138-
<li><a class="reference internal" href="#sqlobject-3-0-0" id="id18">SQLObject 3.0.0</a><ul>
139-
<li><a class="reference internal" href="#id3" id="id19">Features</a></li>
140-
<li><a class="reference internal" href="#id4" id="id20">Minor features</a></li>
141-
<li><a class="reference internal" href="#development" id="id21">Development</a></li>
142-
<li><a class="reference internal" href="#id5" id="id22">Documentation</a></li>
140+
<li><a class="reference internal" href="#sqlobject-3-0-0" id="id19">SQLObject 3.0.0</a><ul>
141+
<li><a class="reference internal" href="#id3" id="id20">Features</a></li>
142+
<li><a class="reference internal" href="#id4" id="id21">Minor features</a></li>
143+
<li><a class="reference internal" href="#development" id="id22">Development</a></li>
144+
<li><a class="reference internal" href="#id5" id="id23">Documentation</a></li>
143145
</ul>
144146
</li>
145147
</ul>
@@ -156,9 +158,9 @@ <h3>Minor features<a class="headerlink" href="#minor-features" title="Permalink
156158
the name of the attached database to vacuum.</li>
157159
<li>Remove <code class="docutils literal"><span class="pre">driver</span></code> keyword from RdbhostConnection as it allows one driver
158160
<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-
&#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>
161+
<li>Add <code class="docutils literal"><span class="pre">driver</span></code> keyword for FirebirdConnection. Allowed values are &#8216;fdb&#8217;
162+
or &#8216;kinterbasdb&#8217;. Default is to test &#8216;fdb&#8217; and &#8216;kinterbasdb&#8217; in that
163+
order. pyfirebirdsql is supported but has problems.</li>
162164
<li>Add <code class="docutils literal"><span class="pre">driver</span></code> keyword for MySQLConnection. Allowed value are &#8216;mysqldb&#8217;,
163165
&#8216;connector&#8217;, &#8216;oursql&#8217; and &#8216;pymysql&#8217;. Default is to test for mysqldb only.</li>
164166
<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
@@ -168,6 +170,8 @@ <h3>Minor features<a class="headerlink" href="#minor-features" title="Permalink
168170
driver (Python 2.6 and 2.7 until oursql fixes python 3 compatibility).</li>
169171
<li>Add support for <a class="reference external" href="https://github.com/PyMySQL/PyMySQL/">PyMySQL</a> - pure
170172
python mysql interface).</li>
173+
<li>Add parameter <code class="docutils literal"><span class="pre">timeout</span></code> for MSSQLConnection (usable only with pymssql
174+
driver); timeouts are in seconds.</li>
171175
</ul>
172176
</div>
173177
<div class="section" id="drivers-work-in-progress">
@@ -182,6 +186,17 @@ <h3>Drivers (work in progress)<a class="headerlink" href="#drivers-work-in-progr
182186
<li>Add support for <a class="reference external" href="https://pypi.python.org/pypi/firebirdsql">pyfirebirdsql</a>.</li>
183187
</ul>
184188
</div>
189+
<div class="section" id="bug-fix">
190+
<h3>Bug fix<a class="headerlink" href="#bug-fix" title="Permalink to this headline"></a></h3>
191+
<ul class="simple">
192+
<li>Fix MSSQLConnection.columnsFromSchema: remove () from default value.</li>
193+
<li>Fix MSSQLConnection and SybaseConnection: insert default values into a table
194+
with just one IDENTITY column.</li>
195+
<li>Remove excessive NULLs for MSSQL/Sybase.</li>
196+
<li>Fix concatenation operator for MSSQL/Sybase (it&#8217;s <code class="docutils literal"><span class="pre">+</span></code>, not <code class="docutils literal"><span class="pre">||</span></code>).</li>
197+
<li>Fix MSSQLConnection.server_version() under Py3 (decode version to str).</li>
198+
</ul>
199+
</div>
185200
<div class="section" id="documentation">
186201
<h3>Documentation<a class="headerlink" href="#documentation" title="Permalink to this headline"></a></h3>
187202
<ul class="simple">
@@ -201,7 +216,7 @@ <h3>Tests<a class="headerlink" href="#tests" title="Permalink to this headline">
201216
<li>Tests are now run at CIs with <code class="docutils literal"><span class="pre">python3.5</span></code>.</li>
202217
<li>Drop <code class="docutils literal"><span class="pre">Circle</span> <span class="pre">CI</span></code>.</li>
203218
<li>Run at Travis CI tests with Firebird backend (server version 2.5; drivers fdb
204-
and firebirdsql). There are some problems with tests.</li>
219+
and firebirdsql). There are problems with tests.</li>
205220
<li>Add AppVeyor for windows testing. Run tests with Postgres and MS SQL. There
206221
are problems with MS SQL.</li>
207222
<li>Run sqlite tests at AppVeyor.</li>

‎devel/_modules/sqlobject/col.html

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -611,8 +611,6 @@ <h1>Source code for sqlobject.col</h1><div class="highlight"><pre>
611611
<span class="k">def</span> <span class="nf">_sybaseType</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
612612
<span class="bp">self</span><span class="o">.</span><span class="n">_check_case_sensitive</span><span class="p">(</span><span class="s2">&quot;SYBASE&quot;</span><span class="p">)</span>
613613
<span class="nb">type</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">_sqlType</span><span class="p">()</span>
614-
<span class="k">if</span> <span class="ow">not</span> <span class="bp">self</span><span class="o">.</span><span class="n">notNone</span> <span class="ow">and</span> <span class="ow">not</span> <span class="bp">self</span><span class="o">.</span><span class="n">alternateID</span><span class="p">:</span>
615-
<span class="nb">type</span> <span class="o">+=</span> <span class="s1">&#39; NULL&#39;</span>
616614
<span class="k">return</span> <span class="nb">type</span>
617615

618616
<span class="k">def</span> <span class="nf">_mssqlType</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
@@ -627,8 +625,6 @@ <h1>Source code for sqlobject.col</h1><div class="highlight"><pre>
627625
<span class="nb">type</span> <span class="o">=</span> <span class="s1">&#39;VARCHAR(</span><span class="si">%i</span><span class="s1">)&#39;</span> <span class="o">%</span> <span class="bp">self</span><span class="o">.</span><span class="n">length</span>
628626
<span class="k">else</span><span class="p">:</span>
629627
<span class="nb">type</span> <span class="o">=</span> <span class="s1">&#39;CHAR(</span><span class="si">%i</span><span class="s1">)&#39;</span> <span class="o">%</span> <span class="bp">self</span><span class="o">.</span><span class="n">length</span>
630-
<span class="k">if</span> <span class="ow">not</span> <span class="bp">self</span><span class="o">.</span><span class="n">notNone</span> <span class="ow">and</span> <span class="ow">not</span> <span class="bp">self</span><span class="o">.</span><span class="n">alternateID</span><span class="p">:</span>
631-
<span class="nb">type</span> <span class="o">+=</span> <span class="s1">&#39; NULL&#39;</span>
632628
<span class="k">return</span> <span class="nb">type</span>
633629

634630
<span class="k">def</span> <span class="nf">_firebirdType</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
@@ -698,7 +694,6 @@ <h1>Source code for sqlobject.col</h1><div class="highlight"><pre>
698694

699695
<span class="k">class</span> <span class="nc">NQuoted</span><span class="p">(</span><span class="n">sqlbuilder</span><span class="o">.</span><span class="n">SQLExpression</span><span class="p">):</span>
700696
<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">value</span><span class="p">):</span>
701-
<span class="k">assert</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">value</span><span class="p">,</span> <span class="n">unicode_type</span><span class="p">)</span>
702697
<span class="bp">self</span><span class="o">.</span><span class="n">value</span> <span class="o">=</span> <span class="n">value</span>
703698

704699
<span class="k">def</span> <span class="nf">__hash__</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
@@ -739,6 +734,8 @@ <h1>Source code for sqlobject.col</h1><div class="highlight"><pre>
739734
<span class="k">pass</span>
740735
<span class="k">else</span><span class="p">:</span>
741736
<span class="k">if</span> <span class="n">connection</span><span class="o">.</span><span class="n">dbName</span> <span class="o">==</span> <span class="s1">&#39;mssql&#39;</span><span class="p">:</span>
737+
<span class="k">if</span> <span class="n">PY2</span><span class="p">:</span>
738+
<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="bp">self</span><span class="o">.</span><span class="n">getDbEncoding</span><span class="p">(</span><span class="n">state</span><span class="p">))</span>
742739
<span class="k">return</span> <span class="n">NQuoted</span><span class="p">(</span><span class="n">value</span><span class="p">)</span>
743740
<span class="k">return</span> <span class="n">value</span><span class="o">.</span><span class="n">encode</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">getDbEncoding</span><span class="p">(</span><span class="n">state</span><span class="p">))</span>
744741
<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>
@@ -966,11 +963,11 @@ <h1>Source code for sqlobject.col</h1><div class="highlight"><pre>
966963
<span class="k">return</span> <span class="bp">self</span><span class="o">.</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>
967964

968965
<span class="k">def</span> <span class="nf">_sybaseType</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
969-
<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;NUMERIC(18,0) 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>
966+
<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;NUMERIC(18,0)&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>
970967
<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>
971968

972969
<span class="k">def</span> <span class="nf">_mssqlType</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
973-
<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>
970+
<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>
974971
<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>
975972

976973
<span class="k">def</span> <span class="nf">_firebirdType</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>

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

Lines changed: 1 addition & 1 deletion
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,firebirdsql&#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&#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>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ <h1>Source code for sqlobject.inheritance.tests.test_indexes</h1><div class="hig
9797
<span class="n">setupClass</span><span class="p">([</span><span class="n">InhPersonIdxGet</span><span class="p">,</span> <span class="n">InhEmployeeIdxGet</span><span class="p">,</span> <span class="n">InhSalesManIdxGet</span><span class="p">])</span>
9898

9999
<span class="n">InhSalesManIdxGet</span><span class="p">(</span><span class="n">first_name</span><span class="o">=</span><span class="s1">&#39;Michael&#39;</span><span class="p">,</span> <span class="n">last_name</span><span class="o">=</span><span class="s1">&#39;Pallin&#39;</span><span class="p">,</span> <span class="n">age</span><span class="o">=</span><span class="mi">65</span><span class="p">,</span>
100-
<span class="n">security_number</span><span class="o">=</span><span class="mi">2304</span><span class="p">,</span> <span class="n">experience</span><span class="o">=</span><span class="mi">2</span><span class="p">,</span> <span class="n">skill</span><span class="o">=</span><span class="mi">10</span><span class="p">)</span>
100+
<span class="n">security_number</span><span class="o">=</span><span class="mi">2304</span><span class="p">,</span> <span class="n">experience</span><span class="o">=</span><span class="mi">2</span><span class="p">,</span> <span class="n">skill</span><span class="o">=</span><span class="mi">10</span><span class="p">)</span>
101101
<span class="n">InhEmployeeIdxGet</span><span class="p">(</span><span class="n">first_name</span><span class="o">=</span><span class="s1">&#39;Eric&#39;</span><span class="p">,</span> <span class="n">last_name</span><span class="o">=</span><span class="s1">&#39;Idle&#39;</span><span class="p">,</span> <span class="n">age</span><span class="o">=</span><span class="mi">63</span><span class="p">,</span>
102-
<span class="n">security_number</span><span class="o">=</span><span class="mi">3402</span><span class="p">,</span> <span class="n">experience</span><span class="o">=</span><span class="mi">9</span><span class="p">)</span>
102+
<span class="n">security_number</span><span class="o">=</span><span class="mi">3402</span><span class="p">,</span> <span class="n">experience</span><span class="o">=</span><span class="mi">9</span><span class="p">)</span>
103103
<span class="n">InhPersonIdxGet</span><span class="p">(</span><span class="n">first_name</span><span class="o">=</span><span class="s1">&#39;Terry&#39;</span><span class="p">,</span> <span class="n">last_name</span><span class="o">=</span><span class="s1">&#39;Guilliam&#39;</span><span class="p">,</span> <span class="n">age</span><span class="o">=</span><span class="mi">64</span><span class="p">)</span>
104104

105105
<span class="n">InhPersonIdxGet</span><span class="o">.</span><span class="n">pk</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;Michael&#39;</span><span class="p">,</span> <span class="s1">&#39;Pallin&#39;</span><span class="p">)</span>

0 commit comments

Comments
(0)

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