Fossil SCM

Change application ID for the repository database. Add application IDs to the global configuration and check-out databases. None of this works yet because the built-in SQLite does not support the application_id pragma, but it should start working as soon as SQLite is updated.

drh 2013-05-01 20:38 trunk

Commit 2cd8b61f3cb345ec9787665aacbb3180eb11ac54

Parent 822d6f0dab1fb7e…

2 files changed -1 +9 -2

~ src/db.c ~ src/schema.c

M src/db.c

-1

		--- src/db.c
		+++ src/db.c
		@@ -164,11 +164,10 @@
164	164	if( rollbackFlag ) db.doRollback = 1;
165	165	db.nBegin--;
166	166	if( db.nBegin==0 ){
167	167	int i;
168	168	if( db.doRollback==0 && db.nPriorChanges<sqlite3_total_changes(g.db) ){
169		- sqlite3_exec(g.db, "PRAGMA application_id=1598444364;", 0, 0, 0);
170	169	while( db.nBeforeCommit ){
171	170	db.nBeforeCommit--;
172	171	sqlite3_exec(g.db, db.azBeforeCommit[db.nBeforeCommit], 0, 0, 0);
173	172	sqlite3_free(db.azBeforeCommit[db.nBeforeCommit]);
174	173	}
175	174

	--- src/db.c
	+++ src/db.c
	@@ -164,11 +164,10 @@
164	if( rollbackFlag ) db.doRollback = 1;
165	db.nBegin--;
166	if( db.nBegin==0 ){
167	int i;
168	if( db.doRollback==0 && db.nPriorChanges<sqlite3_total_changes(g.db) ){
169	sqlite3_exec(g.db, "PRAGMA application_id=1598444364;", 0, 0, 0);
170	while( db.nBeforeCommit ){
171	db.nBeforeCommit--;
172	sqlite3_exec(g.db, db.azBeforeCommit[db.nBeforeCommit], 0, 0, 0);
173	sqlite3_free(db.azBeforeCommit[db.nBeforeCommit]);
174	}
175

	--- src/db.c
	+++ src/db.c
	@@ -164,11 +164,10 @@
164	if( rollbackFlag ) db.doRollback = 1;
165	db.nBegin--;
166	if( db.nBegin==0 ){
167	int i;
168	if( db.doRollback==0 && db.nPriorChanges<sqlite3_total_changes(g.db) ){

169	while( db.nBeforeCommit ){
170	db.nBeforeCommit--;
171	sqlite3_exec(g.db, db.azBeforeCommit[db.nBeforeCommit], 0, 0, 0);
172	sqlite3_free(db.azBeforeCommit[db.nBeforeCommit]);
173	}
174

M src/schema.c

+9 -2

		--- src/schema.c
		+++ src/schema.c
		@@ -29,10 +29,14 @@
29	29	@ --
30	30	@ CREATE TABLE global_config(
31	31	@ name TEXT PRIMARY KEY,
32	32	@ value TEXT
33	33	@ );
	34	+@
	35	+@ -- Identifier for this file type.
	36	+@ -- The integer is the same as 'FSLG'.
	37	+@ PRAGMA application_id=252006675;
34	38	;
35	39
36	40	#if INTERFACE
37	41	/*
38	42	** The content tables have a content version number which rarely
		@@ -181,11 +185,11 @@
181	185	@ content TEXT -- Content intended to be concealed
182	186	@ );
183	187	@
184	188	@ -- The application ID helps the unix "file" command to identify the
185	189	@ -- database as a fossil repository.
186		-@ PRAGMA application_id=1598444364; -- Equivalent to '_FSL'
	190	+@ PRAGMA application_id=252006673;
187	191	;
188	192
189	193	/*
190	194	** The default reportfmt entry for the schema. This is in an extra
191	195	** script so that (configure reset) can install the default report.
		@@ -506,7 +510,10 @@
506	510	@ CREATE TABLE vmerge(
507	511	@ id INTEGER REFERENCES vfile, -- VFILE entry that has been merged
508	512	@ merge INTEGER, -- Merged with this record
509	513	@ UNIQUE(id, merge)
510	514	@ );
511		-@
	515	+@
	516	+@ -- Identifier for this file type.
	517	+@ -- The integer is the same as 'FSLC'.
	518	+@ PRAGMA application_id=252006674;
512	519	;
513	520

	--- src/schema.c
	+++ src/schema.c
	@@ -29,10 +29,14 @@
29	@ --
30	@ CREATE TABLE global_config(
31	@ name TEXT PRIMARY KEY,
32	@ value TEXT
33	@ );




34	;
35
36	#if INTERFACE
37	/*
38	** The content tables have a content version number which rarely
	@@ -181,11 +185,11 @@
181	@ content TEXT -- Content intended to be concealed
182	@ );
183	@
184	@ -- The application ID helps the unix "file" command to identify the
185	@ -- database as a fossil repository.
186	@ PRAGMA application_id=1598444364; -- Equivalent to '_FSL'
187	;
188
189	/*
190	** The default reportfmt entry for the schema. This is in an extra
191	** script so that (configure reset) can install the default report.
	@@ -506,7 +510,10 @@
506	@ CREATE TABLE vmerge(
507	@ id INTEGER REFERENCES vfile, -- VFILE entry that has been merged
508	@ merge INTEGER, -- Merged with this record
509	@ UNIQUE(id, merge)
510	@ );
511	@



512	;
513

	--- src/schema.c
	+++ src/schema.c
	@@ -29,10 +29,14 @@
29	@ --
30	@ CREATE TABLE global_config(
31	@ name TEXT PRIMARY KEY,
32	@ value TEXT
33	@ );
34	@
35	@ -- Identifier for this file type.
36	@ -- The integer is the same as 'FSLG'.
37	@ PRAGMA application_id=252006675;
38	;
39
40	#if INTERFACE
41	/*
42	** The content tables have a content version number which rarely
	@@ -181,11 +185,11 @@
185	@ content TEXT -- Content intended to be concealed
186	@ );
187	@
188	@ -- The application ID helps the unix "file" command to identify the
189	@ -- database as a fossil repository.
190	@ PRAGMA application_id=252006673;
191	;
192
193	/*
194	** The default reportfmt entry for the schema. This is in an extra
195	** script so that (configure reset) can install the default report.
	@@ -506,7 +510,10 @@
510	@ CREATE TABLE vmerge(
511	@ id INTEGER REFERENCES vfile, -- VFILE entry that has been merged
512	@ merge INTEGER, -- Merged with this record
513	@ UNIQUE(id, merge)
514	@ );
515	@
516	@ -- Identifier for this file type.
517	@ -- The integer is the same as 'FSLC'.
518	@ PRAGMA application_id=252006674;
519	;
520

Fossil SCM

Keyboard Shortcuts