[Firebird-checkins] SF.net SVN: firebird:[53542] firebird/trunk

[<ale...@us...>]

Revision: 53542
          http://firebird.svn.sourceforge.net/firebird/?rev=53542&view=rev
Author:   alexpeshkoff
Date:     2011-10-11 08:20:16 +0000 (Tue, 11 Oct 2011)
Log Message:
-----------
Create metadata.fdb using isql

Modified Paths:
--------------
    firebird/trunk/builds/posix/Makefile.in
    firebird/trunk/src/dbs/metadata.sql

Modified: firebird/trunk/builds/posix/Makefile.in
===================================================================
--- firebird/trunk/builds/posix/Makefile.in	2011-10-11 07:46:13 UTC (rev 53541)
+++ firebird/trunk/builds/posix/Makefile.in	2011-10-11 08:20:16 UTC (rev 53542)
@@ -219,8 +219,9 @@
 	-$(RM) $@
 	$(LN) $^ $@
 
-metadata.fdb:	$(BLD_ROOT)/misc/metadata.gbak
-	$(GBAK) -MODE read_only -R $< $@
+metadata.fdb:	$(ISQL) $(SRC_ROOT)/dbs/metadata.sql
+	-$(RM) $@
+	$(ISQL) -q -i $(SRC_ROOT)/dbs/metadata.sql
 	$(CHMOD) 0444 $@
 
 $(HELP_FDB):	help.fdb

Modified: firebird/trunk/src/dbs/metadata.sql
===================================================================
--- firebird/trunk/src/dbs/metadata.sql	2011-10-11 07:46:13 UTC (rev 53541)
+++ firebird/trunk/src/dbs/metadata.sql	2011-10-11 08:20:16 UTC (rev 53542)
@@ -19,12 +19,6 @@
  * files.
  */
 SET SQL DIALECT 1;
-/* 
- * Commented out the delete since it gives an error message, that puts off 
- * the builder.  Deletion handled in shell script instead. MOD 04-Jan-01
-CONNECT 'metadata.fdb';
-DROP DATABASE;
-*/
 
 CREATE DATABASE 'metadata.fdb' PAGE_SIZE 1024;
 
@@ -36,11 +30,6 @@
 CREATE TABLE QLI$PROCEDURES (QLI$PROCEDURE_NAME QLI$PROCEDURE_NAME,
         QLI$PROCEDURE QLI$PROCEDURE);
 
-/* Table: RDB$ROLES, Owner: BUILDER (For Interbase server < 5.0)
- * CREATE TABLE RDB$ROLES (RDB$ROLE_NAME CHAR(31) default null,
- *         RDB$OWNER_NAME CHAR(31) default null);
- */
-
 /*  Index definitions for all user tables */
 CREATE UNIQUE INDEX QLI$PROCEDURES_IDX1 ON QLI$PROCEDURES(QLI$PROCEDURE_NAME);
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.