summaryrefslogtreecommitdiffstats
path: root/system/database
AgeCommit message (Collapse)AuthorFilesLines
2011-10-27Some public and protected method declarationsAndrey Andreev3-59/+59
2011-10-27Remove another 2 old commentsAndrey Andreev1-3/+1
2011-10-27Cleanup and migrate oci8_driver and oci8_result from deprecated PHP4 to PHP5 ↵Andrey Andreev2-118/+120
style functions
2011-10-27Converted database constructors to PHP5 typeTimothy Warren5-7/+7
2011-10-27if statment code style updateTimothy Warren1-0/+792
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-15Merge branch 'develop' of github.com:philsturgeon/codeigniter-reactor into ↵Phil Sturgeon1-1/+3
develop
2011-08-15Merge pull request #52 from waldmeister/developPhil Sturgeon1-1/+3
Added some docs to CI core files
2011-08-15Added some docs to CI core filesDavid Behler1-1/+3
2011-08-14Fixed conflict.Phil Sturgeon1-1/+1
2011-08-14Fixed a bug (Reactor #89) where MySQL export would fail if the table had ↵Phil Sturgeon1-1/+1
hyphens or other non alphanumeric/underscore characters.
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-08-13Merged my GitHub mirror.Phil Sturgeon6-1/+1400
2011-08-12Merging - fingers crossedPascal Kriete5-173/+151
Conflicts: system/database/drivers/mysql/mysql_driver.php system/database/drivers/mysqli/mysqli_driver.php system/libraries/Email.php user_guide/changelog.html user_guide/database/configuration.html user_guide/helpers/url_helper.html user_guide/libraries/cart.html user_guide/libraries/form_validation.html
2011-08-11Added back /application/* files (removed in previous commit accidently). ↵Esen Sagynov4-59/+81
Corrected formatting/indenting in CUBRID Driver classes. Added myself as the driver author. Applied the MySQL fix, previously accepted in pull request #29, to CUBRID Driver.
2011-08-10Typecast limit and offset in the Database Driver to integers. Fixes ↵Phil Sturgeon1-2/+2
https://bitbucket.org/ellislab/codeigniter-reactor/issue/341/active-record-limit-function-have-sql#comment-597403
2011-08-10Fixed typo in ActiveRecord.Phil Sturgeon1-1/+1
2011-08-10Added field name wrappers (") in ↵Esen Sagynov2-6/+6
insert/update/replace/_process_fields/_create_table functions to avoid reserved word conflicts.
2011-08-10Added CUBRID Database DriverEsen Sagynov6-1/+1378
2011-08-10Fixed a bug where using this->db->select_max(), this->db->select_min(), etc ↵Phil Sturgeon1-1/+2
could throw notices. Thanks to w43l for the patch.
2011-08-09Merge pull request #29 from darkhouse/developPhil Sturgeon2-4/+12
Minor change to MySQL and MySQLi drivers.
2011-07-23Fixed having method to insert quotes.Adam Jackett1-1/+1
2011-07-23Fixed mysql and mysqli drivers to set NOT NULL as default for creating ↵Adam Jackett2-4/+12
fields. All other drivers were correct.
2011-07-16Fixed missing table prefixes in Database Forge Class rename_table() methodZac Wasielewski1-1/+1
2011-07-15... set_dbprefix(). Programatically set the prefix, great for multi-site ↵Phil Sturgeon1-0/+15
systems that "namespace" with prefixes.
2011-07-15Was 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 Jones5-67/+96
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-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-20modified the 'use_set_names' variable in the MySQL/i drivers to be a class ↵Derek Jones2-10/+12
property instead of static, in case multiple database servers are connected to in a single request. Also clarified description of the 'dbcollat' setting in the configuration files
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