Two bug in SQLiteConnection.columnsFromSchema() were fixed: use · sqlobject/sqlobject@0560f80 · GitHub

sqlobject / sqlobject Public

• Notifications You must be signed in to change notification settings
• Fork 26
• Star 156

• Code
• Issues 2
• Pull requests
• Actions
• Security and quality
• Insights

Additional navigation options

Commit 0560f80

Browse filesBrowse the repository at this point in the historyBrowse files

phdru

committed

Two bug in SQLiteConnection.columnsFromSchema() were fixed: use

sqlmeta.idName instead of 'id'; convert default 'NULL' to None. git-svn-id: http://svn.colorstudy.com/SQLObject/trunk@3885 95a46c32-92d2-0310-94a5-8d71aeb3d4b3

1 parent 0ea3e10 commit 0560f80
Copy full SHA for 0560f80

2 files changed

+12-1Lines changed: 12 additions & 1 deletion

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• docs
  • News.txt
• sqlobject/sqlite
  • sqliteconnection.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎docs/News.txt‎

Copy file name to clipboardExpand all lines: docs/News.txt

+8Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -53,6 +53,8 @@ SQLObject 0.10.6
53	53
54	54	* Better support for Python 2.6: do not import the deprecated sets module.
55	55
	56	+ * A number of changes ported from `SQLObject 0.9.11`_.
	57	+
56	58	SQLObject 0.10.5
57	59	================
58	60
@@ -163,6 +165,12 @@ Features & Interface
163	165	* Under MySQL, PickleCol no longer used TEXT column types; the smallest
164	166	column is now BLOB - it is not possible to create TINYBLOB column.
165	167
	168	+ SQLObject 0.9.11
	169	+ ================
	170	+
	171	+ * Two bug in SQLiteConnection.columnsFromSchema() were fixed: use
	172	+ sqlmeta.idName instead of 'id'; convert default 'NULL' to None.
	173	+
166	174	SQLObject 0.9.10
167	175	================
168	176

Collapse file

‎sqlobject/sqlite/sqliteconnection.py‎

Copy file name to clipboardExpand all lines: sqlobject/sqlite/sqliteconnection.py

+4-1Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -295,9 +295,12 @@ def _columnsFromSchemaTableInfo(self, tableName, soClass):
295	295	colData = self.queryAll("PRAGMA table_info(%s)" % tableName)
296	296	results = []
297	297	for index, field, t, nullAllowed, default, key in colData:
298		- if field == 'id':
	298	+ if field == soClass.sqlmeta.idName:
299	299	continue
300	300	colClass, kw = self.guessClass(t)
	301	+ if default == 'NULL':
	302	+ nullAllowed = True
	303	+ default = None
301	304	kw['name'] = soClass.sqlmeta.style.dbColumnToPythonAttr(field)
302	305	kw['dbName'] = field
303	306	kw['notNone'] = not nullAllowed

0 commit comments

Comments

0 (0)