>From 5960104e23f6ad1b2eeb5ee7f44da83a047791f9 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 8 Apr 2011 11:06:52 +0200 Subject: [PATCH 1/4] dbi: Refactor and move methods to DBI.Statement Move code from DBI.SQLite.Statement to DBI.Statement so it can be used by a new DBI.PostgreSQL.Statement class as well. --- packages/dbd-sqlite/ChangeLog | 4 ++++ packages/dbd-sqlite/Statement.st | 9 +-------- packages/dbi/ChangeLog | 4 ++++ packages/dbi/Statement.st | 13 ++++++++++++- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/packages/dbd-sqlite/ChangeLog b/packages/dbd-sqlite/ChangeLog index 1ee4723..31efe6c 100644 --- a/packages/dbd-sqlite/ChangeLog +++ b/packages/dbd-sqlite/ChangeLog @@ -1,3 +1,7 @@ +2011-04-08 Holger Peter Freyther + + * Statement.st: Refactor code and use DBI.Statement class>>#getCommand:. + 2010-12-04 Paolo Bonzini * package.xml: Remove now superfluous tags. diff --git a/packages/dbd-sqlite/Statement.st b/packages/dbd-sqlite/Statement.st index 2f455fc..68cecda 100644 --- a/packages/dbd-sqlite/Statement.st +++ b/packages/dbd-sqlite/Statement.st @@ -94,13 +94,6 @@ Statement subclass: SQLiteStatement [ getCommand [ - | readStream writeStream aCharacter | - writeStream := WriteStream on: String new. - readStream := ReadStream on: queryString. - readStream skipSeparators. - [readStream atEnd - or: [aCharacter := readStream next. aCharacter isSeparator]] - whileFalse: [writeStream nextPut: aCharacter asUppercase]. - ^writeStream contents + ^ self class getCommand: queryString. ] ] diff --git a/packages/dbi/ChangeLog b/packages/dbi/ChangeLog index 024e8fb..67b1647 100644 --- a/packages/dbi/ChangeLog +++ b/packages/dbi/ChangeLog @@ -1,3 +1,7 @@ +2011-04-08 Holger Hans Peter Freyther + + * Statement.st: Add Statement class>>#getCommand:. + 2010-12-04 Paolo Bonzini * package.xml: Remove now superfluous tags. diff --git a/packages/dbi/Statement.st b/packages/dbi/Statement.st index ed216b7..e11a57b 100644 --- a/packages/dbi/Statement.st +++ b/packages/dbi/Statement.st @@ -8,7 +8,7 @@ "====================================================================== | | Copyright 2006 Mike Anderson -| Copyright 2007, 2008 Free Software Foundation, Inc. +| Copyright 2007, 2008, 2011 Free Software Foundation, Inc. | | Written by Mike Anderson | @@ -49,6 +49,17 @@ Object subclass: Statement [ yourself ] + Statement class >> getCommand: queryString [ + | readStream writeStream aCharacter | + writeStream := WriteStream on: String new. + readStream := ReadStream on: queryString. + readStream skipSeparators. + [readStream atEnd + or: [aCharacter := readStream next. aCharacter isSeparator]] + whileFalse: [writeStream nextPut: aCharacter asUppercase]. + ^writeStream contents + ] + connection [ "Return the connection for which the statement was prepared." -- 1.7.4