From c644128fdd49a47d791240e0e38b54cd22412bc5 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 4 Jul 2007 23:54:32 +0000 Subject: fixed validation errors... about a zillion of em. --- user_guide/database/active_record.html | 6 +++--- user_guide/database/caching.html | 2 +- user_guide/database/call_function.html | 2 +- user_guide/database/configuration.html | 4 ++-- user_guide/database/connecting.html | 8 +++----- user_guide/database/examples.html | 2 +- user_guide/database/fields.html | 2 +- user_guide/database/helpers.html | 2 +- user_guide/database/index.html | 2 +- user_guide/database/queries.html | 8 +++----- user_guide/database/results.html | 8 ++++---- user_guide/database/table_data.html | 2 +- user_guide/database/transactions.html | 6 +++--- user_guide/database/utilities.html | 4 ++-- 14 files changed, 27 insertions(+), 31 deletions(-) (limited to 'user_guide/database') diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 5d58f6bd4..573c67408 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -369,7 +369,7 @@ The second parameter lets you set the direction of the result. Options are $this->db->limit(); -

Lets you limit the number of rows you would like returned by the query: +

Lets you limit the number of rows you would like returned by the query:

$this->db->limit(10);
@@ -565,7 +565,7 @@ $this->db->delete('mytable', array('id' => $id)); // WHERE id = $id

The first parameter is the table name, the second is the where clause. You can also use the where() or orwhere() functions instead of passing -the data to the second parameter of the function: +the data to the second parameter of the function:

$this->db->where('id', $id);
@@ -603,7 +603,7 @@ Previous Topic:  Query Helper Functions Top of Page   ·   User Guide Home   ·   Next Topic:  Transactions -

+

CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

diff --git a/user_guide/database/caching.html b/user_guide/database/caching.html index da1e08edd..2e4d16e47 100644 --- a/user_guide/database/caching.html +++ b/user_guide/database/caching.html @@ -217,7 +217,7 @@ Previous Topic:  Custom Function CallsTop of Page   ·   User Guide Home   ·   Next Topic:  Database Utilities Class -

+

CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

diff --git a/user_guide/database/call_function.html b/user_guide/database/call_function.html index 1e80ea54f..b439d4460 100644 --- a/user_guide/database/call_function.html +++ b/user_guide/database/call_function.html @@ -115,7 +115,7 @@ Previous Topic:  Field MetaData Top of Page   ·   User Guide Home   ·   Next Topic:  Query Caching -

+

CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html index b33f2b702..774790c60 100644 --- a/user_guide/database/configuration.html +++ b/user_guide/database/configuration.html @@ -66,7 +66,7 @@ Configuration

Database Configuration

CodeIgniter has a config file that lets you store your database connection values (username, password, database name, etc.). -The config file is located at: +The config file is located at:

application/config/database.php

@@ -137,7 +137,7 @@ Previous Topic:  Quck Start: Usage ExamplesTop of Page   ·   User Guide Home   ·   Next Topic:  Connecting to your Database -

+

CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html index aebca25be..e44c145e2 100644 --- a/user_guide/database/connecting.html +++ b/user_guide/database/connecting.html @@ -111,9 +111,9 @@ $config['active_r'] = TRUE;

$this->load->database($config); -

For information on each of these values please see the configuration page. +

For information on each of these values please see the configuration page.

-

Or you can submit your database values as a Data Source Name. DSNs must have this prototype: +

Or you can submit your database values as a Data Source Name. DSNs must have this prototype:

$dsn = 'dbdriver://username:password@hostname/database';

@@ -122,8 +122,6 @@ $this->load->database('$dsn');

Note that if you use a DSN you will not be able to specify some of the default values like you can if you use a connection array.

- -

Connecting to Multiple Databases

If you need to connect to more than one database simultaneously you can do so as follows:

@@ -164,7 +162,7 @@ Previous Topic:  Database ConfigurationTop of Page   ·   User Guide Home   ·   Next Topic:  Queries -

+

CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

diff --git a/user_guide/database/examples.html b/user_guide/database/examples.html index 7a8ec92d1..0d8faf3c2 100644 --- a/user_guide/database/examples.html +++ b/user_guide/database/examples.html @@ -214,7 +214,7 @@ Previous Topic:  Database Class Top of Page   ·   User Guide Home   ·   Next Topic:  Database Configuration -

+

CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html index 8d9d7b5d7..c01caae9b 100644 --- a/user_guide/database/fields.html +++ b/user_guide/database/fields.html @@ -165,7 +165,7 @@ Previous Topic:   Table Data Top of Page   ·   User Guide Home   ·   Next Topic:  Custom Function Calls -

+

CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html index 4742569d5..e6d0e461c 100644 --- a/user_guide/database/helpers.html +++ b/user_guide/database/helpers.html @@ -148,7 +148,7 @@ Previous Topic:  Query Results Top of Page   ·   User Guide Home   ·   Next Topic:  Active Record Pattern -

+

CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

diff --git a/user_guide/database/index.html b/user_guide/database/index.html index 2a57ebc12..c25233294 100644 --- a/user_guide/database/index.html +++ b/user_guide/database/index.html @@ -95,7 +95,7 @@ Previous Topic:  Config Class Top of Page   ·   User Guide Home   ·   Next Topic:  Quick Start: Usage Examples -

+

CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html index e55a5328a..013d64f33 100644 --- a/user_guide/database/queries.html +++ b/user_guide/database/queries.html @@ -95,15 +95,13 @@ CodeIgniter has two functions that help you do this:

  • $this->db->escape() This function determines the data type so that it can escape only string data. It also automatically adds single quotes around the data so you don't have to: -$sql = "INSERT INTO table (title) VALUES(".$this->db->escape($title).")"; +$sql = "INSERT INTO table (title) VALUES(".$this->db->escape($title).")";
  • $this->db->escape_str() This function escapes the data passed to it, regardless of type. Most of the time you'll use the above function rather then this one. Use the function like this: -$sql = "INSERT INTO table (title) VALUES('".$this->db->escape_str($title)."')"; - -
    • +$sql = "INSERT INTO table (title) VALUES('".$this->db->escape_str($title)."')"; @@ -134,7 +132,7 @@ Previous Topic:  Connecting to your Database Top of Page   ·   User Guide Home   ·   Next Topic:  Query Results -

    +

    CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

    diff --git a/user_guide/database/results.html b/user_guide/database/results.html index 5b25015bf..f6c1be124 100644 --- a/user_guide/database/results.html +++ b/user_guide/database/results.html @@ -134,7 +134,7 @@ Query Results } -

    If you want a specific row returned you can submit the row number as a digit in the first parameter: +

    If you want a specific row returned you can submit the row number as a digit in the first parameter:

    $row = $query->row(5); @@ -157,7 +157,7 @@ Query Results -

    If you want a specific row returned you can submit the row number as a digit in the first parameter: +

    If you want a specific row returned you can submit the row number as a digit in the first parameter:

    $row = $query->row_array(5); @@ -181,7 +181,7 @@ Query Results

    -
    +

    Result Helper Functions

    @@ -235,7 +235,7 @@ Previous Topic:  Queries Top of Page   ·   User Guide Home   ·   Next Topic:  Query Helper Functions -

    +

    CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

    diff --git a/user_guide/database/table_data.html b/user_guide/database/table_data.html index 6792e356f..13b96681a 100644 --- a/user_guide/database/table_data.html +++ b/user_guide/database/table_data.html @@ -110,7 +110,7 @@ Previous Topic:   Transactions Top of Page   ·   User Guide Home   ·   Next Topic:   Field Metadata -

    +

    CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

    diff --git a/user_guide/database/transactions.html b/user_guide/database/transactions.html index ecc5164d3..75aa4e887 100644 --- a/user_guide/database/transactions.html +++ b/user_guide/database/transactions.html @@ -122,7 +122,7 @@ if ($this->db->trans_status() === FALSE)

    Enabling Transactions

    Transactions are enabled automatically the moment you use $this->db->trans_start(). If you would like to disable transactions you -can do so using $this->db->trans_off(): +can do so using $this->db->trans_off():

    $this->db->trans_off()

    @@ -138,7 +138,7 @@ $this->db->trans_complete();

    Test Mode

    You can optionally put the transaction system into "test mode", which will cause your queries to be rolled back -- even if the queries produce a valid result. -To use test mode simply set the first parameter in the $this->db->trans_start() function to TRUE: +To use test mode simply set the first parameter in the $this->db->trans_start() function to TRUE:

    $this->db->trans_start(TRUE); // Query will be rolled back
    @@ -190,7 +190,7 @@ Previous Topic:   Field MetaData   Top of Page   ·   User Guide Home   ·   Next Topic:  Table Metadata -

    +

    CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

    diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html index a7601e85f..7de0ea3ed 100644 --- a/user_guide/database/utilities.html +++ b/user_guide/database/utilities.html @@ -205,7 +205,7 @@ echo $this->dbutil->csv_from_result($query);

    The second and third parameters allows you to -set the delimiter and newline character. By default tabs are used as the delimiter and "\n" is used as a new line. Example: +set the delimiter and newline character. By default tabs are used as the delimiter and "\n" is used as a new line. Example:

    $delimiter = ",";
    @@ -330,7 +330,7 @@ Previous Topic:  DB Caching Class Top of Page   ·   User Guide Home   ·   Next Topic:   Email Class -

    +

    CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

    -- cgit v1.2.3-24-g4f1b