database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-05 04:30:38 +03:00
Code Activity

Changes in support of using a codec. (CVS 1844)

Browse Source 
FossilOrigin-Name: b77bec35742f07d79da3e85baee09a90c1494415
This commit is contained in:
drh
2004-07-22 02:40:37 +00:00
parent 90f5ecb39d
commit 2011d5f5e5
8 changed files with 52 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/shell.c
View File

@@ -12,7 +12,7 @@
** This file contains code to implement the "sqlite" command line
** utility for accessing SQLite databases.
**
** $Id: shell.c,v 1.106 2004/06/30 08:20:16 danielk1977 Exp $
** $Id: shell.c,v 1.107 2004/07/22 02:40:38 drh Exp $
*/
#include <stdlib.h>
#include <string.h>
@@ -633,13 +633,10 @@ static void process_input(struct callback_data *p, FILE *in);
*/
static void open_db(struct callback_data *p){
if( p->db==0 ){
#ifdef SQLITE_HAS_CODEC
int n = p->zKey ? strlen(p->zKey) : 0;
db = p->db = sqlite3_open_encrypted(p->zDbFilename, p->zKey, n, 0, &zErrMsg);
assert(0); /* Encrypted databases are broken in SQLite 3 */
#else
sqlite3_open(p->zDbFilename, &p->db);
db = p->db;
#ifdef SQLITE_HAS_CODEC
sqlite3_key(p->db, p->zKey, p->zKey ? strlen(p->zKey) : 0);
#endif
sqlite3_create_function(db, "shellstatic", 0, SQLITE_UTF8, 0,
shellstaticFunc, 0, 0);
@@ -925,7 +922,7 @@ static int do_meta_command(char *zLine, struct callback_data *p){
}else{
sqlite3_free(p->zKey);
p->zKey = sqlite3_mprintf("%s", azArg[2]);
sqlite_rekey(p->db, p->zKey, strlen(p->zKey));
sqlite3_rekey(p->db, p->zKey, strlen(p->zKey));
}
}else
#endif