diff options
| author | Derek Allard <derek.allard@ellislab.com> | 2008-01-19 18:55:42 +0100 |
|---|---|---|
| committer | Derek Allard <derek.allard@ellislab.com> | 2008-01-19 18:55:42 +0100 |
| commit | ca06da4b58aa38617ee8bb2f4c4d5c6a58e59db0 (patch) | |
| tree | 015af51f4e1caa108be71e341b982773e2539ec1 | |
| parent | 6ddf2d582ef9aab4c4bdc2cb339c156022df211e (diff) | |
guide fixes, remove 1.5.5 update file
| -rw-r--r-- | user_guide/database/active_record.html | 26 | ||||
| -rw-r--r-- | user_guide/installation/upgrade_155.html | 101 |
2 files changed, 7 insertions, 120 deletions
diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 696b71171..4ba5bfd96 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -311,7 +311,7 @@ $this->db->or_where('id >', $id); <p>Generates a WHERE field IN ('item', 'item') SQL query joined with OR if appropriate</p>
<p><code>
$names = array('Frank', 'Todd', 'James');<br />
- $this->db->where_in_or('username', $names);<br />
+ $this->db->or_where_in('username', $names);<br />
// Produces: OR WHERE username IN ('Frank', 'Todd', 'James')</code></p>
<h2>$this->db->where_not_in();</h2>
@@ -325,22 +325,9 @@ $this->db->or_where('id >', $id); <p>Generates a WHERE field NOT IN ('item', 'item') SQL query joined with OR if appropriate</p>
<p><code>
$names = array('Frank', 'Todd', 'James');<br />
- $this->db->where_in('username', $names);<br />
+ $this->db->or_where_not_in('username', $names);<br />
// Produces: OR WHERE username NOT IN ('Frank', 'Todd', 'James')</code></p>
-<h2>$this->db->raw_where();</h2>
-<p> Generates an unfiltered WHERE portion of the query exactly as the developer passes it. Separates multiple calls with AND<br />
- <code> $this->db->raw_where('(grade > 50 AND grade < 75)');<br />
- // Produces: AND WHERE (grade > 50 AND grade < 75)</code></p>
-
-<h2>$this->db->raw_or_where();</h2>
-<p> Generates an unfiltered WHERE portion of the query exactly as the developer passes it. Separates multiple calls with OR<br />
- <code> $this->db->raw_where('(grade > 50 AND grade < 75)');<br />
- // Produces: OR WHERE (grade > 50 AND grade < 75)</code></p>
-
-<p class="important"><strong>Note:</strong> All values passed through raw_where() and raw_or_where() are <strong>not</strong> escaped automatically, or otherwise touched. It is the responsibility of the developer to ensure all queries are safe. Consider using <a href="queries.html"><dfn>protect_identifiers()</dfn></a> and <a href="helpers.html">escaping your queries </a>as appropriate.</p>
-
-
<h2>$this->db->like();</h2>
<p>This function enables you to generate <strong>LIKE</strong> clauses, useful for doing searches.</p>
@@ -403,7 +390,7 @@ $this->db->or_like('body', $match); <code> $this->db->like('title', 'match');<br />
$this->db->or_not_like('body', 'match'); <br />
<br />
-// WHERE title LIKE '%match% OR body NOT LIKE 'match'</code>
+// WHERE title LIKE '%match% OR body NOT LIKE '%match%'</code>
<h2>$this->db->group_by();</h2>
<p>Permits you to write the GROUP BY portion of your query:</p>
@@ -430,14 +417,15 @@ $this->db->or_not_like('body', 'match'); <br /> <p>Permits you to write the HAVING portion of your query:</p>
<code>$this->db->having('user_id = 45');
-<br /><br />// Produces: HAVING 'user_id = 45'
-</code>
+<br /><br />
+// Produces: HAVING user_id = 45</code>
<p>You can also pass an array of multiple values as well:</p>
<code>$this->db->having(array('title =' => 'My Title', 'id <' => $id));
-<br /><br />// Produces: HAVING title = 'My Title', 'id < 45'</code>
+<br /><br />
+// Produces: HAVING title = 'My Title', id < 45</code>
diff --git a/user_guide/installation/upgrade_155.html b/user_guide/installation/upgrade_155.html deleted file mode 100644 index 33f6d6d69..000000000 --- a/user_guide/installation/upgrade_155.html +++ /dev/null @@ -1,101 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-
-<title>CodeIgniter User Guide : Upgrading from 1.5.3 to 1.5.4</title>
-
-<style type='text/css' media='all'>@import url('../userguide.css');</style>
-<link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
-
-<script type="text/javascript" src="../nav/nav.js"></script>
-<script type="text/javascript" src="../nav/prototype.lite.js"></script>
-<script type="text/javascript" src="../nav/moo.fx.js"></script>
-<script type="text/javascript" src="../nav/user_guide_menu.js"></script>
-
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta http-equiv='expires' content='-1' />
-<meta http-equiv= 'pragma' content='no-cache' />
-<meta name='robots' content='all' />
-<meta name='author' content='ExpressionEngine Dev Team' />
-<meta name='description' content='CodeIgniter User Guide' />
-
-</head>
-<body>
-
-<!-- START NAVIGATION -->
-<div id="nav"><div id="nav_inner"><script type="text/javascript">create_menu('../');</script></div></div>
-<div id="nav2"><a name="top"></a><a href="javascript:void(0);" onclick="myHeight.toggle();"><img src="../images/nav_toggle.jpg" width="153" height="44" border="0" title="Toggle Table of Contents" alt="Toggle Table of Contents" /></a></div>
-<div id="masthead">
-<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
-<tr>
-<td><h1>CodeIgniter User Guide Version 1.5.4</h1></td>
-<td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>
-</tr>
-</table>
-</div>
-<!-- END NAVIGATION -->
-
-
-<!-- START BREADCRUMB -->
-<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
-<tr>
-<td id="breadcrumb">
-<a href="http://www.codeigniter.com/">CodeIgniter Home</a> ›
-<a href="../index.html">User Guide Home</a> ›
-Upgrading from 1.5.3 to 1.5.4
-</td>
-<td id="searchbox"><form method="get" action="http://www.google.com/search"><input type="hidden" name="as_sitesearch" id="as_sitesearch" value="codeigniter.com/user_guide/" />Search User Guide <input type="text" class="input" style="width:200px;" name="q" id="q" size="31" maxlength="255" value="" /> <input type="submit" class="submit" name="sa" value="Go" /></form></td>
-</tr>
-</table>
-<!-- END BREADCRUMB -->
-
-<br clear="all" />
-
-
-<!-- START CONTENT -->
-<div id="content">
-
-<h1>Upgrading from 1.5.4 to 1.5.5</h1>
-
-<p>Before performing an update you should take your site offline by replacing the index.php file with a static one.</p>
-
-
-
-<h2>Step 1: Update your CodeIgniter files</h2>
-
-<p>Replace these files and directories in your "system" folder with the new versions:</p>
-
-<ul>
-
-<li><dfn>system/codeigniter</dfn></li>
-<li><dfn>system/database</dfn></li>
-<li><dfn>system/helpers</dfn></li>
-<li><dfn>system/libraries</dfn></li>
-<li><dfn>system/plugins</dfn></li>
-</ul>
-
-<p class="important"><strong>Note:</strong> If you have any custom developed files in these folders please make copies of them first.</p>
-
-<h2>Step 2: Add time_to_update to your config.php </h2>
-<p>Add the following to system/application/config/config.php with the other </p>
-<code>$config['sess_time_to_update'] = 300;</code>
-<h2>Step 3: Update your user guide</h2>
-<p>Please also replace your local copy of the user guide with the new version.</p>
-
-</div>
-<!-- END CONTENT -->
-
-
-<div id="footer">
-<p>
-Previous Topic: <a href="index.html">Installation Instructions</a>
- ·
-<a href="#top">Top of Page</a> ·
-<a href="../index.html">User Guide Home</a> ·
-Next Topic: <a href="../overview/at_a_glance.html">CodeIgniter at a Glance</a>
-</p>
-<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
-</div>
-
-</body>
-</html>
\ No newline at end of file |