summaryrefslogtreecommitdiffstats
path: root/system/database
AgeCommit message (Collapse)AuthorFilesLines
2011-08-21Merge commit 'v2.0.3' into workingFlorian Pritz14-227/+1369
Conflicts: .gitignore application/views/welcome_message.php user_guide/changelog.html user_guide/database/active_record.html user_guide/database/caching.html user_guide/database/call_function.html user_guide/database/configuration.html user_guide/database/connecting.html user_guide/database/examples.html user_guide/database/fields.html user_guide/database/forge.html user_guide/database/helpers.html user_guide/database/index.html user_guide/database/queries.html user_guide/database/results.html user_guide/database/table_data.html user_guide/database/transactions.html user_guide/database/utilities.html user_guide/doc_style/index.html user_guide/general/alternative_php.html user_guide/general/ancillary_classes.html user_guide/general/autoloader.html user_guide/general/caching.html user_guide/general/cli.html user_guide/general/common_functions.html user_guide/general/controllers.html user_guide/general/core_classes.html user_guide/general/creating_drivers.html user_guide/general/creating_libraries.html user_guide/general/credits.html user_guide/general/drivers.html user_guide/general/environments.html user_guide/general/errors.html user_guide/general/helpers.html user_guide/general/hooks.html user_guide/general/libraries.html user_guide/general/managing_apps.html user_guide/general/models.html user_guide/general/profiling.html user_guide/general/quick_reference.html user_guide/general/requirements.html user_guide/general/reserved_names.html user_guide/general/routing.html user_guide/general/security.html user_guide/general/styleguide.html user_guide/general/urls.html user_guide/general/views.html user_guide/helpers/array_helper.html user_guide/helpers/captcha_helper.html user_guide/helpers/cookie_helper.html user_guide/helpers/date_helper.html user_guide/helpers/directory_helper.html user_guide/helpers/download_helper.html user_guide/helpers/email_helper.html user_guide/helpers/file_helper.html user_guide/helpers/form_helper.html user_guide/helpers/html_helper.html user_guide/helpers/inflector_helper.html user_guide/helpers/language_helper.html user_guide/helpers/number_helper.html user_guide/helpers/path_helper.html user_guide/helpers/security_helper.html user_guide/helpers/smiley_helper.html user_guide/helpers/string_helper.html user_guide/helpers/text_helper.html user_guide/helpers/typography_helper.html user_guide/helpers/url_helper.html user_guide/helpers/xml_helper.html user_guide/index.html user_guide/installation/downloads.html user_guide/installation/index.html user_guide/installation/troubleshooting.html user_guide/installation/upgrade_120.html user_guide/installation/upgrade_130.html user_guide/installation/upgrade_131.html user_guide/installation/upgrade_132.html user_guide/installation/upgrade_133.html user_guide/installation/upgrade_140.html user_guide/installation/upgrade_141.html user_guide/installation/upgrade_150.html user_guide/installation/upgrade_152.html user_guide/installation/upgrade_153.html user_guide/installation/upgrade_154.html user_guide/installation/upgrade_160.html user_guide/installation/upgrade_161.html user_guide/installation/upgrade_162.html user_guide/installation/upgrade_163.html user_guide/installation/upgrade_170.html user_guide/installation/upgrade_171.html user_guide/installation/upgrade_172.html user_guide/installation/upgrade_200.html user_guide/installation/upgrade_201.html user_guide/installation/upgrade_202.html user_guide/installation/upgrade_b11.html user_guide/installation/upgrading.html user_guide/libraries/benchmark.html user_guide/libraries/caching.html user_guide/libraries/calendar.html user_guide/libraries/cart.html user_guide/libraries/config.html user_guide/libraries/email.html user_guide/libraries/encryption.html user_guide/libraries/file_uploading.html user_guide/libraries/form_validation.html user_guide/libraries/ftp.html user_guide/libraries/image_lib.html user_guide/libraries/input.html user_guide/libraries/javascript.html user_guide/libraries/language.html user_guide/libraries/loader.html user_guide/libraries/output.html user_guide/libraries/pagination.html user_guide/libraries/parser.html user_guide/libraries/security.html user_guide/libraries/sessions.html user_guide/libraries/table.html user_guide/libraries/trackback.html user_guide/libraries/typography.html user_guide/libraries/unit_testing.html user_guide/libraries/uri.html user_guide/libraries/user_agent.html user_guide/libraries/xmlrpc.html user_guide/libraries/zip.html user_guide/license.html user_guide/nav/nav.js user_guide/overview/appflow.html user_guide/overview/at_a_glance.html user_guide/overview/cheatsheets.html user_guide/overview/features.html user_guide/overview/getting_started.html user_guide/overview/goals.html user_guide/overview/index.html user_guide/overview/mvc.html user_guide/toc.html Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-08-13Fixed conflict in changelog.Phil Sturgeon1-1/+2
2011-08-13Fixed mysql and mysqli drivers to set NOT NULL as default for creating ↵Adam Jackett2-4/+12
fields. All other drivers were correct.
2011-08-13Fixed having method to insert quotes.Adam Jackett1-1/+1
2011-08-13Fixed conflicted changelog.Phil Sturgeon1-0/+15
2011-08-13Was working on this file so PHP5ified the method visibility scopes. ↵Phil Sturgeon1-154/+106
Pointless, but was adding...
2011-07-02hand merged remaining unresolved files following the backout of ↵Derek Jones35-203/+203
648b42a75739, which was a NON-trivial whitespace commit
2011-07-02backed out 648b42a75739, which was a NON-trivial whitespace commit. It ↵Derek Jones35-241/+241
broke the Typography class's string replacements, for instance
2011-06-15Merged Alex Bilbies MSSQL changes.philsturgeon35-280/+330
2011-05-06Fix #275 -- regression in db::_compile_select(). Thanks @patwork for the patchGreg Aker1-11/+15
2011-04-27merging in changesGreg Aker35-242/+247
2011-04-27Added insert_batch() function to the PostgreSQL database driver. Thanks to ↵Greg Aker1-0/+18
epallerols for the patch.
2011-04-25Fixed double-space typo.Razican35-241/+241
2011-04-23typo in modification to MySQLi driver. Fixes #236Derek Jones1-1/+1
2011-04-20Fixed a bug (Core #340) where when passing in the second parameter to ↵Greg Aker1-12/+8
$this->db->select(), column names in subsequent queries would not be properly escaped.
2011-04-19modified MySQL and MySQLi drivers to address a potential SQL injection ↵Derek Jones2-2/+32
attack vector when multi-byte character set connections are employed. (Does not impact Latin-1, UTF-8, etc. encodings)
2011-04-19Removing internal references to the EXT constant. Additionally, marked the ↵Greg Aker2-9/+9
constant as deprecated. Use ".php" instead. Also adding upgrade notes from 2.0.2 to 2.0.3.
2011-04-25Fixing up a tabs vs spaces inconsistency in DB_ResultGreg Aker1-39/+44
2011-04-10update to CI 2.0.2Florian Pritz13-53/+64
Signed-off-by: Florian Pritz <bluewind@server-speed.net>
2011-04-06Made Environment Support optional. Comment out or delete the constant to ↵Phil Sturgeon1-9/+4
stop environment checks.
2011-04-02Fixed issue #153 Escape Str Bug in MSSQL driverPhil Sturgeon1-3/+5
2011-03-25Fixed merge.Phil Sturgeon1-3/+3
2011-03-22->db->count_all_results() will now return an integer instead of a string.Phil Sturgeon1-2/+2
2011-03-18UpdatesAlex Bilbie2-145/+81
2011-03-18Renamed some classes in the driverAlex Bilbie4-8/+8
2011-03-13Updated affected_rowsAlex Bilbie1-1/+1
2011-03-13Added flag to return dates as strings instead of PHP date objects. Updated ↵Alex Bilbie1-3/+3
db_select
2011-03-10Think I've finished converting mssql commands to sqlsrv where appropriateAlex Bilbie2-11/+9
2011-03-10Added sqlsrv folder, added necessary files, started altering queries in ↵Alex Bilbie5-0/+1179
sqlsrv_driver.php
2011-03-08Fixed bug in escaping underscores etc in MSSQL LIKE conditions.davidhart1-3/+3
2011-02-15Better potential fix for escaping MySQL keywords with backticks on ↵Phil Sturgeon1-2/+2
insert/update.
2011-02-14Whitespace cleanup in db classesPascal Kriete12-33/+33
2011-02-14Uppercasing some stray lowercase keywords for code consistencyPascal Kriete2-7/+7
2011-02-09Reverted recent MySQL backtick escaping as some queries were double-escaping.Phil Sturgeon1-4/+4
2011-02-08MySQL Driver will now wrap field names for insert(), update() and replace() ↵Phil Sturgeon1-8/+8
with backticks (`) so fields like "default" and "order" will not cause SQL errors.
2011-02-02Merged recent changes and tweaked multi-env changes.Phil Sturgeon35-61/+244
2011-01-28update to CI 2.0Florian Pritz44-1577/+1905
Signed-off-by: Florian Pritz <bluewind@server-speed.net>
2011-01-27Automated merge with https://bitbucket.org/ellislab/codeigniterPhil Sturgeon3-15/+99
2011-01-16Changed loading process for database config to check for config for the set ↵joelcox1-1/+15
environment first.
2011-01-16sharing some work on model instancesJohn Crepezzi1-11/+74
2011-01-07Automated merge with http://hg.ellislab.com/CodeIgniter2Pascal Kriete35-50/+101
2011-01-07Adding batch insert and batch update to the mysqli driver.Pascal Kriete1-0/+69
2011-01-05Hey look, it's 2011Greg Aker35-35/+35
2011-01-05Use arrays in DBForge for constraint for things like decimal, float, ↵Phil Sturgeon1-4/+19
numeric, enum and set.
2010-12-21Fix #93 Updating postgres dbforge create table method. Thanks to James ↵Greg Aker1-15/+66
Gifford for the patch. http://codeigniter.com/forums/viewthread/73392/
2010-12-15Name can be omiitted from ->dbforge->modify_column()'s 2nd param if you ↵Phil Sturgeon1-0/+6
aren't changing the name.
2010-12-07update to CI 1.7.3Florian Pritz35-35/+35
Signed-off-by: Florian Pritz <bluewind@xssn.at>
2010-11-10Removing instantiate_class(), which was needed to make php 4 and 5.3 play ↵Pascal Kriete1-1/+1
together nicely. Removed all instantiations by reference.
2010-11-10Updating PHP requirements in files 5.1.6Greg Aker35-35/+35
2010-10-04Cleanup of stray spaces and tabsBarry Mieny32-1162/+1162
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-01 09:54:42 +0100