CVS commit: src/external/public-domain/sqlite/dist
Module Name:src
Committed By: maya
Date: Fri Oct 30 12:32:04 UTC 2020
Modified Files:
src/external/public-domain/sqlite/dist: sqlite3.c
Log Message:
Use the same macro used before for avoiding too large floats on vax.
This has the advantage of not changing the number for non-vax, so is a
safer change for those architectures.
(Might not actually matter).
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/external/public-domain/sqlite/dist/sqlite3.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/sqlite/dist/sqlite3.c
diff -u src/external/public-domain/sqlite/dist/sqlite3.c:1.19 src/external/public-domain/sqlite/dist/sqlite3.c:1.20
--- src/external/public-domain/sqlite/dist/sqlite3.c:1.19 Fri Oct 30 06:02:05 2020
+++ src/external/public-domain/sqlite/dist/sqlite3.c Fri Oct 30 12:32:04 2020
@@ -185409,7 +185409,7 @@ SQLITE_API int sqlite3_rtree_init(
**May you share freely, never taking more than you give.
**
*
-** $Id: sqlite3.c,v 1.19 2020/10/30 06:02:05 martin Exp $
+** $Id: sqlite3.c,v 1.20 2020/10/30 12:32:04 maya Exp $
**
** This file implements an integration between the ICU library
** ("International Components for Unicode", an open-source library
@@ -213756,7 +213756,7 @@ static int fts5BestIndexMethod(sqlite3_v
}else{
/* As there exists an unusable MATCH constraint this is an
** unusable plan. Set a prohibitively high cost. */
-pInfo->estimatedCost = DBL_MAX;
+pInfo->estimatedCost = SQLITE_HUGE_COST;
return SQLITE_OK;
}
}else if( p->op<=SQLITE_INDEX_CONSTRAINT_MATCH ){
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src
Committed By: martin
Date: Fri Oct 30 06:02:06 UTC 2020
Modified Files:
src/external/public-domain/sqlite/dist: sqlite3.c
Log Message:
Instead of a random 'prohibitively high' value, use DBL_MAX so it builds on VAX
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/external/public-domain/sqlite/dist/sqlite3.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/sqlite/dist/sqlite3.c
diff -u src/external/public-domain/sqlite/dist/sqlite3.c:1.18 src/external/public-domain/sqlite/dist/sqlite3.c:1.19
--- src/external/public-domain/sqlite/dist/sqlite3.c:1.18 Sat Dec 22 03:22:19 2018
+++ src/external/public-domain/sqlite/dist/sqlite3.c Fri Oct 30 06:02:05 2020
@@ -185409,7 +185409,7 @@ SQLITE_API int sqlite3_rtree_init(
**May you share freely, never taking more than you give.
**
*
-** $Id: sqlite3.c,v 1.18 2018/12/22 03:22:19 christos Exp $
+** $Id: sqlite3.c,v 1.19 2020/10/30 06:02:05 martin Exp $
**
** This file implements an integration between the ICU library
** ("International Components for Unicode", an open-source library
@@ -213756,7 +213756,7 @@ static int fts5BestIndexMethod(sqlite3_v
}else{
/* As there exists an unusable MATCH constraint this is an
** unusable plan. Set a prohibitively high cost. */
-pInfo->estimatedCost = 1e50;
+pInfo->estimatedCost = DBL_MAX;
return SQLITE_OK;
}
}else if( p->op<=SQLITE_INDEX_CONSTRAINT_MATCH ){
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src
Committed By: christos
Date: Sat Dec 22 03:22:19 UTC 2018
Modified Files:
src/external/public-domain/sqlite/dist: sqlite3.c
Log Message:
remove stray line
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/external/public-domain/sqlite/dist/sqlite3.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/sqlite/dist/sqlite3.c
diff -u src/external/public-domain/sqlite/dist/sqlite3.c:1.17 src/external/public-domain/sqlite/dist/sqlite3.c:1.18
--- src/external/public-domain/sqlite/dist/sqlite3.c:1.17 Wed Dec 19 17:21:13 2018
+++ src/external/public-domain/sqlite/dist/sqlite3.c Fri Dec 21 22:22:19 2018
@@ -30570,7 +30570,6 @@ do_atof_calc:
LONGDOUBLE_TYPE scale = 1;
/* 1.0e+22 is the largest power of 10 than can be
** represented exactly. */
- LONGDOUBLE_TYPE scale = sqlite3Pow10(e-308);
while( e%22 ) { scale *= 1.0e+1; e -= 1; }
while( e>0 ) { scale *= 1.0e+22; e -= 22; }
if( esign<0 ){
@@ -185410,7 +185409,7 @@ SQLITE_API int sqlite3_rtree_init(
**May you share freely, never taking more than you give.
**
*
-** $Id: sqlite3.c,v 1.17 2018/12/19 22:21:13 christos Exp $
+** $Id: sqlite3.c,v 1.18 2018/12/22 03:22:19 christos Exp $
**
** This file implements an integration between the ICU library
** ("International Components for Unicode", an open-source library
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src
Committed By: abhinav
Date: Mon Jul 4 03:04:25 UTC 2016
Modified Files:
src/external/public-domain/sqlite/dist: sqlite3.c
Log Message:
Use constant.
This change was lost while resolving merge conflict as the lines had moved
around too much.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/public-domain/sqlite/dist/sqlite3.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/sqlite/dist/sqlite3.c
diff -u src/external/public-domain/sqlite/dist/sqlite3.c:1.13 src/external/public-domain/sqlite/dist/sqlite3.c:1.14
--- src/external/public-domain/sqlite/dist/sqlite3.c:1.13 Sun Jul 3 10:23:30 2016
+++ src/external/public-domain/sqlite/dist/sqlite3.c Mon Jul 4 03:04:25 2016
@@ -142475,7 +142475,7 @@ static int fts3BestIndexMethod(sqlite3_v
** function MATCH in the requested context" error. To discourage
** this, return a very high cost here. */
pInfo->idxNum = FTS3_FULLSCAN_SEARCH;
-pInfo->estimatedCost = 1e50;
+pInfo->estimatedCost = SQLITE_HUGE_COST;
fts3SetEstimatedRows(pInfo, ((sqlite3_int64)1) << 50);
return SQLITE_OK;
}
@@ -190961,7 +190961,7 @@ static int fts5BestIndexMethod(sqlite3_v
}else if( j==0 ){
/* As there exists an unusable MATCH constraint this is an
** unusable plan. Set a prohibitively high cost. */
- pInfo->estimatedCost = 1e50;
+ pInfo->estimatedCost = SQLITE_HUGE_COST;
return SQLITE_OK;
}
}
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src Committed By: abhinav Date: Sun Jul 3 10:23:31 UTC 2016 Modified Files: src/external/public-domain/sqlite/dist: sqlite3.c Log Message: Merge conflicts for sqlite-3.13.0 To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/external/public-domain/sqlite/dist/sqlite3.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src
Committed By: abhinav
Date: Sun Jul 3 09:27:25 UTC 2016
Modified Files:
src/external/public-domain/sqlite/dist: shell.c
Log Message:
Mark the functions get2byteInt and get4byteInt as static to avoid
-Werror=missing-prototypes problems.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 src/external/public-domain/sqlite/dist/shell.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/sqlite/dist/shell.c
diff -u src/external/public-domain/sqlite/dist/shell.c:1.1.1.4 src/external/public-domain/sqlite/dist/shell.c:1.2
--- src/external/public-domain/sqlite/dist/shell.c:1.1.1.4 Sun Jul 3 09:24:29 2016
+++ src/external/public-domain/sqlite/dist/shell.c Sun Jul 3 09:27:25 2016
@@ -2946,10 +2946,10 @@ static int db_int(ShellState *p, const c
/*
** Convert a 2-byte or 4-byte big-endian integer into a native integer
*/
-unsigned int get2byteInt(unsigned char *a){
+static unsigned int get2byteInt(unsigned char *a){
return (a[0]<<8) + a[1];
}
-unsigned int get4byteInt(unsigned char *a){
+static unsigned int get4byteInt(unsigned char *a){
return (a[0]<<24) + (a[1]<<16) + (a[2]<<8) + a[3];
}
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src
Committed By: martin
Date: Wed Mar 12 20:00:22 UTC 2014
Modified Files:
src/external/public-domain/sqlite/dist: sqlite3.c
Log Message:
Try to avoid using float constants out of range
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/public-domain/sqlite/dist/sqlite3.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/sqlite/dist/sqlite3.c
diff -u src/external/public-domain/sqlite/dist/sqlite3.c:1.11 src/external/public-domain/sqlite/dist/sqlite3.c:1.12
--- src/external/public-domain/sqlite/dist/sqlite3.c:1.11 Mon Feb 17 19:30:12 2014
+++ src/external/public-domain/sqlite/dist/sqlite3.c Wed Mar 12 20:00:22 2014
@@ -7538,6 +7538,7 @@ struct sqlite3_rtree_geometry {
# include float.h
# define SQLITE_BIG_DBL DBL_MAX
# define SQLITE_HUGE_DBL DBL_MAX
+# define SQLITE_HUGE_COST 1e38
# endif
#endif
#ifndef SQLITE_BIG_DBL
@@ -7549,6 +7550,9 @@ struct sqlite3_rtree_geometry {
#ifndef SQLITE_MAX_SQL_LENGTH
# define SQLITE_MAX_SQL_LENGTH 10
#endif
+#ifndef SQLITE_HUGE_COST
+# define SQLITE_HUGE_COST 1e50
+#endif
/*
** The maximum depth of an expression tree. This is limited to
@@ -20406,8 +20410,12 @@ SQLITE_PRIVATE void sqlite3VXPrintf(
}
if( realvalue0.0 ){
LONGDOUBLE_TYPE scale = 1.0;
+#if __DBL_MAX_10_EXP__ 100
while( realvalue=1e100*scale exp=350 ){ scale *= 1e100;exp+=100;}
+#endif
+#if __DBL_MAX_10_EXP__ 64
while( realvalue=1e64*scale exp=350 ){ scale *= 1e64; exp+=64; }
+#endif
while( realvalue=1e8*scale exp=350 ){ scale *= 1e8; exp+=8; }
while( realvalue=10.0*scale exp=350 ){ scale *= 10.0; exp++; }
realvalue /= scale;
@@ -125559,7 +125567,7 @@ static int fts3BestIndexMethod(sqlite3_v
** function MATCH in the requested context error. To discourage
** this, return a very high cost here. */
pInfo-idxNum = FTS3_FULLSCAN_SEARCH;
-pInfo-estimatedCost = 1e50;
+pInfo-estimatedCost = SQLITE_HUGE_COST;
fts3SetEstimatedRows(pInfo, ((sqlite3_int64)1) 50);
return SQLITE_OK;
}
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src
Committed By: martin
Date: Mon Feb 17 12:06:15 UTC 2014
Modified Files:
src/external/public-domain/sqlite/dist: sqlite3.c
Log Message:
Fix bogus #ifdef __vax__
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/public-domain/sqlite/dist/sqlite3.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/sqlite/dist/sqlite3.c
diff -u src/external/public-domain/sqlite/dist/sqlite3.c:1.9 src/external/public-domain/sqlite/dist/sqlite3.c:1.10
--- src/external/public-domain/sqlite/dist/sqlite3.c:1.9 Sun Feb 16 18:09:43 2014
+++ src/external/public-domain/sqlite/dist/sqlite3.c Mon Feb 17 12:06:15 2014
@@ -22014,8 +22014,8 @@ do_atof_calc:
/* if exponent, scale significand as appropriate
** and store in result. */
if( e ){
-#ifndef __vax__
LONGDOUBLE_TYPE scale = 1.0;
+#ifndef __vax__
/* attempt to handle extremely small/large numbers better */
if( e307 e342 ){
while( e%308 ) { scale *= 1.0e+1; e -= 1; }
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src
Committed By: christos
Date: Mon Feb 17 19:30:12 UTC 2014
Modified Files:
src/external/public-domain/sqlite/dist: sqlite3.c
Log Message:
use the constant definition
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/public-domain/sqlite/dist/sqlite3.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/sqlite/dist/sqlite3.c
diff -u src/external/public-domain/sqlite/dist/sqlite3.c:1.10 src/external/public-domain/sqlite/dist/sqlite3.c:1.11
--- src/external/public-domain/sqlite/dist/sqlite3.c:1.10 Mon Feb 17 07:06:15 2014
+++ src/external/public-domain/sqlite/dist/sqlite3.c Mon Feb 17 14:30:12 2014
@@ -22030,7 +22030,7 @@ do_atof_calc:
if( esign0 ){
result = 0.0*s;
}else{
- result = 1e308*1e308*s; /* Infinity */
+ result = SQLITE_HUGE_DBL*SQLITE_HUGE_DBL*s; /* Infinity */
}
}else
#endif
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src Committed By: christos Date: Sun Feb 16 18:09:44 UTC 2014 Modified Files: src/external/public-domain/sqlite/dist: sqlite3.c Log Message: merge conflicts. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/public-domain/sqlite/dist/sqlite3.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src Committed By: njoly Date: Fri Dec 21 19:26:40 UTC 2012 Modified Files: src/external/public-domain/sqlite/dist: sqlite3.1 Log Message: Fix unknown Fi macro. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/public-domain/sqlite/dist/sqlite3.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/dist/sqlite3.1 diff -u src/external/public-domain/sqlite/dist/sqlite3.1:1.4 src/external/public-domain/sqlite/dist/sqlite3.1:1.5 --- src/external/public-domain/sqlite/dist/sqlite3.1:1.4 Mon Dec 17 16:26:38 2012 +++ src/external/public-domain/sqlite/dist/sqlite3.1 Fri Dec 21 19:26:39 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: sqlite3.1,v 1.4 2012/12/17 16:26:38 christos Exp $ +.\ $NetBSD: sqlite3.1,v 1.5 2012/12/21 19:26:39 njoly Exp $ .Dd December 16, 2012 .Dt SQLITE3 1 .Os @@ -168,7 +168,7 @@ continue prompt =... .Ed .It If the file -.Fi ~/.sqliterc +.Pa ~/.sqliterc exists, it is processed first. can be found in the user's home directory, it is read and processed.
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src Committed By: christos Date: Mon Dec 17 16:26:38 UTC 2012 Modified Files: src/external/public-domain/sqlite/dist: sqlite3.1 Log Message: now that I know how to escape a period, nothing can stop me :-) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/public-domain/sqlite/dist/sqlite3.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/dist/sqlite3.1 diff -u src/external/public-domain/sqlite/dist/sqlite3.1:1.3 src/external/public-domain/sqlite/dist/sqlite3.1:1.4 --- src/external/public-domain/sqlite/dist/sqlite3.1:1.3 Sun Dec 16 18:37:34 2012 +++ src/external/public-domain/sqlite/dist/sqlite3.1 Mon Dec 17 11:26:38 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: sqlite3.1,v 1.3 2012/12/16 23:37:34 wiz Exp $ +.\ $NetBSD: sqlite3.1,v 1.4 2012/12/17 16:26:38 christos Exp $ .Dd December 16, 2012 .Dt SQLITE3 1 .Os @@ -67,7 +67,7 @@ used to control the output format, exami database files, or perform administrative operations upon the attached databases (such as rebuilding indices). Meta-commands are always prefixed with a dot -.Dq \. . +.Dq \. . .Pp A list of available meta-commands can be viewed at any time by issuing the '.help' command.
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src Committed By: christos Date: Sun Dec 16 20:04:19 UTC 2012 Update of /cvsroot/src/external/public-domain/sqlite/dist In directory ivanova.netbsd.org:/tmp/cvs-serv25378 Log Message: from ubuntu-9.10 Status: Vendor Tag: SQLITE Release Tags: ubuntu-9-10 N src/external/public-domain/sqlite/dist/sqlite3.1 No conflicts created by this import
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src
Committed By: christos
Date: Sun Dec 16 20:25:40 UTC 2012
Modified Files:
src/external/public-domain/sqlite/dist: sqlite3.1
Log Message:
convert to mdoc
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/public-domain/sqlite/dist/sqlite3.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/sqlite/dist/sqlite3.1
diff -u src/external/public-domain/sqlite/dist/sqlite3.1:1.1.1.1 src/external/public-domain/sqlite/dist/sqlite3.1:1.2
--- src/external/public-domain/sqlite/dist/sqlite3.1:1.1.1.1 Sun Dec 16 15:04:19 2012
+++ src/external/public-domain/sqlite/dist/sqlite3.1 Sun Dec 16 15:25:40 2012
@@ -1,112 +1,79 @@
-.\ Hey, EMACS: -*- nroff -*-
-.\ First parameter, NAME, should be all caps
-.\ Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\ other parameters are allowed: see man(7), man(1)
-.TH SQLITE3 1 Mon Apr 15 23:49:17 2002
-.\ Please adjust this date whenever revising the manpage.
-.\
-.\ Some roff macros, for reference:
-.\ .nhdisable hyphenation
-.\ .hyenable hyphenation
-.\ .ad l left justify
-.\ .ad b justify to both left and right margins
-.\ .nfdisable filling
-.\ .fienable filling
-.\ .brinsert line break
-.\ .sp ninsert n+1 empty lines
-.\ for manpage-specific macros, see man(7)
-.SH NAME
-.B sqlite3
-\- A command line interface for SQLite version 3
-
-.SH SYNOPSIS
-.B sqlite3
-.RI [ options ]
-.RI [ databasefile ]
-.RI [ SQL ]
-
-.SH SUMMARY
-.PP
-.B sqlite3
+.\ $NetBSD: sqlite3.1,v 1.2 2012/12/16 20:25:40 christos Exp $
+.Dd December 16, 2012
+.Dt SQLITE3 1
+.Os
+.Sh NAME
+.Nm sqlite3
+.Nd A command line interface for SQLite version 3
+.Sh SYNOPSIS
+.Nm
+.Op Ar options
+.Op Ar databasefile
+.Op Ar SQL
+.Sh DESCRIPTION
+.Nm
is a terminal-based front-end to the SQLite library that can evaluate
queries interactively and display the results in multiple formats.
-.B sqlite3
+.Nm
can also be used within shell scripts and other applications to provide
batch processing features.
-
-.SH DESCRIPTION
+.Pp
To start a
-.B sqlite3
+.Nm
interactive session, invoke the
-.B sqlite3
-command and optionally provide the name of a database file. If the
-database file does not exist, it will be created. If the database file
-does exist, it will be opened.
+.Nm
+command and optionally provide the name of a database file.
+If the database file does not exist, it will be created.
+If the database file does exist, it will be opened.
For example, to create a new database file named mydata.db, create
a table named memos and insert a couple of records into that table:
-.sp
-$
-.B sqlite3 mydata.db
-.br
+.Bd -literal -offset indent
+$ sqlite3 mydata.db
SQLite version 3.1.3
-.br
Enter .help for instructions
-.br
-sqlite
-.B create table memos(text, priority INTEGER);
-.br
-sqlite
-.B insert into memos values('deliver project description', 10);
-.br
-sqlite
-.B insert into memos values('lunch with Christine', 100);
-.br
-sqlite
-.B select * from memos;
-.br
+sqlite create table memos(text, priority INTEGER);
+sqlite insert into memos values('deliver project description', 10);
+sqlite insert into memos values('lunch with Christine', 100);
+sqlite select * from memos;
deliver project description|10
-.br
lunch with Christine|100
-.br
sqlite
-.sp
-
-If no database name is supplied, the ATTACH sql command can be used
-to attach to existing or create new database files. ATTACH can also
-be used to attach to multiple databases within the same interactive
-session. This is useful for migrating data between databases,
+.Ed
+.Pp
+If no database name is supplied, the
+.Em ATTACH
+sql command can be used
+to attach to existing or create new database files.
+.Em ATTACH
+can also be used to attach to multiple databases within the same
+interactive session.
+This is useful for migrating data between databases,
possibly changing the schema along the way.
-
+.Pp
Optionally, a SQL statement or set of SQL statements can be supplied as
-a single argument. Multiple statements should be separated by
-semi-colons.
-
+a single argument.
+Multiple statements should be separated by semi-colons.
+.Pp
For example:
-.sp
-$
-.B sqlite3 -line mydata.db 'select * from memos where priority 20;'
-.br
+.Bd -literal -offset indent
+$ sqlite3 -line mydata.db 'select * from memos where priority 20;'
text = lunch with Christine
-.br
-priority = 100
-.br
-.sp
-
-.SS SQLITE META-COMMANDS
-.PP
+priority = 100
+.Ed
+.Ss SQLITE META-COMMANDS
The interactive interpreter offers a set of meta-commands that can be
used to control the output format, examine the currently attached
database files, or perform administrative operations upon the
-attached databases (such as rebuilding indices). Meta-commands are
-always prefixed with a dot (.).
-
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src Committed By: wiz Date: Sun Dec 16 22:46:45 UTC 2012 Update of /cvsroot/src/external/public-domain/sqlite/dist In directory ivanova.netbsd.org:/tmp/cvs-serv7706 Log Message: Import sqlite3 man page from 3.7.15, in particular sqlite-autoconf-3071500.tar.gz (using the pkgsrc distfile). Status: Vendor Tag: SQLITE Release Tags: sqlite-3-7-15-manpage-only U src/external/public-domain/sqlite/dist/sqlite3.1 No conflicts created by this import
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src Committed By: wiz Date: Sun Dec 16 23:37:35 UTC 2012 Modified Files: src/external/public-domain/sqlite/dist: sqlite3.1 Log Message: Fix some obvious problems and remove trailing whitespace. Use more markup. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/public-domain/sqlite/dist/sqlite3.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/dist/sqlite3.1 diff -u src/external/public-domain/sqlite/dist/sqlite3.1:1.2 src/external/public-domain/sqlite/dist/sqlite3.1:1.3 --- src/external/public-domain/sqlite/dist/sqlite3.1:1.2 Sun Dec 16 20:25:40 2012 +++ src/external/public-domain/sqlite/dist/sqlite3.1 Sun Dec 16 23:37:34 2012 @@ -1,12 +1,12 @@ -.\ $NetBSD: sqlite3.1,v 1.2 2012/12/16 20:25:40 christos Exp $ +.\ $NetBSD: sqlite3.1,v 1.3 2012/12/16 23:37:34 wiz Exp $ .Dd December 16, 2012 .Dt SQLITE3 1 .Os .Sh NAME -.Nm sqlite3 +.Nm sqlite3 .Nd A command line interface for SQLite version 3 .Sh SYNOPSIS -.Nm +.Nm .Op Ar options .Op Ar databasefile .Op Ar SQL @@ -19,13 +19,13 @@ can also be used within shell scripts an batch processing features. .Pp To start a -.Nm +.Nm interactive session, invoke the .Nm command and optionally provide the name of a database file. If the database file does not exist, it will be created. If the database file does exist, it will be opened. - +.Pp For example, to create a new database file named mydata.db, create a table named memos and insert a couple of records into that table: .Bd -literal -offset indent @@ -41,7 +41,7 @@ lunch with Christine|100 sqlite .Ed .Pp -If no database name is supplied, the +If no database name is supplied, the .Em ATTACH sql command can be used to attach to existing or create new database files. @@ -66,7 +66,7 @@ The interactive interpreter offers a set used to control the output format, examine the currently attached database files, or perform administrative operations upon the attached databases (such as rebuilding indices). -Meta-commands are always prefixed with a dot +Meta-commands are always prefixed with a dot .Dq \. . .Pp A list of available meta-commands can be viewed at any time by issuing @@ -74,17 +74,16 @@ the '.help' command. For example: .Bd -literal -offset indent sqlite .help -.cc | -.databases List names and files of attached databases -.dump ?TABLE? ... Dump the database in an SQL text format -.echo ON|OFF Turn command echo on or off -.exit Exit this program -.explain ON|OFFTurn output mode suitable for EXPLAIN on or off. -.header(s) ON|OFF Turn display of headers on or off -.help Show this message -.import FILE TABLE Import data from FILE into TABLE -.indices TABLE Show names of all indices on TABLE -.mode MODE ?TABLE? Set output mode where MODE is one of: +\.databases List names and files of attached databases +\.dump ?TABLE? ... Dump the database in an SQL text format +\.echo ON|OFF Turn command echo on or off +\.exit Exit this program +\.explain ON|OFFTurn output mode suitable for EXPLAIN on or off. +\.header(s) ON|OFF Turn display of headers on or off +\.help Show this message +\.import FILE TABLE Import data from FILE into TABLE +\.indices TABLE Show names of all indices on TABLE +\.mode MODE ?TABLE? Set output mode where MODE is one of: csv Comma-separated values column Left-aligned columns. (See .width) html HTML table code @@ -93,23 +92,22 @@ sqlite .help list Values delimited by .separator string tabs Tab-separated values tcl TCL list elements -.nullvalue STRING Print STRING in place of NULL values -.output FILENAME Send output to FILENAME -.output stdout Send output to the screen -.prompt MAIN CONTINUE Replace the standard prompts -.quit Exit this program -.read FILENAME Execute SQL in FILENAME -.schema ?TABLE?Show the CREATE statements -.separator STRING Change separator used by output mode and .import -.show Show the current values for various settings -.tables ?PATTERN? List names of tables matching a LIKE pattern -.timeout MSTry opening locked tables for MS milliseconds -.width NUM NUM ... Set column widths for column mode +\.nullvalue STRING Print STRING in place of NULL values +\.output FILENAME Send output to FILENAME +\.output stdout Send output to the screen +\.prompt MAIN CONTINUE Replace the standard prompts +\.quit Exit this program +\.read FILENAME Execute SQL in FILENAME +\.schema ?TABLE?
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src Committed By: matt Date: Mon Feb 6 17:24:49 UTC 2012 Modified Files: src/external/public-domain/sqlite/dist: sqlite3.c Log Message: Back out part of previous commit (no reason to define SQLITE_BIG_DBL especially for VAX since it uses DBL_MAX from the VAX float.h). To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/public-domain/sqlite/dist/sqlite3.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/dist/sqlite3.c diff -u src/external/public-domain/sqlite/dist/sqlite3.c:1.5 src/external/public-domain/sqlite/dist/sqlite3.c:1.6 --- src/external/public-domain/sqlite/dist/sqlite3.c:1.5 Sun Feb 5 17:55:12 2012 +++ src/external/public-domain/sqlite/dist/sqlite3.c Mon Feb 6 17:24:49 2012 @@ -7792,11 +7792,7 @@ SQLITE_PRIVATE void sqlite3HashClear(Has # endif #endif #ifndef SQLITE_BIG_DBL -# ifdef __vax__ -# define SQLITE_BIG_DBL (1e38) -# else -# define SQLITE_BIG_DBL (1e99) -# endif +# define SQLITE_BIG_DBL (1e99) #endif #ifndef SQLITE_HUGE_DBL # define SQLITE_HUGE_DBL (1.0e+308) @@ -132876,7 +132872,7 @@ SQLITE_API int sqlite3_extension_init( **May you share freely, never taking more than you give. ** * -** $Id: sqlite3.c,v 1.5 2012/02/05 17:55:12 matt Exp $ +** $Id: sqlite3.c,v 1.6 2012/02/06 17:24:49 matt Exp $ ** ** This file implements an integration between the ICU library ** (International Components for Unicode, an open-source library
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src
Committed By: matt
Date: Sun Feb 5 17:55:13 UTC 2012
Modified Files:
src/external/public-domain/sqlite/dist: sqlite3.c
Log Message:
Make this compilable by VAX GCC 4.5
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/public-domain/sqlite/dist/sqlite3.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/sqlite/dist/sqlite3.c
diff -u src/external/public-domain/sqlite/dist/sqlite3.c:1.4 src/external/public-domain/sqlite/dist/sqlite3.c:1.5
--- src/external/public-domain/sqlite/dist/sqlite3.c:1.4 Sat Jan 28 23:55:36 2012
+++ src/external/public-domain/sqlite/dist/sqlite3.c Sun Feb 5 17:55:12 2012
@@ -7792,7 +7792,11 @@ SQLITE_PRIVATE void sqlite3HashClear(Has
# endif
#endif
#ifndef SQLITE_BIG_DBL
-# define SQLITE_BIG_DBL (1e99)
+# ifdef __vax__
+# define SQLITE_BIG_DBL (1e38)
+# else
+# define SQLITE_BIG_DBL (1e99)
+# endif
#endif
#ifndef SQLITE_HUGE_DBL
# define SQLITE_HUGE_DBL (1.0e+308)
@@ -21353,6 +21357,7 @@ do_atof_calc:
** and store in result. */
if( e ){
double scale = 1.0;
+#ifndef __vax__
/* attempt to handle extremely small/large numbers better */
if( e307 e342 ){
while( e%308 ) { scale *= 1.0e+1; e -= 1; }
@@ -21369,7 +21374,9 @@ do_atof_calc:
}else{
result = 1e308*1e308*s; /* Infinity */
}
- }else{
+ }else
+#endif
+ {
/* 1.0e+22 is the largest power of 10 than can be
** represented exactly. */
while( e%22 ) { scale *= 1.0e+1; e -= 1; }
@@ -132869,7 +132876,7 @@ SQLITE_API int sqlite3_extension_init(
**May you share freely, never taking more than you give.
**
*
-** $Id: sqlite3.c,v 1.4 2012/01/28 23:55:36 joerg Exp $
+** $Id: sqlite3.c,v 1.5 2012/02/05 17:55:12 matt Exp $
**
** This file implements an integration between the ICU library
** (International Components for Unicode, an open-source library
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src Committed By: joerg Date: Sat Jan 28 23:51:07 UTC 2012 Update of /cvsroot/src/external/public-domain/sqlite/dist In directory ivanova.netbsd.org:/tmp/cvs-serv21691 Log Message: Update to sqlite 3.7.10: - Default schema format changed to version 4 - Various bugfixes and improvements. Status: Vendor Tag: SQLITE Release Tags: sqlite-3-7-10 U src/external/public-domain/sqlite/dist/sqlite3ext.h C src/external/public-domain/sqlite/dist/sqlite3.c U src/external/public-domain/sqlite/dist/shell.c U src/external/public-domain/sqlite/dist/sqlite3.h 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jSQLITE:yesterday -jSQLITE src/external/public-domain/sqlite/dist
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src
Committed By: martin
Date: Mon Jan 9 11:20:21 UTC 2012
Modified Files:
src/external/public-domain/sqlite/dist: sqlite3.c
Log Message:
When aggregate-allocating an index structure make sure to provide at least
natural alignement for pointers.
This makes firefox 3.6 work again on sparc64.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/public-domain/sqlite/dist/sqlite3.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/sqlite/dist/sqlite3.c
diff -u src/external/public-domain/sqlite/dist/sqlite3.c:1.2 src/external/public-domain/sqlite/dist/sqlite3.c:1.3
--- src/external/public-domain/sqlite/dist/sqlite3.c:1.2 Wed Nov 2 23:19:48 2011
+++ src/external/public-domain/sqlite/dist/sqlite3.c Mon Jan 9 11:20:20 2012
@@ -81883,7 +81883,8 @@ SQLITE_PRIVATE Index *sqlite3CreateIndex
Token *pName = 0;/* Unqualified name of the index to create */
struct ExprList_item *pListItem; /* For looping over pList */
int nCol;
- int nExtra = 0;
+ int nExtra = 0, nPad = 0;
+ size_t nOff;
char *zExtra;
assert( pStart==0 || pEnd!=0 ); /* pEnd must be non-NULL if pStart is */
@@ -82053,6 +82054,8 @@ SQLITE_PRIVATE Index *sqlite3CreateIndex
*/
nName = sqlite3Strlen30(zName);
nCol = pList-nExpr;
+ nOff = sizeof(*pIndex)+sizeof(tRowcnt)*(nCol+1);
+ nPad = ((nOff + (sizeof(char*)-1)) ~ (sizeof(char*)-1)) - nOff;
pIndex = sqlite3DbMallocZero(db,
sizeof(Index) + /* Index structure */
sizeof(tRowcnt)*(nCol+1) + /* Index.aiRowEst */
@@ -82060,13 +82063,14 @@ SQLITE_PRIVATE Index *sqlite3CreateIndex
sizeof(char *)*nCol +/* Index.azColl */
sizeof(u8)*nCol +/* Index.aSortOrder */
nName + 1 + /* Index.zName */
- nExtra /* Collation sequence names */
+ nExtra + /* Collation sequence names */
+ nPad
);
if( db-mallocFailed ){
goto exit_create_index;
}
pIndex-aiRowEst = (tRowcnt*)(pIndex[1]);
- pIndex-azColl = (char**)(pIndex-aiRowEst[nCol+1]);
+ pIndex-azColl = (char**)((char*)(pIndex-aiRowEst[nCol+1])+nPad);
pIndex-aiColumn = (int *)(pIndex-azColl[nCol]);
pIndex-aSortOrder = (u8 *)(pIndex-aiColumn[nCol]);
pIndex-zName = (char *)(pIndex-aSortOrder[nCol]);
@@ -130641,7 +130645,7 @@ SQLITE_API int sqlite3_extension_init(
**May you share freely, never taking more than you give.
**
*
-** $Id: sqlite3.c,v 1.2 2011/11/02 23:19:48 christos Exp $
+** $Id: sqlite3.c,v 1.3 2012/01/09 11:20:20 martin Exp $
**
** This file implements an integration between the ICU library
** (International Components for Unicode, an open-source library
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src
Committed By: christos
Date: Wed Nov 2 23:19:49 UTC 2011
Modified Files:
src/external/public-domain/sqlite/dist: sqlite3.c
Log Message:
fix vax floating point overflows.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/public-domain/sqlite/dist/sqlite3.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/sqlite/dist/sqlite3.c
diff -u src/external/public-domain/sqlite/dist/sqlite3.c:1.1.1.1 src/external/public-domain/sqlite/dist/sqlite3.c:1.2
--- src/external/public-domain/sqlite/dist/sqlite3.c:1.1.1.1 Thu Oct 13 17:38:52 2011
+++ src/external/public-domain/sqlite/dist/sqlite3.c Wed Nov 2 19:19:48 2011
@@ -7615,10 +7615,19 @@ SQLITE_PRIVATE void sqlite3HashClear(Has
# define SQLITE_OMIT_TRACE 1
# undef SQLITE_MIXED_ENDIAN_64BIT_FLOAT
# undef SQLITE_HAVE_ISNAN
+#else
+# ifdef __vax__
+# include float.h
+# define SQLITE_BIG_DBL DBL_MAX
+# define SQLITE_HUGE_DBL DBL_MAX
+# endif
#endif
#ifndef SQLITE_BIG_DBL
# define SQLITE_BIG_DBL (1e99)
#endif
+#ifndef SQLITE_HUGE_DBL
+# define SQLITE_HUGE_DBL (1.0e+308)
+#endif
/*
** OMIT_TEMPDB is set to 1 if SQLITE_OMIT_TEMPDB is defined, or 0
@@ -21000,10 +21009,10 @@ do_atof_calc:
while( e%308 ) { scale *= 1.0e+1; e -= 1; }
if( esign0 ){
result = s / scale;
- result /= 1.0e+308;
+ result /= SQLITE_HUGE_DBL;
}else{
result = s * scale;
- result *= 1.0e+308;
+ result *= SQLITE_HUGE_DBL;
}
}else{
/* 1.0e+22 is the largest power of 10 than can be
@@ -130632,7 +130641,7 @@ SQLITE_API int sqlite3_extension_init(
**May you share freely, never taking more than you give.
**
*
-** $Id: sqlite3.c,v 1.1.1.1 2011/10/13 21:38:52 joerg Exp $
+** $Id: sqlite3.c,v 1.2 2011/11/02 23:19:48 christos Exp $
**
** This file implements an integration between the ICU library
** (International Components for Unicode, an open-source library
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src Committed By: joerg Date: Thu Oct 13 21:38:58 UTC 2011 Update of /cvsroot/src/external/public-domain/sqlite/dist In directory ivanova.netbsd.org:/tmp/cvs-serv14811 Log Message: Import pre-release of SQLite 3.6.9 based on 8bf13b036a. Status: Vendor Tag: SQLITE Release Tags: sqlite-3-7-9-pre N src/external/public-domain/sqlite/dist/shell.c N src/external/public-domain/sqlite/dist/sqlite3.c N src/external/public-domain/sqlite/dist/sqlite3.h N src/external/public-domain/sqlite/dist/sqlite3ext.h No conflicts created by this import
